From f4833c05f60be2e696f61543f18f53faefe033b2 Mon Sep 17 00:00:00 2001 From: Greg Back Date: Thu, 20 Jul 2017 19:34:09 +0000 Subject: [PATCH] Remove duplicate code. --- stix2/sources/filesystem.py | 16 ---------------- stix2/sources/memory.py | 18 +----------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/stix2/sources/filesystem.py b/stix2/sources/filesystem.py index 374bdde..77d5229 100644 --- a/stix2/sources/filesystem.py +++ b/stix2/sources/filesystem.py @@ -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): """ diff --git a/stix2/sources/memory.py b/stix2/sources/memory.py index ecfc790..82bcf2a 100644 --- a/stix2/sources/memory.py +++ b/stix2/sources/memory.py @@ -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)