summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2019-03-06 13:54:57 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-06 13:54:57 +0000
commitc4f4624a310a567b20a3d8900ae90fa7cbfa23f7 (patch)
treefbe011ddcd462d8359df3f39b11f6c97bd845423
parent3f2526b26f24f5954dbc2818385137c28a3eb5ba (diff)
parente254c5812c6a859df7625e8df684f65db1af91b3 (diff)
Merge "Replace PropertyConfiguration"
-rw-r--r--feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockingProperties.java20
-rw-r--r--feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingProperties.java19
2 files changed, 24 insertions, 15 deletions
diff --git a/feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockingProperties.java b/feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockingProperties.java
index 00db5733..0ed5930d 100644
--- a/feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockingProperties.java
+++ b/feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockingProperties.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.
@@ -21,11 +21,12 @@
package org.onap.policy.distributed.locking;
import java.util.Properties;
-import org.onap.policy.common.utils.properties.PropertyConfiguration;
+import org.onap.policy.common.utils.properties.BeanConfigurator;
+import org.onap.policy.common.utils.properties.Property;
import org.onap.policy.common.utils.properties.exception.PropertyException;
-public class DistributedLockingProperties extends PropertyConfiguration {
+public class DistributedLockingProperties {
/**
* Feature properties all begin with this prefix.
@@ -40,7 +41,7 @@ public class DistributedLockingProperties extends PropertyConfiguration {
/**
* Properties from which this was constructed.
*/
- private Properties source;
+ private final Properties source;
/**
* Database driver.
@@ -66,9 +67,16 @@ public class DistributedLockingProperties extends PropertyConfiguration {
@Property(name = DB_PWD)
private String dbPwd;
+ /**
+ * Constructs the object, populating fields from the properties.
+ *
+ * @param props properties from which to configure this
+ * @throws PropertyException if an error occurs
+ */
public DistributedLockingProperties(Properties props) throws PropertyException {
- super(props);
source = props;
+
+ new BeanConfigurator().configureFromProperties(this, props);
}
diff --git a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingProperties.java b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingProperties.java
index 795bd29d..29949614 100644
--- a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingProperties.java
+++ b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingProperties.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.
@@ -21,14 +21,15 @@
package org.onap.policy.drools.pooling;
import java.util.Properties;
-import org.onap.policy.common.utils.properties.PropertyConfiguration;
+import org.onap.policy.common.utils.properties.BeanConfigurator;
+import org.onap.policy.common.utils.properties.Property;
import org.onap.policy.common.utils.properties.SpecProperties;
import org.onap.policy.common.utils.properties.exception.PropertyException;
/**
* Properties used by the pooling feature, specific to a controller.
*/
-public class PoolingProperties extends PropertyConfiguration {
+public class PoolingProperties {
/**
* The feature name, used to retrieve properties.
@@ -39,7 +40,7 @@ public class PoolingProperties extends PropertyConfiguration {
* Feature properties all begin with this prefix.
*/
public static final String PREFIX = "pooling.";
-
+
public static final String FEATURE_ENABLED = PREFIX + "enabled";
public static final String POOLING_TOPIC = PREFIX + "topic";
public static final String OFFLINE_LIMIT = PREFIX + "offline.queue.limit";
@@ -130,16 +131,16 @@ public class PoolingProperties extends PropertyConfiguration {
/**
* Constructor.
- *
+ *
* @param controllerName the name of the controller
* @param props set of properties used to configure this
* @throws PropertyException if an error occurs
- *
+ *
*/
public PoolingProperties(String controllerName, Properties props) throws PropertyException {
- super(new SpecProperties(PREFIX, controllerName, props));
-
source = props;
+
+ new BeanConfigurator().configureFromProperties(this, new SpecProperties(PREFIX, controllerName, props));
}
public Properties getSource() {