Merge pull request ravendb#155 from poissoncorp/v5.2beta3

RDBC-611 Refactors before Subscriptions

Author: ml054

ravendb/__init__.py

@@ -242,10 +242,6 @@
 # CompactSettings
 from ravendb.json.metadata_as_dictionary import MetadataAsDictionary
 from ravendb.json.result import BatchCommandResult
-from ravendb.legacy.raven_operations.maintenance_operations import (
-    UpdateExternalReplicationOperation,
-    PutPullReplicationAsHubOperation,
-)
 from ravendb.serverwide.commands import GetDatabaseTopologyCommand, GetClusterTopologyCommand
 from ravendb.serverwide.misc import DocumentsCompressionConfiguration, DeletionInProgressStatus
 

ravendb/changes/database_changes.py

@@ -10,7 +10,7 @@
     OperationStatusChange,
     TopologyChange,
 )
-from ravendb.legacy.subscriptions.data import IncrementalJsonParser
+from ravendb.tools.parsers import IncrementalJsonParser
 import websocket
 from ravendb.exceptions.exceptions import NotSupportedException
 from ravendb.exceptions.exceptions import ChangeProcessingException

ravendb/documents/commands/batches.py

@@ -21,7 +21,7 @@
 from ravendb.util.util import RaftIdGenerator
 
 if TYPE_CHECKING:
-    from ravendb.documents.conventions.document_conventions import DocumentConventions
+    from ravendb.documents.conventions import DocumentConventions
     from ravendb.documents.operations.patch import PatchRequest
     from ravendb.documents.session.in_memory_document_session_operations import InMemoryDocumentSessionOperations
 

ravendb/documents/commands/crud.py

@@ -19,7 +19,7 @@
 from ravendb.tools.utils import Utils
 
 if TYPE_CHECKING:
-    from ravendb.documents.conventions.document_conventions import DocumentConventions
+    from ravendb.documents.conventions import DocumentConventions
 
 
 class PutResult:

…ents/conventions/document_conventions.py ravendb/documents/conventions.pyravendb/documents/conventions/document_conventions.py renamed to ravendb/documents/conventions.py ravendb/documents/conventions/document_conventions.py renamed to ravendb/documents/conventions.py

@@ -10,7 +10,7 @@
 
 if TYPE_CHECKING:
     from ravendb.documents import DocumentStore
-    from ravendb.documents.conventions.document_conventions import DocumentConventions
+    from ravendb.documents.conventions import DocumentConventions
 
 
 class GenerateEntityIdOnTheClient:

ravendb/documents/conventions/misc.py

@@ -3,7 +3,7 @@
 from typing import Generic, TypeVar, Union, Dict, Set, Callable, Optional, List, Collection
 
 from ravendb import constants
-from ravendb.documents.conventions.document_conventions import DocumentConventions
+from ravendb.documents.conventions import DocumentConventions
 from ravendb.documents.store.definition import DocumentStore, DocumentStoreBase
 from ravendb.documents.indexes.definitions import (
     IndexDefinition,

ravendb/documents/identity/hilo.py

@@ -17,7 +17,7 @@
 
 if TYPE_CHECKING:
     from ravendb.documents import DocumentStore
-    from ravendb.documents.conventions.document_conventions import DocumentConventions
+    from ravendb.documents.conventions import DocumentConventions
 
 
 class AttachmentName:

ravendb/documents/indexes/index_creation.py

@@ -192,7 +192,7 @@ def __handle_patch(self, batch_result: dict) -> None:
                 return
 
             key = self.__get_string_field(batch_result, CommandType.PUT, "Id")
-            session_document_info = self.__session.documents_by_id.get(key)
+            session_document_info = self.__session._documents_by_id.get(key)
             if session_document_info == None:
                 return
 
@@ -220,15 +220,15 @@ def __handle_delete(self, batch_result: dict) -> None:
 
     def __handle_delete_internal(self, batch_result: dict, command_type: CommandType):
         key = self.__get_string_field(batch_result, command_type, "Id")
-        document_info = self.__session.documents_by_id.get(key)
+        document_info = self.__session._documents_by_id.get(key)
         if document_info is None:
             return
 
-        self.__session.documents_by_id.pop(key, None)
+        self.__session._documents_by_id.pop(key, None)
 
         if document_info.entity is not None:
-            self.__session.documents_by_entity.pop(document_info.entity, None)
-            self.__session.deleted_entities.discard(document_info.entity)
+            self.__session._documents_by_entity.pop(document_info.entity, None)
+            self.__session._deleted_entities.discard(document_info.entity)
 
     def __handle_force_revision_creation(self, batch_result: dict) -> None:
         if not self.__get_boolean_field(batch_result, CommandType.FORCE_REVISION_CREATION, "RevisionCreated"):
@@ -242,7 +242,7 @@ def __handle_force_revision_creation(self, batch_result: dict) -> None:
             batch_result, CommandType.FORCE_REVISION_CREATION, constants.Documents.Metadata.CHANGE_VECTOR
         )
 
-        document_info = self.__session.documents_by_id.get(key)
+        document_info = self.__session._documents_by_id.get(key)
         if not document_info:
             return
 
@@ -257,7 +257,7 @@ def __handle_put(self, index: int, batch_result: dict, is_deferred: bool) -> Non
 
         if not is_deferred:
             entity = self.__entities[index]
-            document_info = self.__session.documents_by_entity.get(entity)
+            document_info = self.__session._documents_by_entity.get(entity)
             if document_info is None:
                 return
 
@@ -267,7 +267,7 @@ def __handle_put(self, index: int, batch_result: dict, is_deferred: bool) -> Non
         )
 
         if is_deferred:
-            session_document_info = self.__session.documents_by_id.get(key)
+            session_document_info = self.__session._documents_by_id.get(key)
             if session_document_info is None:
                 return
 
@@ -276,7 +276,7 @@ def __handle_put(self, index: int, batch_result: dict, is_deferred: bool) -> Non
 
         self.__handle_metadata_modifications(document_info, batch_result, key, change_vector)
 
-        self.__session.documents_by_id.update({document_info.key: document_info})
+        self.__session._documents_by_id.update({document_info.key: document_info})
 
         if entity:
             self.__session.generate_entity_id_on_the_client.try_set_identity(entity, key)
@@ -316,7 +316,7 @@ def __handle_counters(self, batch_result: dict) -> None:
 
         change_vector = self.__get_string_field(batch_result, CommandType.COUNTERS, "DocumentChangeVector", False)
         if change_vector is not None:
-            document_info = self.__session.documents_by_id.get(doc_id)
+            document_info = self.__session._documents_by_id.get(doc_id)
             if document_info is not None:
                 document_info.change_vector = change_vector
 
@@ -361,7 +361,7 @@ def __handle_attachment_delete_internal(
     ) -> None:
         key = self.__get_string_field(batch_result, command_type, id_field_name)
 
-        session_document_info = self.__session.documents_by_id.get_value(key)
+        session_document_info = self.__session._documents_by_id.get_value(key)
         if session_document_info is None:
             return
 
@@ -399,7 +399,7 @@ def __handle_attachment_put_internal(
     ) -> None:
         key = self.__get_string_field(batch_result, command_type, id_field_name)
 
-        session_document_info = self.__session.documents_by_id.get_value(key)
+        session_document_info = self.__session._documents_by_id.get_value(key)
         if session_document_info is None:
             return