1 files changed, 320 insertions, 332 deletions

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java
index b7b0e64189..b23e076334 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,461 +23,449 @@ package org.openecomp.sdc.be.config;
 import org.openecomp.sdc.common.api.BasicConfiguration;
 import org.openecomp.sdc.common.http.config.ExternalServiceConfig;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public class DistributionEngineConfiguration extends BasicConfiguration {
 
-    private List<String> uebServers;
+	private List<String> uebServers;
 
-    private String distributionNotifTopicName;
+	private String distributionNotifTopicName;
 
-    private String distributionStatusTopicName;
+	private String distributionStatusTopicName;
 
-    private Integer initRetryIntervalSec;
+	private Integer initRetryIntervalSec;
 
-    private Integer initMaxIntervalSec;
+	private Integer initMaxIntervalSec;
 
-    private ComponentArtifactTypesConfig distribNotifServiceArtifactTypes;
+	private ComponentArtifactTypesConfig distribNotifServiceArtifactTypes;
 
-    private ComponentArtifactTypesConfig distribNotifResourceArtifactTypes;
+	private ComponentArtifactTypesConfig distribNotifResourceArtifactTypes;
 
-    private String uebPublicKey;
+	private String uebPublicKey;
 
-    private String uebSecretKey;
+	private String uebSecretKey;
 
-    private List<String> environments;
+	private List<String> environments;
 
-    private DistributionStatusTopicConfig distributionStatusTopic;
+	private DistributionStatusTopicConfig distributionStatusTopic;
 
-    private CreateTopicConfig createTopic;
+	private CreateTopicConfig createTopic;
 
-    private boolean startDistributionEngine;
+	private boolean startDistributionEngine;
 
-    private DistributionNotificationTopicConfig distributionNotificationTopic;
+	private DistributionNotificationTopicConfig distributionNotificationTopic;
 
-    private Integer defaultArtifactInstallationTimeout = 60;
+	private Integer defaultArtifactInstallationTimeout = 60;
+	
+	private Integer currentArtifactInstallationTimeout = 120;
+	private boolean useHttpsWithDmaap;
 
-    private Integer currentArtifactInstallationTimeout = 120;
+	private ExternalServiceConfig aaiConfig;
 
-    private boolean useHttpsWithDmaap;
+	private ExternalServiceConfig msoConfig;
+	
+	private Integer opEnvRecoveryIntervalSec;
+	
+	private Integer allowedTimeBeforeStaleSec;
+	
+	public static class DistribNotifServiceArtifacts {
 
-    private ExternalServiceConfig aaiConfig;
+		Map<String, Object> service;
+		Map<String, Object> resource;
+		
+		
 
-    private ExternalServiceConfig msoConfig;
+		public Map<String, Object> getService() {
+			return service;
+		}
 
-    private Integer opEnvRecoveryIntervalSec;
+		public void setService(Map<String, Object> service) {
+			this.service = service;
+		}
 
-    private Integer allowedTimeBeforeStaleSec;
+		public Map<String, Object> getResource() {
+			return resource;
+		}
 
-    public static class DistribNotifServiceArtifacts {
+		public void setResource(Map<String, Object> resource) {
+			this.resource = resource;
+		}
 
-        private Map<String, Object> service;
-        private Map<String, Object> resource;
+	}
 
+	public static class NotifArtifactTypes {
 
-        public Map<String, Object> getService() {
-            return service;
-        }
+		List<String> info;
+		List<String> lifecycle;
 
-        public void setService(Map<String, Object> service) {
-            this.service = service;
-        }
+		public List<String> getInfo() {
+			return info;
+		}
 
-        public Map<String, Object> getResource() {
-            return resource;
-        }
+		public void setInfo(List<String> info) {
+			this.info = info;
+		}
 
-        public void setResource(Map<String, Object> resource) {
-            this.resource = resource;
-        }
+		public List<String> getLifecycle() {
+			return lifecycle;
+		}
 
-    }
-
-    public static class NotifArtifactTypes {
-
-        private List<String> info;
-        private List<String> lifecycle;
-
-        public List<String> getInfo() {
-            return info;
-        }
-
-        public void setInfo(List<String> info) {
-            this.info = info;
-        }
-
-        public List<String> getLifecycle() {
-            return lifecycle;
-        }
-
-        public void setLifecycle(List<String> lifecycle) {
-            this.lifecycle = lifecycle;
-        }
+		public void setLifecycle(List<String> lifecycle) {
+			this.lifecycle = lifecycle;
+		}
 
-    }
-
-    public static class NotifArtifactTypesResource {
+	}
 
-        private List<ArtifcatTypeEnum> lifecycle;
+	public static class NotifArtifactTypesResource {
 
-        public List<ArtifcatTypeEnum> getLifecycle() {
-            return lifecycle;
-        }
-
-        public void setLifecycle(List<ArtifcatTypeEnum> lifecycle) {
-            this.lifecycle = lifecycle;
-        }
-    }
+		List<ArtifcatTypeEnum> lifecycle;
 
-    public enum ArtifcatTypeEnum {
+	}
 
-        MURANO_PKG("MURANO-PKG"), HEAT("HEAT"), DG_XML("DG_XML");
+	public enum ArtifcatTypeEnum {
 
-        private String value;
+		MURANO_PKG("MURANO-PKG"), HEAT("HEAT"), DG_XML("DG_XML");
 
-        ArtifcatTypeEnum(String value) {
-            this.value = value;
-        }
+		String value;
 
-        public String getValue() {
+		private ArtifcatTypeEnum(String value) {
+			this.value = value;
+		}
 
-            return value;
-        }
-    }
-
-    public List<String> getUebServers() {
-        return uebServers;
-    }
+		public String getValue() {
 
-    public void setUebServers(List<String> uebServers) {
-        this.uebServers = uebServers;
-    }
+			return value;
+		}
+	}
 
-    public String getDistributionNotifTopicName() {
-        return distributionNotifTopicName;
-    }
+	public List<String> getUebServers() {
+		return uebServers;
+	}
 
-    public void setDistributionNotifTopicName(String distributionNotifTopicName) {
-        this.distributionNotifTopicName = distributionNotifTopicName;
-    }
+	public void setUebServers(List<String> uebServers) {
+		this.uebServers = uebServers;
+	}
 
-    public String getDistributionStatusTopicName() {
-        return distributionStatusTopicName;
-    }
+	public String getDistributionNotifTopicName() {
+		return distributionNotifTopicName;
+	}
 
-    public void setDistributionStatusTopicName(String distributionStatusTopicName) {
-        this.distributionStatusTopicName = distributionStatusTopicName;
-    }
+	public void setDistributionNotifTopicName(String distributionNotifTopicName) {
+		this.distributionNotifTopicName = distributionNotifTopicName;
+	}
 
-    public Integer getInitRetryIntervalSec() {
-        return initRetryIntervalSec;
-    }
+	public String getDistributionStatusTopicName() {
+		return distributionStatusTopicName;
+	}
 
-    public void setInitRetryIntervalSec(Integer initRetryIntervalSec) {
-        this.initRetryIntervalSec = initRetryIntervalSec;
-    }
+	public void setDistributionStatusTopicName(String distributionStatusTopicName) {
+		this.distributionStatusTopicName = distributionStatusTopicName;
+	}
 
-    public ComponentArtifactTypesConfig getDistribNotifServiceArtifactTypes() {
-        return distribNotifServiceArtifactTypes;
-    }
+	public Integer getInitRetryIntervalSec() {
+		return initRetryIntervalSec;
+	}
 
-    public void setDistribNotifServiceArtifactTypes(ComponentArtifactTypesConfig distribNotifServiceArtifactTypes) {
-        this.distribNotifServiceArtifactTypes = distribNotifServiceArtifactTypes;
-    }
+	public void setInitRetryIntervalSec(Integer initRetryIntervalSec) {
+		this.initRetryIntervalSec = initRetryIntervalSec;
+	}
 
-    public ComponentArtifactTypesConfig getDistribNotifResourceArtifactTypes() {
-        return distribNotifResourceArtifactTypes;
-    }
+	public ComponentArtifactTypesConfig getDistribNotifServiceArtifactTypes() {
+		return distribNotifServiceArtifactTypes;
+	}
 
-    public void setDistribNotifResourceArtifactTypes(ComponentArtifactTypesConfig distribNotifResourceArtifactTypes) {
-        this.distribNotifResourceArtifactTypes = distribNotifResourceArtifactTypes;
-    }
+	public void setDistribNotifServiceArtifactTypes(ComponentArtifactTypesConfig distribNotifServiceArtifactTypes) {
+		this.distribNotifServiceArtifactTypes = distribNotifServiceArtifactTypes;
+	}
 
-    public String getUebPublicKey() {
-        return uebPublicKey;
-    }
+	public ComponentArtifactTypesConfig getDistribNotifResourceArtifactTypes() {
+		return distribNotifResourceArtifactTypes;
+	}
 
-    public void setUebPublicKey(String uebPublicKey) {
-        this.uebPublicKey = uebPublicKey;
-    }
+	public void setDistribNotifResourceArtifactTypes(ComponentArtifactTypesConfig distribNotifResourceArtifactTypes) {
+		this.distribNotifResourceArtifactTypes = distribNotifResourceArtifactTypes;
+	}
 
-    public String getUebSecretKey() {
-        return uebSecretKey;
-    }
+	public String getUebPublicKey() {
+		return uebPublicKey;
+	}
 
-    public void setUebSecretKey(String uebSecretKey) {
-        this.uebSecretKey = uebSecretKey;
-    }
+	public void setUebPublicKey(String uebPublicKey) {
+		this.uebPublicKey = uebPublicKey;
+	}
 
-    public List<String> getEnvironments() {
-        return environments;
-    }
+	public String getUebSecretKey() {
+		return uebSecretKey;
+	}
 
-    public void setEnvironments(List<String> environments) {
+	public void setUebSecretKey(String uebSecretKey) {
+		this.uebSecretKey = uebSecretKey;
+	}
 
-        Set<String> set = new HashSet<>();
-        if (environments != null) {
-            set.addAll(environments);
-            this.environments = new ArrayList<>(set);
-        } else {
-            this.environments = null;
-        }
+	public List<String> getEnvironments() {
+		return environments;
+	}
 
-    }
+	public void setEnvironments(List<String> environments) {
 
-    public DistributionStatusTopicConfig getDistributionStatusTopic() {
-        return distributionStatusTopic;
-    }
+		Set<String> set = new HashSet<>();
+		if (environments != null) {
+			set.addAll(environments);
+			this.environments = new ArrayList<>(set);
+		} else {
+			this.environments = null;
+		}
 
-    public void setDistributionStatusTopic(DistributionStatusTopicConfig distributionStatusTopic) {
-        this.distributionStatusTopic = distributionStatusTopic;
-    }
+	}
 
-    public Integer getInitMaxIntervalSec() {
-        return initMaxIntervalSec;
-    }
+	public DistributionStatusTopicConfig getDistributionStatusTopic() {
+		return distributionStatusTopic;
+	}
 
-    public void setInitMaxIntervalSec(Integer initMaxIntervalSec) {
-        this.initMaxIntervalSec = initMaxIntervalSec;
-    }
+	public void setDistributionStatusTopic(DistributionStatusTopicConfig distributionStatusTopic) {
+		this.distributionStatusTopic = distributionStatusTopic;
+	}
 
-    public CreateTopicConfig getCreateTopic() {
-        return createTopic;
-    }
+	public Integer getInitMaxIntervalSec() {
+		return initMaxIntervalSec;
+	}
 
-    public void setCreateTopic(CreateTopicConfig createTopic) {
-        this.createTopic = createTopic;
-    }
+	public void setInitMaxIntervalSec(Integer initMaxIntervalSec) {
+		this.initMaxIntervalSec = initMaxIntervalSec;
+	}
 
-    public boolean isStartDistributionEngine() {
-        return startDistributionEngine;
-    }
+	public CreateTopicConfig getCreateTopic() {
+		return createTopic;
+	}
 
-    public void setStartDistributionEngine(boolean startDistributionEngine) {
-        this.startDistributionEngine = startDistributionEngine;
-    }
+	public void setCreateTopic(CreateTopicConfig createTopic) {
+		this.createTopic = createTopic;
+	}
 
-    public DistributionNotificationTopicConfig getDistributionNotificationTopic() {
-        return distributionNotificationTopic;
-    }
+	public boolean isStartDistributionEngine() {
+		return startDistributionEngine;
+	}
 
-    public void setDistributionNotificationTopic(DistributionNotificationTopicConfig distributionNotificationTopic) {
-        this.distributionNotificationTopic = distributionNotificationTopic;
-    }
+	public void setStartDistributionEngine(boolean startDistributionEngine) {
+		this.startDistributionEngine = startDistributionEngine;
+	}
 
-    public int getDefaultArtifactInstallationTimeout() {
-        return defaultArtifactInstallationTimeout;
-    }
 
-    public void setDefaultArtifactInstallationTimeout(int defaultArtifactInstallationTimeout) {
-        this.defaultArtifactInstallationTimeout = defaultArtifactInstallationTimeout;
-    }
 
-    public int getCurrentArtifactInstallationTimeout() {
-        return currentArtifactInstallationTimeout;
-    }
+	public DistributionNotificationTopicConfig getDistributionNotificationTopic() {
+		return distributionNotificationTopic;
+	}
 
-    public void setCurrentArtifactInstallationTimeout(int currentArtifactInstallationTimeout) {
-        this.currentArtifactInstallationTimeout = currentArtifactInstallationTimeout;
-    }
+	public void setDistributionNotificationTopic(DistributionNotificationTopicConfig distributionNotificationTopic) {
+		this.distributionNotificationTopic = distributionNotificationTopic;
+	}
 
-    public boolean isUseHttpsWithDmaap() {
-        return useHttpsWithDmaap;
-    }
+	public int getDefaultArtifactInstallationTimeout() {
+		return defaultArtifactInstallationTimeout;
+	}
+	public void setDefaultArtifactInstallationTimeout(int defaultArtifactInstallationTimeout) {
+		this.defaultArtifactInstallationTimeout = defaultArtifactInstallationTimeout;
+	}
+	
+	public int getCurrentArtifactInstallationTimeout() {
+		return currentArtifactInstallationTimeout;
+	}
+	public void setCurrentArtifactInstallationTimeout(int currentArtifactInstallationTimeout) {
+		this.currentArtifactInstallationTimeout = currentArtifactInstallationTimeout;
+	}
+	public boolean isUseHttpsWithDmaap() {
+		return useHttpsWithDmaap;
+	}
 
-    public void setUseHttpsWithDmaap(boolean useHttpsWithDmaap) {
-        this.useHttpsWithDmaap = useHttpsWithDmaap;
-    }
+	public void setUseHttpsWithDmaap(boolean useHttpsWithDmaap) {
+		this.useHttpsWithDmaap = useHttpsWithDmaap;
+	}
 
-    public static class CreateTopicConfig {
+	public static class CreateTopicConfig {
 
-        private Integer partitionCount;
-        private Integer replicationCount;
+		private Integer partitionCount;
+		private Integer replicationCount;
 
-        public Integer getPartitionCount() {
-            return partitionCount;
-        }
+		public Integer getPartitionCount() {
+			return partitionCount;
+		}
 
-        public void setPartitionCount(Integer partitionCount) {
-            this.partitionCount = partitionCount;
-        }
+		public void setPartitionCount(Integer partitionCount) {
+			this.partitionCount = partitionCount;
+		}
 
-        public Integer getReplicationCount() {
-            return replicationCount;
-        }
+		public Integer getReplicationCount() {
+			return replicationCount;
+		}
 
-        public void setReplicationCount(Integer replicationCount) {
-            this.replicationCount = replicationCount;
-        }
+		public void setReplicationCount(Integer replicationCount) {
+			this.replicationCount = replicationCount;
+		}
 
-        @Override
-        public String toString() {
-            return "CreateTopicConfig [partitionCount=" + partitionCount + ", replicationCount=" + replicationCount
-                    + "]";
-        }
+		@Override
+		public String toString() {
+			return "CreateTopicConfig [partitionCount=" + partitionCount + ", replicationCount=" + replicationCount
+					+ "]";
+		}
 
-    }
+	}
 
-    public static class EnvironmentConfig {
+	public static class EnvironmentConfig {
 
-        private String name;
-        private List<String> uebServers;
+		private String name;
+		private List<String> uebServers;
 
-        public String getName() {
-            return name;
-        }
+		public String getName() {
+			return name;
+		}
 
-        public void setName(String name) {
-            this.name = name;
-        }
+		public void setName(String name) {
+			this.name = name;
+		}
 
-        public List<String> getUebServers() {
-            return uebServers;
-        }
+		public List<String> getUebServers() {
+			return uebServers;
+		}
 
-        public void setUebServers(List<String> uebServers) {
-            this.uebServers = uebServers;
-        }
+		public void setUebServers(List<String> uebServers) {
+			this.uebServers = uebServers;
+		}
 
-        @Override
-        public String toString() {
-            return "EnvironmentConfig [name=" + name + ", uebServers=" + uebServers + "]";
-        }
+		@Override
+		public String toString() {
+			return "EnvironmentConfig [name=" + name + ", uebServers=" + uebServers + "]";
+		}
 
-    }
+	}
 
-    public static class DistributionStatusTopicConfig {
+	public static class DistributionStatusTopicConfig {
 
-        private Integer pollingIntervalSec;
-        private Integer fetchTimeSec;
-        private String consumerGroup;
-        private String consumerId;
+		private Integer pollingIntervalSec;
+		private Integer fetchTimeSec;
+		private String consumerGroup;
+		private String consumerId;
 
-        public Integer getPollingIntervalSec() {
-            return pollingIntervalSec;
-        }
+		public Integer getPollingIntervalSec() {
+			return pollingIntervalSec;
+		}
 
-        public void setPollingIntervalSec(Integer pollingIntervalSec) {
-            this.pollingIntervalSec = pollingIntervalSec;
-        }
+		public void setPollingIntervalSec(Integer pollingIntervalSec) {
+			this.pollingIntervalSec = pollingIntervalSec;
+		}
 
-        public Integer getFetchTimeSec() {
-            return fetchTimeSec;
-        }
+		public Integer getFetchTimeSec() {
+			return fetchTimeSec;
+		}
 
-        public void setFetchTimeSec(Integer fetchTimeSec) {
-            this.fetchTimeSec = fetchTimeSec;
-        }
+		public void setFetchTimeSec(Integer fetchTimeSec) {
+			this.fetchTimeSec = fetchTimeSec;
+		}
 
-        public String getConsumerGroup() {
-            return consumerGroup;
-        }
+		public String getConsumerGroup() {
+			return consumerGroup;
+		}
 
-        public void setConsumerGroup(String consumerGroup) {
-            this.consumerGroup = consumerGroup;
-        }
+		public void setConsumerGroup(String consumerGroup) {
+			this.consumerGroup = consumerGroup;
+		}
 
-        public String getConsumerId() {
-            return consumerId;
-        }
+		public String getConsumerId() {
+			return consumerId;
+		}
 
-        public void setConsumerId(String consumerId) {
-            this.consumerId = consumerId;
-        }
+		public void setConsumerId(String consumerId) {
+			this.consumerId = consumerId;
+		}
 
-        @Override
-        public String toString() {
-            return "DistributionStatusTopicConfig [pollingIntervalSec=" + pollingIntervalSec + ", fetchTimeSec="
-                    + fetchTimeSec + ", consumerGroup=" + consumerGroup + ", consumerId=" + consumerId + "]";
-        }
+		@Override
+		public String toString() {
+			return "DistributionStatusTopicConfig [pollingIntervalSec=" + pollingIntervalSec + ", fetchTimeSec="
+					+ fetchTimeSec + ", consumerGroup=" + consumerGroup + ", consumerId=" + consumerId + "]";
+		}
 
-    }
+	}
 
-    public static class DistributionNotificationTopicConfig {
+	public static class DistributionNotificationTopicConfig {
 
-        private Integer maxWaitingAfterSendingSeconds;
-        private Integer maxThreadPoolSize;
-        private Integer minThreadPoolSize;
+		private Integer maxWaitingAfterSendingSeconds;
+		private Integer maxThreadPoolSize;
+		private Integer minThreadPoolSize;
 
-        public Integer getMaxWaitingAfterSendingSeconds() {
-            return maxWaitingAfterSendingSeconds;
-        }
+		public Integer getMaxWaitingAfterSendingSeconds() {
+			return maxWaitingAfterSendingSeconds;
+		}
 
-        public void setMaxWaitingAfterSendingSeconds(Integer maxWaitingAfterSendingSeconds) {
-            this.maxWaitingAfterSendingSeconds = maxWaitingAfterSendingSeconds;
-        }
+		public void setMaxWaitingAfterSendingSeconds(Integer maxWaitingAfterSendingSeconds) {
+			this.maxWaitingAfterSendingSeconds = maxWaitingAfterSendingSeconds;
+		}
 
-        public Integer getMaxThreadPoolSize() {
-            return maxThreadPoolSize;
-        }
+		public Integer getMaxThreadPoolSize() {
+			return maxThreadPoolSize;
+		}
 
-        public void setMaxThreadPoolSize(Integer maxThreadPoolSize) {
-            this.maxThreadPoolSize = maxThreadPoolSize;
-        }
+		public void setMaxThreadPoolSize(Integer maxThreadPoolSize) {
+			this.maxThreadPoolSize = maxThreadPoolSize;
+		}
 
-        public Integer getMinThreadPoolSize() {
-            return minThreadPoolSize;
-        }
+		public Integer getMinThreadPoolSize() {
+			return minThreadPoolSize;
+		}
 
-        public void setMinThreadPoolSize(Integer minThreadPoolSize) {
-            this.minThreadPoolSize = minThreadPoolSize;
-        }
+		public void setMinThreadPoolSize(Integer minThreadPoolSize) {
+			this.minThreadPoolSize = minThreadPoolSize;
+		}
 
-        @Override
-        public String toString() {
-            return "DistributionNotificationTopicConfig [maxWaitingAfterSendingSeconds=" + maxWaitingAfterSendingSeconds
-                    + ", maxThreadPoolSize=" + maxThreadPoolSize + ", minThreadPoolSize=" + minThreadPoolSize + "]";
-        }
+		@Override
+		public String toString() {
+			return "DistributionNotificationTopicConfig [maxWaitingAfterSendingSeconds=" + maxWaitingAfterSendingSeconds
+					+ ", maxThreadPoolSize=" + maxThreadPoolSize + ", minThreadPoolSize=" + minThreadPoolSize + "]";
+		}
 
-    }
+	}
 
-    public static class ComponentArtifactTypesConfig {
+	public static class ComponentArtifactTypesConfig {
 
-        private List<String> info;
-        private List<String> lifecycle;
+		private List<String> info;
+		private List<String> lifecycle;
 
-        public List<String> getInfo() {
-            return info;
-        }
+		public List<String> getInfo() {
+			return info;
+		}
 
-        public void setInfo(List<String> info) {
-            this.info = info;
-        }
+		public void setInfo(List<String> info) {
+			this.info = info;
+		}
 
-        public List<String> getLifecycle() {
-            return lifecycle;
-        }
+		public List<String> getLifecycle() {
+			return lifecycle;
+		}
 
-        public void setLifecycle(List<String> lifecycle) {
-            this.lifecycle = lifecycle;
-        }
+		public void setLifecycle(List<String> lifecycle) {
+			this.lifecycle = lifecycle;
+		}
 
-        @Override
-        public String toString() {
-            return "ArtifactTypesConfig [info=" + info + ", lifecycle=" + lifecycle + "]";
-        }
+		@Override
+		public String toString() {
+			return "ArtifactTypesConfig [info=" + info + ", lifecycle=" + lifecycle + "]";
+		}
 
-    }
+	}
 
-    public Integer getOpEnvRecoveryIntervalSec() {
-        return opEnvRecoveryIntervalSec;
-    }
+	public Integer getOpEnvRecoveryIntervalSec() {
+		return opEnvRecoveryIntervalSec;
+	}
 
-    public void setOpEnvRecoveryIntervalSec(Integer opEnvRecoveryIntervalSec) {
-        this.opEnvRecoveryIntervalSec = opEnvRecoveryIntervalSec;
-    }
+	public void setOpEnvRecoveryIntervalSec(Integer opEnvRecoveryIntervalSec) {
+		this.opEnvRecoveryIntervalSec = opEnvRecoveryIntervalSec;
+	}
 
-    public Integer getAllowedTimeBeforeStaleSec() {
-        return allowedTimeBeforeStaleSec;
-    }
+	public Integer getAllowedTimeBeforeStaleSec() {
+		return allowedTimeBeforeStaleSec;
+	}
 
-    public void setAllowedTimeBeforeStaleSec(Integer allowedTimeBeforeStaleSec) {
-        this.allowedTimeBeforeStaleSec = allowedTimeBeforeStaleSec;
-    }
+	public void setAllowedTimeBeforeStaleSec(Integer allowedTimeBeforeStaleSec) {
+		this.allowedTimeBeforeStaleSec = allowedTimeBeforeStaleSec;
+	}
 
     public ExternalServiceConfig getAaiConfig() {
         return aaiConfig;