Load and Save an ApiContext from and to JSON Data

bunq/sdk/context.py

@@ -254,45 +254,55 @@ def session_context(self):
 
         return self._session_context
 
-    def save(self, path=None, to_json=False):
+    def to_json(self):
+        """
+        Serializes an ApiInstance to JSON data
+
+        :return: str
+        """
+        return converter.class_to_json(self)
+
+    @classmethod
+    def from_json(cls, data):
+        """
+        Creates an ApiContext instance from JSON data
+
+        :param data: str
+        :return: ApiContext
+        """
+        return converter.json_to_class(ApiContext, data)
+
+    def save(self, path=None):
         """
         :type path: str
-        :type to_json: bool
 
-        :rtype: Union[None, str]
+        :rtype: None, str
         """
 
         if path is None:
             path = self._PATH_API_CONTEXT_DEFAULT
 
-        if to_json:
-            return converter.class_to_json(self)
-
-        with open(path, self._FILE_MODE_WRITE) as file:
-            file.write(converter.class_to_json(self))
+        with open(path, self._FILE_MODE_WRITE) as file_:
+            file_.write(self.to_json())
 
     @classmethod
-    def restore(cls, path=None, json_data=None):
+    def restore(cls, path=None):
         """
         :type path: str
-        :type json_data: str
 
         :rtype: ApiContext
         """
 
         if path is None:
             path = cls._PATH_API_CONTEXT_DEFAULT
 
-        if json_data is not None:
-            return converter.json_to_class(ApiContext, json_data)
-
-        with open(path, cls._FILE_MODE_READ) as file:
-            return converter.json_to_class(ApiContext, file.read())
+        with open(path, cls._FILE_MODE_READ) as file_:
+            return cls.from_json(file_.read())
 
     def __eq__(self, other):
-        return self.token == other.token \
-               and self.api_key == other.api_key \
-               and self.environment_type == other.environment_type
+        return (self.token == other.token and
+                self.api_key == other.api_key and
+                self.environment_type == other.environment_type)
 
 
 class InstallationContext(object):

tests/model/generated/test_api_context.py

@@ -33,8 +33,8 @@ def test_api_context_save(self):
 
         self._API_CONTEXT.save(self._TMP_FILE_PATH_FULL)
 
-        with open(self._TMP_FILE_PATH_FULL, self._FILE_MODE_READ) as file:
-            context_retrieved = file.read()
+        with open(self._TMP_FILE_PATH_FULL, self._FILE_MODE_READ) as file_:
+            context_retrieved = file_.read()
 
         os.remove(self._TMP_FILE_PATH_FULL)
 
@@ -65,7 +65,7 @@ def test_api_context_save_json(self):
         """
 
         context_json = converter.class_to_json(self._API_CONTEXT)
-        context_saved = self._API_CONTEXT.save(to_json=True)
+        context_saved = self._API_CONTEXT.to_json()
 
         self.assertEqual(context_saved, context_json)
 
@@ -79,7 +79,7 @@ def test_api_context_restore_json(self):
         ApiContext.
         """
 
-        context_json = self._API_CONTEXT.save(to_json=True)
-        api_context_restored = self._API_CONTEXT.restore(json_data=context_json)
+        context_json = self._API_CONTEXT.to_json()
+        api_context_restored = self._API_CONTEXT.from_json(context_json)
 
         self.assertEqual(api_context_restored, self._API_CONTEXT)