diff options
author | vempo <vitaliy.emporopulo@amdocs.com> | 2018-10-25 19:27:22 +0300 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-10-28 06:58:23 +0000 |
commit | 933cdbd4c20f18fe47f253bd721baf6ae996e906 (patch) | |
tree | d8298cf67446c13b688ceb1446a15516da698fc5 /common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type | |
parent | edc8d7bbb0faad568b367e60012db476525c288c (diff) |
Code formatting of configuration framework
Fixed code formatting, removed meaningless Javadoc comments,
added copyright headers, minor (and safe) static analysis fixes.
Change-Id: I3eda1f242905da5b80e024cf30a69ff59381fc43
Issue-ID: SDC-1867
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
Diffstat (limited to 'common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type')
4 files changed, 153 insertions, 105 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationMode.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationMode.java index 826d53e6bc..8293abaf5c 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationMode.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationMode.java @@ -1,5 +1,21 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ + package org.onap.config.type; public enum ConfigurationMode { - OVERRIDE, UNION, MERGE + OVERRIDE, UNION, MERGE } diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationQuery.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationQuery.java index 6aec7c27da..faefdb0eb3 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationQuery.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationQuery.java @@ -1,94 +1,98 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ + package org.onap.config.type; import org.onap.config.Constants; public class ConfigurationQuery { - String tenant = Constants.DEFAULT_TENANT; - String namespace = Constants.DEFAULT_NAMESPACE; - String key; - boolean fallback; - boolean externalLookup; - boolean latest; - private boolean nodeSpecific; - - public ConfigurationQuery fallback(boolean fallback) { - this.fallback = fallback; - return this; - } - - public ConfigurationQuery latest(boolean val) { - this.latest = val; - return this; - } - - public ConfigurationQuery nodeSpecific(boolean val) { - this.nodeSpecific = val; - return this; - } - - public ConfigurationQuery externalLookup(boolean val) { - this.externalLookup = val; - return this; - } - - /** - * Tenant configuration query. - * - * @param id the id - * @return the configuration query - */ - public ConfigurationQuery tenant(String id) { - if (id != null) { - tenant = id; + private String tenant = Constants.DEFAULT_TENANT; + private String namespace = Constants.DEFAULT_NAMESPACE; + private String key; + private boolean fallback; + private boolean externalLookup; + private boolean latest; + private boolean nodeSpecific; + + public ConfigurationQuery fallback(boolean fallback) { + this.fallback = fallback; + return this; } - return this; - } - - - /** - * Namespace configuration query. - * - * @param id the id - * @return the configuration query - */ - public ConfigurationQuery namespace(String id) { - if (id != null) { - namespace = id; + + public ConfigurationQuery latest(boolean val) { + this.latest = val; + return this; } - return this; - } - public ConfigurationQuery key(String id) { - key = id; - return this; - } + public ConfigurationQuery nodeSpecific(boolean val) { + this.nodeSpecific = val; + return this; + } + + public ConfigurationQuery externalLookup(boolean val) { + this.externalLookup = val; + return this; + } - public String getTenant() { - return tenant.toUpperCase(); - } + public ConfigurationQuery tenant(String id) { + if (id != null) { + tenant = id; + } + return this; + } - public String getNamespace() { - return namespace.toUpperCase(); - } - public String getKey() { - return key; - } + public ConfigurationQuery namespace(String id) { + if (id != null) { + namespace = id; + } + return this; + } - public boolean isFallback() { - return fallback; - } + public ConfigurationQuery key(String id) { + key = id; + return this; + } - public boolean isNodeSpecific() { - return nodeSpecific; - } + public String getTenant() { + return tenant.toUpperCase(); + } - public boolean isExternalLookup() { - return externalLookup; - } + public String getNamespace() { + return namespace.toUpperCase(); + } - public boolean isLatest() { - return latest; - } + public String getKey() { + return key; + } + + public boolean isFallback() { + return fallback; + } + + public boolean isNodeSpecific() { + return nodeSpecific; + } + + public boolean isExternalLookup() { + return externalLookup; + } + + public boolean isLatest() { + return latest; + } } diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationType.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationType.java index 54253fa754..3fd486522d 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationType.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationType.java @@ -1,5 +1,21 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ + package org.onap.config.type; public enum ConfigurationType { - PROPERTIES, XML, JSON, YAML + PROPERTIES, XML, JSON, YAML } diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationUpdate.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationUpdate.java index 739dd776bf..f14b4ec3a6 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationUpdate.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/type/ConfigurationUpdate.java @@ -1,33 +1,45 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ + package org.onap.config.type; public class ConfigurationUpdate extends ConfigurationQuery { - private String value; - private boolean nodeOverride; - - public ConfigurationUpdate value(String val) { - value = val; - return this; - } - - public ConfigurationUpdate nodeOverride(boolean val) { - nodeOverride = val; - return this; - } - - /** - * Gets value. - * - * @return the value - */ - public String getValue() { - if (value != null && value.split(",").length > 1 && !value.matches("^\\[.*\\]$")) { - return "[" + value + "]"; + + private String value; + private boolean nodeOverride; + + public ConfigurationUpdate value(String val) { + value = val; + return this; + } + + public ConfigurationUpdate nodeOverride(boolean val) { + nodeOverride = val; + return this; + } + + public String getValue() { + if (value != null && value.split(",").length > 1 && !value.matches("^\\[.*\\]$")) { + return "[" + value + "]"; + } + return value; } - return value; - } - public boolean isNodeOverride() { - return nodeOverride; - } + public boolean isNodeOverride() { + return nodeOverride; + } } |