rename CommonCriteriaMaintenanceUpdate -> CCMaintenanceUpdate

5 files changed, 15 insertions, 19 deletions

diff --git a/src/sec_certs/dataset/cc.py b/src/sec_certs/dataset/cc.py
index ec661ebe..9894bd48 100644
--- a/src/sec_certs/dataset/cc.py
+++ b/src/sec_certs/dataset/cc.py
@@ -28,7 +28,7 @@ from sec_certs.model.sar_transformer import SARTransformer
 from sec_certs.model.transitive_vulnerability_finder import TransitiveVulnerabilityFinder
 from sec_certs.sample.cc import CCCertificate
 from sec_certs.sample.cc_certificate_id import CertificateId
-from sec_certs.sample.cc_maintenance_update import CommonCriteriaMaintenanceUpdate
+from sec_certs.sample.cc_maintenance_update import CCMaintenanceUpdate
 from sec_certs.sample.protection_profile import ProtectionProfile
 from sec_certs.serialization.json import ComplexSerializableType, CustomJSONDecoder, serialize
 from sec_certs.utils import helpers as helpers
@@ -802,9 +802,7 @@ class CCDataset(Dataset[CCCertificate, CCAuxillaryDatasets], ComplexSerializable
         if to_download or not self.mu_dataset_path.exists():
             maintained_certs: list[CCCertificate] = [x for x in self if x.maintenance_updates]
             updates = list(
-                itertools.chain.from_iterable(
-                    CommonCriteriaMaintenanceUpdate.get_updates_from_cc_cert(x) for x in maintained_certs
-                )
+                itertools.chain.from_iterable(CCMaintenanceUpdate.get_updates_from_cc_cert(x) for x in maintained_certs)
             )
             update_dset = CCDatasetMaintenanceUpdates(
                 {x.dgst: x for x in updates}, root_dir=self.mu_dataset_dir, name="maintenance_updates"
@@ -831,7 +829,7 @@ class CCDatasetMaintenanceUpdates(CCDataset, ComplexSerializableType):
     # Quite difficult to achieve correct behaviour with MyPy here, opting for ignore
     def __init__(
         self,
-        certs: dict[str, CommonCriteriaMaintenanceUpdate] = dict(),  # type: ignore
+        certs: dict[str, CCMaintenanceUpdate] = dict(),  # type: ignore
         root_dir: Path = constants.DUMMY_NONEXISTING_PATH,
         name: str = "dataset name",
         description: str = "dataset_description",
@@ -844,7 +842,7 @@ class CCDatasetMaintenanceUpdates(CCDataset, ComplexSerializableType):
     def certs_dir(self) -> Path:
         return self.root_dir
 
-    def __iter__(self) -> Iterator[CommonCriteriaMaintenanceUpdate]:
+    def __iter__(self) -> Iterator[CCMaintenanceUpdate]:
         yield from self.certs.values()  # type: ignore
 
     def _compute_heuristics(self) -> None:
@@ -873,9 +871,7 @@ class CCDatasetMaintenanceUpdates(CCDataset, ComplexSerializableType):
         return dset
 
     def to_pandas(self) -> pd.DataFrame:
-        df = pd.DataFrame(
-            [x.pandas_tuple for x in self.certs.values()], columns=CommonCriteriaMaintenanceUpdate.pandas_columns
-        )
+        df = pd.DataFrame([x.pandas_tuple for x in self.certs.values()], columns=CCMaintenanceUpdate.pandas_columns)
         df = df.set_index("dgst")
         df.index.name = "dgst"
 
diff --git a/src/sec_certs/sample/__init__.py b/src/sec_certs/sample/__init__.py
index f5f2130c..8fa91c2c 100644
--- a/src/sec_certs/sample/__init__.py
+++ b/src/sec_certs/sample/__init__.py
@@ -4,7 +4,7 @@ like CPE, CVE, etc. The objects mostly hold data and allow for serialization, bu
 
 from sec_certs.sample.cc import CCCertificate
 from sec_certs.sample.cc_certificate_id import CertificateId
-from sec_certs.sample.cc_maintenance_update import CommonCriteriaMaintenanceUpdate
+from sec_certs.sample.cc_maintenance_update import CCMaintenanceUpdate
 from sec_certs.sample.cpe import CPE, cached_cpe
 from sec_certs.sample.cve import CVE
 from sec_certs.sample.fips import FIPSCertificate
@@ -16,7 +16,7 @@ from sec_certs.sample.sar import SAR
 
 __all__ = [
     "CertificateId",
-    "CommonCriteriaMaintenanceUpdate",
+    "CCMaintenanceUpdate",
     "CCCertificate",
     "CPE",
     "cached_cpe",
diff --git a/src/sec_certs/sample/cc_maintenance_update.py b/src/sec_certs/sample/cc_maintenance_update.py
index 5399dde1..d78359fc 100644
--- a/src/sec_certs/sample/cc_maintenance_update.py
+++ b/src/sec_certs/sample/cc_maintenance_update.py
@@ -11,7 +11,7 @@ from sec_certs.serialization.json import ComplexSerializableType
 logger = logging.getLogger(__name__)
 
 
-class CommonCriteriaMaintenanceUpdate(CCCertificate, ComplexSerializableType):
+class CCMaintenanceUpdate(CCCertificate, ComplexSerializableType):
     pandas_columns: ClassVar[list[str]] = [
         "dgst",
         "name",
@@ -66,15 +66,15 @@ class CommonCriteriaMaintenanceUpdate(CCCertificate, ComplexSerializableType):
 
     @property
     def pandas_tuple(self) -> tuple:
-        return tuple([getattr(self, x) for x in CommonCriteriaMaintenanceUpdate.pandas_columns])
+        return tuple([getattr(self, x) for x in CCMaintenanceUpdate.pandas_columns])
 
     @classmethod
-    def from_dict(cls, dct: dict) -> CommonCriteriaMaintenanceUpdate:
+    def from_dict(cls, dct: dict) -> CCMaintenanceUpdate:
         dct.pop("dgst")
         return cls(*(tuple(dct.values())))
 
     @classmethod
-    def get_updates_from_cc_cert(cls, cert: CCCertificate) -> list[CommonCriteriaMaintenanceUpdate]:
+    def get_updates_from_cc_cert(cls, cert: CCCertificate) -> list[CCMaintenanceUpdate]:
         if cert.maintenance_updates is None:
             raise RuntimeError("Dataset was probably not built correctly - this should not be happening.")
 
diff --git a/tests/cc/test_cc_maintenance_updates.py b/tests/cc/test_cc_maintenance_updates.py
index c96b426e..833391ef 100644
--- a/tests/cc/test_cc_maintenance_updates.py
+++ b/tests/cc/test_cc_maintenance_updates.py
@@ -5,7 +5,7 @@ import pytest
 
 import tests.data.cc.dataset
 from sec_certs.dataset import CCDataset, CCDatasetMaintenanceUpdates
-from sec_certs.sample.cc_maintenance_update import CommonCriteriaMaintenanceUpdate
+from sec_certs.sample.cc_maintenance_update import CCMaintenanceUpdate
 
 
 @pytest.fixture(scope="module")
@@ -74,9 +74,9 @@ def test_dataset_from_json(mu_dset: CCDatasetMaintenanceUpdates, data_dir: Path)
 
 def test_to_pandas(mu_dset: CCDatasetMaintenanceUpdates):
     df = mu_dset.to_pandas()
-    assert df.shape == (len(mu_dset), len(CommonCriteriaMaintenanceUpdate.pandas_columns) - 1)
+    assert df.shape == (len(mu_dset), len(CCMaintenanceUpdate.pandas_columns) - 1)
     assert df.index.name == "dgst"
-    assert set(df.columns) == set(CommonCriteriaMaintenanceUpdate.pandas_columns) - {"dgst"}
+    assert set(df.columns) == set(CCMaintenanceUpdate.pandas_columns) - {"dgst"}
 
 
 @pytest.mark.skip(reason="Will work only with fresh snapshot on seccerts.org")
diff --git a/tests/data/cc/dataset/auxillary_datasets/maintenances/maintenance_updates.json b/tests/data/cc/dataset/auxillary_datasets/maintenances/maintenance_updates.json
index 09e52395..21567fe4 100644
--- a/tests/data/cc/dataset/auxillary_datasets/maintenances/maintenance_updates.json
+++ b/tests/data/cc/dataset/auxillary_datasets/maintenances/maintenance_updates.json
@@ -15,7 +15,7 @@
     "n_certs": 1,
     "certs": [
         {
-            "_type": "sec_certs.sample.cc_maintenance_update.CommonCriteriaMaintenanceUpdate",
+            "_type": "sec_certs.sample.cc_maintenance_update.CCMaintenanceUpdate",
             "dgst": "cert_8a5e6bcda602920c_update_559ed93dd80320b5",
             "name": "Fortinet FortiGate w/ FortiOS v5.6.7 Build 6022",
             "report_link": "https://www.commoncriteriaportal.org/files/epfiles/383-7-159%20MR%20v1.0e.pdf",