Remove duplicate code.

stix2.1
Greg Back 2017-07-20 19:34:09 +00:00
parent 55e92bc237
commit f4833c05f6
2 changed files with 1 additions and 33 deletions

View File

@ -26,22 +26,6 @@ class FileSystemStore(DataStore):
self.source = FileSystemSource(stix_dir=stix_dir)
self.sink = FileSystemSink(stix_dir=stix_dir)
# file system sink API calls
def add(self, stix_objs):
return self.sink.add(stix_objs=stix_objs)
# file sytem source API calls
def get(self, stix_id):
return self.source.get(stix_id=stix_id)
def all_versions(self, stix_id):
return self.source.all_versions(stix_id=stix_id)
def query(self, query):
return self.source.query(query=query)
class FileSystemSink(DataSink):
"""

View File

@ -64,24 +64,8 @@ class MemoryStore(DataStore):
self.source = MemorySource(stix_data=self.data, _store=True)
self.sink = MemorySink(stix_data=self.data, _store=True)
# memory sink API calls
def add(self, stix_data):
return self.sink.add(stix_data=stix_data)
def save_to_file(self, file_path):
return self.sink.save(file_path=file_path)
# memory source API calls
def get(self, stix_id):
return self.source.get(stix_id=stix_id)
def all_versions(self, stix_id):
return self.source.all_versions(stix_id=stix_id)
def query(self, query):
return self.source.query(query=query)
return self.sink.save_to_file(file_path=file_path)
def load_from_file(self, file_path):
return self.source.load_from_file(file_path=file_path)