Housekeeping

No functional changes made in this commit.

Removed CheckStyle and Sonar warnings.
Formatted code.
Renamed methods and classes for better understanding.
Removed unnecessary classes.
Moved all code to single project.

Change-Id: Ie3feb6c6a985e94a382812aa083dcf57bc46c7b3
Issue-ID: DCAEGEN2-1367
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>

5 files changed, 14 insertions, 14 deletions

diff --git a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
index e345cf8e..75c75d78 100644
--- a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
+++ b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
@@ -100,8 +100,8 @@ node_templates:
       application_config:
         dmaap.ftp.ftpesConfiguration.keyCert: "/config/dfc.jks"
         dmaap.ftp.ftpesConfiguration.keyPassword: "secret"
-        dmaap.ftp.ftpesConfiguration.trustedCA: "/config/ftp.jks"
-        dmaap.ftp.ftpesConfiguration.trustedCAPassword: "secret"
+        dmaap.ftp.ftpesConfiguration.trustedCa: "/config/ftp.jks"
+        dmaap.ftp.ftpesConfiguration.trustedCaPassword: "secret"
         dmaap.security.trustStorePath: "/opt/app/datafile/etc/cert/trust.jks"
         dmaap.security.trustStorePasswordPath: "/opt/app/datafile/etc/cert/trust.pass"
         dmaap.security.keyStorePath: "/opt/app/datafile/etc/cert/key.p12"
diff --git a/datafile-app-server/dpo/spec/datafile-component-spec.json b/datafile-app-server/dpo/spec/datafile-component-spec.json
index d674e73d..73d93fce 100644
--- a/datafile-app-server/dpo/spec/datafile-component-spec.json
+++ b/datafile-app-server/dpo/spec/datafile-component-spec.json
@@ -83,7 +83,7 @@
       "required": true
     },
     {
-      "name": "ftp.ftpesConfiguration.trustedCA",
+      "name": "ftp.ftpesConfiguration.trustedCa",
       "value": "config/ftp.jks",
       "description": "",
       "designer_editable": true,
@@ -93,7 +93,7 @@
       "required": true
     },
     {
-      "name": "ftp.ftpesConfiguration.trustedCAPassword",
+      "name": "ftp.ftpesConfiguration.trustedCaPassword",
       "value": "secret",
       "description": "",
       "designer_editable": true,
diff --git a/datafile-app-server/dpo/tosca_models/schema.yaml b/datafile-app-server/dpo/tosca_models/schema.yaml
index 39b33879..a553041d 100644
--- a/datafile-app-server/dpo/tosca_models/schema.yaml
+++ b/datafile-app-server/dpo/tosca_models/schema.yaml
@@ -511,9 +511,9 @@ node_types:
         type: string
       ftp.ftpesConfiguration.keyPassword:
         type: string
-      ftp.ftpesConfiguration.trustedCA:
+      ftp.ftpesConfiguration.trustedCa:
         type: string
-      ftp.ftpesConfiguration.trustedCAPassword:
+      ftp.ftpesConfiguration.trustedCaPassword:
         type: string
       security.enableDmaapCertAuth:
         type: string
diff --git a/datafile-app-server/dpo/tosca_models/template.yaml b/datafile-app-server/dpo/tosca_models/template.yaml
index e31b538b..9b18414a 100644
--- a/datafile-app-server/dpo/tosca_models/template.yaml
+++ b/datafile-app-server/dpo/tosca_models/template.yaml
@@ -18,8 +18,8 @@ topology_template:
         datafile.policy: ''
         ftp.ftpesConfiguration.keyCert: config/dfc.jks
         ftp.ftpesConfiguration.keyPassword: secret
-        ftp.ftpesConfiguration.trustedCA: config/ftp.jks
-        ftp.ftpesConfiguration.trustedCAPassword: secret
+        ftp.ftpesConfiguration.trustedCa: config/ftp.jks
+        ftp.ftpesConfiguration.trustedCaPassword: secret
         location_id:
           get_property:
           - SELF
diff --git a/datafile-app-server/dpo/tosca_models/translate.yaml b/datafile-app-server/dpo/tosca_models/translate.yaml
index 1ec47db2..e7f44133 100644
--- a/datafile-app-server/dpo/tosca_models/translate.yaml
+++ b/datafile-app-server/dpo/tosca_models/translate.yaml
@@ -20,9 +20,9 @@ topology_template:
       type: string
     ftp.ftpesConfiguration.keyPassword:
       type: string
-    ftp.ftpesConfiguration.trustedCA:
+    ftp.ftpesConfiguration.trustedCa:
       type: string
-    ftp.ftpesConfiguration.trustedCAPassword:
+    ftp.ftpesConfiguration.trustedCaPassword:
       type: string
     image:
       type: string
@@ -80,10 +80,10 @@ topology_template:
             get_input: ftp.ftpesConfiguration.keyCert
           ftp.ftpesConfiguration.keyPassword:
             get_input: ftp.ftpesConfiguration.keyPassword
-          ftp.ftpesConfiguration.trustedCA:
-            get_input: ftp.ftpesConfiguration.trustedCA
-          ftp.ftpesConfiguration.trustedCAPassword:
-            get_input: ftp.ftpesConfiguration.trustedCAPassword
+          ftp.ftpesConfiguration.trustedCa:
+            get_input: ftp.ftpesConfiguration.trustedCa
+          ftp.ftpesConfiguration.trustedCaPassword:
+            get_input: ftp.ftpesConfiguration.trustedCaPassword
           security.enableDmaapCertAuth:
             get_input: security.enableDmaapCertAuth
           security.keyStorePasswordPath: