X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=common-app-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Fbe%2Fconfig%2FConfiguration.java;h=3222c267df7f547ff469ec69595dc2f974e102d6;hb=031b8e1c7eb7d7b2e8c0bbd575dfbde36aaf8736;hp=5a1eacdb582ba79ab6aae30b41cd244f71e21150;hpb=a9d0bcd206b7a677b82e5e9b497a8b52b38e3a43;p=sdc.git

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
index 5a1eacdb58..3222c267df 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
@@ -17,6 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.openecomp.sdc.be.config;
 
 import static java.lang.String.format;
@@ -65,6 +66,9 @@ public class Configuration extends BasicConfiguration {
      * backend protocol. http | https
      */
     private String beProtocol = "http";
+    private String tlsCert;
+    private String tlsKey;
+    private String caCert;
     private Date released;
     private String version = "1111";
     private String toscaConformanceLevel = "3.0";
@@ -99,6 +103,7 @@ public class Configuration extends BasicConfiguration {
     private List<String> licenseTypes;
     private List<String> definedResourceNamespace;
     private List<String> directives;
+    private List<CustomToscaFunction> defaultCustomToscaFunctions;
     private Integer additionalInformationMaxNumberOfKeys;
     private HeatDeploymentArtifactTimeout heatArtifactDeploymentTimeout;
     private BeMonitoringConfig systemMonitoring;
@@ -116,15 +121,12 @@ public class Configuration extends BasicConfiguration {
     private ApplicationL2CacheConfig applicationL2Cache;
     private ToscaValidatorsConfig toscaValidators;
     private boolean disableAudit;
-    private Boolean consumerBusinessLogic;
     private Map<String, VfModuleProperty> vfModuleProperties;
     private Map<String, String> genericAssetNodeTypes;
     private Map<String, CategoryBaseTypeConfig> serviceBaseNodeTypes;
     private Map<String, Map<String, String>> resourceNodeTypes;
     private String appVersion;
     private String artifactGeneratorConfig;
-    private CadiFilterParams cadiFilterParams;
-    private Boolean aafAuthNeeded = false;
     private String autoHealingOwner;
     private boolean enableAutoHealing;
     private Map<String, List<String>> resourcesForUpgrade;
@@ -136,8 +138,6 @@ public class Configuration extends BasicConfiguration {
     private boolean supportAllottedResourcesAndProxy;
     private Integer deleteLockTimeoutInSeconds;
     private Integer maxDeleteComponents;
-    private CookieConfig authCookie;
-    private String aafNamespace;
     private String workloadContext;
     private EnvironmentContext environmentContext;
     private List<GabConfig> gabConfig;
@@ -147,6 +147,8 @@ public class Configuration extends BasicConfiguration {
     private ExternalCsarStore externalCsarStore;
     private CsarFormat csarFormat;
     private String componentInstanceCounterDelimiter;
+    private String dataValidatorFilterExcludedUrls; // Comma separated list of excluded URLs by the DataValidatorFilter
+    private String permittedAncestors; // Space separated list of permitted ancestors
 
     @SuppressWarnings("unchecked")
     private <K, V> Map<K, V> safeGetCapsInsensitiveMap(Map<K, V> map) {
@@ -202,31 +204,6 @@ public class Configuration extends BasicConfiguration {
         return globalCsarImports;
     }
 
-    @Getter
-    @Setter
-    @NoArgsConstructor
-    public static class CookieConfig {
-
-        private String securityKey = "";
-        private long maxSessionTimeOut = 600 * 1000L;
-        private long sessionIdleTimeOut = 30 * 1000L;
-        private String cookieName = "AuthenticationCookie";
-        private String redirectURL = "https://www.e-access.att.com/ecomp_portal_ist/ecompportal/process_csp";
-        private List<String> excludedUrls;
-        private List<String> onboardingExcludedUrls;
-        private String domain = "";
-        private String path = "";
-        private boolean isHttpOnly = true;
-
-        public boolean isHttpOnly() {
-            return isHttpOnly;
-        }
-
-        public void setIsHttpOnly(final boolean isHttpOnly) {
-            this.isHttpOnly = isHttpOnly;
-        }
-    }
-
     @Getter
     @Setter
     @NoArgsConstructor
@@ -526,4 +503,13 @@ public class Configuration extends BasicConfiguration {
         private String defaultFormat;
     }
 
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    public static class CustomToscaFunction {
+
+        private String name;
+        private String type;
+    }
+
 }