1 files changed, 5 insertions, 26 deletions
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 5d5afe0c98..711268e6a7 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
@@ -95,7 +95,6 @@ public class Configuration extends BasicConfiguration {
     private Map<String, ArtifactTypeConfig> serviceDeploymentArtifacts;
     private Map<String, ArtifactTypeConfig> resourceInstanceDeploymentArtifacts;
     private Map<String, ArtifactTypeConfig> resourceInformationalArtifacts;
-    private Map<String, ArtifactTypeConfig> resourceInformationalDeployedArtifacts;
     private Map<String, Object> serviceApiArtifacts;
     private List<String> excludeServiceCategory;
 
@@ -144,29 +143,23 @@ public class Configuration extends BasicConfiguration {
     private CadiFilterParams cadiFilterParams;
 
     private Boolean aafAuthNeeded;
-
     private String autoHealingOwner;
     private boolean enableAutoHealing;
-
     private Map<String, List<String>> resourcesForUpgrade;
     private DmaapConsumerConfiguration dmaapConsumerConfiguration;
     private DmaapProducerConfiguration dmaapProducerConfiguration;
-
     private boolean skipUpgradeFailedVfs;
     private boolean skipUpgradeVSPs;
     private DmeConfiguration dmeConfiguration;
-
     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;
+    private EcompPortalConfig ecompPortal;
 
     public String getAutoHealingOwner() {
         return autoHealingOwner;
@@ -207,7 +200,6 @@ public class Configuration extends BasicConfiguration {
     public void setDmaapConsumerConfiguration(DmaapConsumerConfiguration dmaapConsumerConfiguration) {
         this.dmaapConsumerConfiguration = dmaapConsumerConfiguration;
     }
-
     public DmeConfiguration getDmeConfiguration() {
         return dmeConfiguration;
     }
@@ -215,6 +207,7 @@ public class Configuration extends BasicConfiguration {
     public void setDmeConfiguration(DmeConfiguration dmeConfiguration) {
         this.dmeConfiguration = dmeConfiguration;
     }
+
     public void setSkipUpgradeVSPs(boolean skipUpgradeVSPs) { this.skipUpgradeVSPs = skipUpgradeVSPs; }
 
     public boolean getSkipUpgradeVSPsFlag() { return skipUpgradeVSPs; }
@@ -251,8 +244,6 @@ public class Configuration extends BasicConfiguration {
         this.artifactGeneratorConfig = artifactGeneratorConfig;
     }
 
-    private List<GabConfig> gabConfig;
-
     public Map<String, String> getGenericAssetNodeTypes() {
         return genericAssetNodeTypes;
     }
@@ -285,8 +276,6 @@ public class Configuration extends BasicConfiguration {
         this.applicationL2Cache = applicationL2Cache;
     }
 
-    private EcompPortalConfig ecompPortal;
-
     public CassandrConfig getCassandraConfig() {
         return cassandraConfig;
     }
@@ -1212,6 +1201,8 @@ public class Configuration extends BasicConfiguration {
         private Integer port;
         private String healthCheckUri;
         private String defaultFunctionalMenu;
+        private Integer pollingInterval;
+        private Integer timeoutMs;
 
         public void setPollingInterval(Integer pollingInterval) {
             this.pollingInterval = pollingInterval;
@@ -1221,9 +1212,6 @@ public class Configuration extends BasicConfiguration {
             this.timeoutMs = timeoutMs;
         }
 
-        private Integer pollingInterval;
-        private Integer timeoutMs;
-
         public String getProtocol() {
             return protocol;
         }
@@ -1583,15 +1571,6 @@ public class Configuration extends BasicConfiguration {
         this.artifactsIndex = artifactsIndex;
     }
 
-    public Map<String, ArtifactTypeConfig> getResourceInformationalDeployedArtifacts() {
-        return resourceInformationalDeployedArtifacts;
-    }
-
-    public void setResourceInformationalDeployedArtifacts(
-            Map<String, ArtifactTypeConfig> resourceInformationalDeployedArtifacts) {
-        this.resourceInformationalDeployedArtifacts = resourceInformationalDeployedArtifacts;
-    }
-
     public List<String> getResourceTypes() {
         return resourceTypes;
     }