Merge pull request #35 from dasaep/master

Renamed JSONString to ElasticJSONString and changed references in rel…
barseghyanartur · Jul 7, 2020 · b2db4e8 · b2db4e8
2 parents 27ed065 + 386af2f
commit b2db4e8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/graphene_elastic/converter.py b/src/graphene_elastic/converter.py
@@ -114,9 +114,9 @@ def convert_field_to_datetime(field, registry=None):
 @convert_elasticsearch_field.register(elasticsearch_fields.Object)
 @convert_elasticsearch_field.register(elasticsearch_fields.Nested)
 def convert_field_to_jsonstring(field, registry=None):
-    from .types import JSONString
+    from .types import ElasticJSONString
 
-    return JSONString(
+    return ElasticJSONString(
         description=get_field_description(field, registry),
         required=field._required,
     )
diff --git a/src/graphene_elastic/filter_backends/highlight/common.py b/src/graphene_elastic/filter_backends/highlight/common.py
@@ -1,7 +1,7 @@
 from copy import deepcopy
 import enum
 import graphene
-from graphene_elastic.types.json_string import JSONString
+from graphene_elastic.types.json_string import ElasticJSONString
 from stringcase import pascalcase as to_pascal_case
 
 from ...constants import DYNAMIC_CLASS_NAME_PREFIX
@@ -29,7 +29,7 @@ def highlight_resolver(parent, args, context=None, info=None):
     return parent.meta._d_.get('highlight')
 
 
-class HighlightField(JSONString):
+class HighlightField(ElasticJSONString):
     """Highlight field."""
 
 

diff --git a/src/graphene_elastic/relay/connection.py b/src/graphene_elastic/relay/connection.py
@@ -122,7 +122,7 @@ class EdgeMeta:
         edge = type(edge_name, edge_bases, {"Meta": EdgeMeta})
         cls.Edge = edge
 
-        from graphene_elastic.types.json_string import JSONString
+        from graphene_elastic.types.json_string import ElasticJSONString
 
         options["name"] = name
         _meta.node = node
@@ -148,7 +148,7 @@ class EdgeMeta:
                 (
                     "facets",
                     Field(
-                        JSONString,
+                        ElasticJSONString,
                         name="facets",
                         required=False,
                         description="Pagination data for this connection.",

diff --git a/src/graphene_elastic/types/json_string.py b/src/graphene_elastic/types/json_string.py
@@ -9,7 +9,7 @@
 __copyright__ = '2019-2020 Artur Barseghyan'
 __license__ = 'GPL-2.0-only OR LGPL-2.1-or-later'
 __all__ = (
-    'JSONString',
+    'ElasticJSONString',
     'to_serializable',
 )
 
@@ -29,7 +29,7 @@ def to_serializable(o):
     return o
 
 
-class JSONString(OriginalJSONString):
+class ElasticJSONString(OriginalJSONString):
     @staticmethod
     def serialize(dt):
         # return to_serializable(dt)