diff options
author | Benjamin, Max (mb388a) <mb388a@us.att.com> | 2018-10-23 09:43:26 -0400 |
---|---|---|
committer | Benjamin, Max (mb388a) <mb388a@us.att.com> | 2018-10-23 11:12:46 -0400 |
commit | 714f7312ef66123ae7cf5a01dbb1c57701733294 (patch) | |
tree | 0137314f502dd9d9ae083faa76fab0072b693de7 /common/src/main/java/org/onap | |
parent | ad99d2f0c59ce54e7283c210418d1f234191718b (diff) |
default cloud owner now configurable
default cloud owner can now be set via a property
Change-Id: I9b900cb2a5c7176a78e889ad2ce31a4ed9d38585
Issue-ID: SO-1158
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'common/src/main/java/org/onap')
-rw-r--r-- | common/src/main/java/org/onap/so/constants/Defaults.java | 30 | ||||
-rw-r--r-- | common/src/main/java/org/onap/so/spring/SpringContextHelper.java | 40 |
2 files changed, 63 insertions, 7 deletions
diff --git a/common/src/main/java/org/onap/so/constants/Defaults.java b/common/src/main/java/org/onap/so/constants/Defaults.java index 06c6fae467..621acfffaa 100644 --- a/common/src/main/java/org/onap/so/constants/Defaults.java +++ b/common/src/main/java/org/onap/so/constants/Defaults.java @@ -20,19 +20,35 @@ package org.onap.so.constants; +import java.util.Optional; + +import org.onap.so.spring.SpringContextHelper; +import org.springframework.context.ApplicationContext; + public enum Defaults { - CLOUD_OWNER("att-aic"); - - - private final String value; + CLOUD_OWNER("org.onap.so.cloud-owner", "att-aic"); - private Defaults(String value) { - this.value = value; + private final String propName; + private final String defaultValue; + + private Defaults(String propName, String defaultValue) { + this.defaultValue = defaultValue; + this.propName = propName; } @Override public String toString() { - return this.value; + Optional<ApplicationContext> context = getAppContext(); + if (context.isPresent()) { + return context.get().getEnvironment().getProperty(this.propName, this.defaultValue); + } else { + return this.defaultValue; + } + + } + + protected Optional<ApplicationContext> getAppContext() { + return Optional.ofNullable(SpringContextHelper.getAppContext()); } } diff --git a/common/src/main/java/org/onap/so/spring/SpringContextHelper.java b/common/src/main/java/org/onap/so/spring/SpringContextHelper.java new file mode 100644 index 0000000000..1fae5f3e23 --- /dev/null +++ b/common/src/main/java/org/onap/so/spring/SpringContextHelper.java @@ -0,0 +1,40 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.so.spring; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +@Component +public class SpringContextHelper implements ApplicationContextAware { + + private static ApplicationContext context; + + @Override + public void setApplicationContext(ApplicationContext applicationContext) { + context = applicationContext; + } + + public static ApplicationContext getAppContext() { + return context; + } +} |