Convert class variables to instance variables.

Author: mlookaxw

src/main/resources/scripts/lib/envconfig.py

@@ -23,9 +23,8 @@ def __init__(self, field_key, value):
 
 
 class PropConfig:
-    __properties = {}
-
     def __init__(self, property_file_path_list):
+        self.__properties = {}
         if not property_file_path_list:
             return
 
@@ -53,19 +52,16 @@ def set_property(self, key, value):
         self.__properties[key] = value
 
 class EnvConfig:
-    __config_file_path = None
-    __config_json = None
-    __properties = None
-
-    __missing_vars = False
-    __file_updated = False
-    __migrated = False
-
-    __origin_json_str = None
-
-    __unconfigured_fields = []
-
     def __init__(self, config_file_path, properties, secrets):
+        self.__config_file_path = None
+        self.__config_json = None
+        self.__properties = None
+        self.__missing_vars = False
+        self.__file_updated = False
+        self.__migrated = False
+        self.__origin_json_str = None
+        self.__unconfigured_fields = []
+
         self.__properties = properties
         self.__pespk_factory = PortableESPKFactory.newInstance()
 
@@ -259,9 +255,6 @@ def is_empty():
         return self.__type == "empty"
 
 class CertInfo:
-    __alias = None
-    __subject = None
-    __not_after = None
     def __init__(self, alias, subject, not_after):
         self.__alias = alias
         self.__subject = subject
@@ -293,15 +286,12 @@ def expiration_in_days(self):
         return TimeUnit.DAYS.convert(diff, TimeUnit.MILLISECONDS)
 
 class CertConfig:
-    __config_file_path = None
-    __config_json = None
-    __properties = None
-    __migrated = False
-    __origin_json_str = None
-    __keystore = None
-
-
     def __init__(self, config_file_path, properties, secrets):
+        self.__config_json = None
+        self.__migrated = False
+        self.__origin_json_str = None
+        self.__keystore = None
+
         self.__properties = properties
         self.__secrets = secrets        
         self.__config_file_path = config_file_path

src/main/resources/scripts/lib/fedconfig.py

@@ -21,14 +21,13 @@
 from java.security.cert import CertificateFactory
 
 class FedConfigurator:
-    __cert_config = None
-    __simulation_mode = False
-
-    __update_cert_config = False
-    __expiration_days = -1
-    __base_dir = None
-
     def __init__(self, pol_archive_path, env_archive_path, config_path, cert_config_path = None, properties = None, passphrase = "", confidentials=None):
+        self.__cert_config = None
+        self.__simulation_mode = False
+        self.__update_cert_config = False
+        self.__expiration_days = -1
+        self.__base_dir = None
+
         self.__passphrase_in = passphrase
         self.__pol_archive = PolicyArchive(pol_archive_path)
         self.__env_archive = EnvironmentArchive(env_archive_path)

src/main/resources/scripts/lib/secrets.py

@@ -17,11 +17,12 @@ class Secrets:
     """
     __key_check = "axway-maven-plugin"
     __prefix_encrypt = "encrypt:"
-    __file_path = None
-    __secrets_json = {}
-    __cipher = None
 
     def __init__(self, secrets_key_file, secrets_file_path, create_if_not_exists=False):
+        self.__file_path = None
+        self.__secrets_json = {}
+        self.__cipher = None
+
         if not secrets_key_file:
             raise ValueError("No key file specified to encrypt/decrypt secrets!")
         if not secrets_file_path: