diff options
Diffstat (limited to 'feature-distributed-locking/src')
3 files changed, 14 insertions, 14 deletions
diff --git a/feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockingFeature.java b/feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockingFeature.java index f162e1c4..d5e07a30 100644 --- a/feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockingFeature.java +++ b/feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockingFeature.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. @@ -30,7 +30,7 @@ import org.apache.commons.dbcp2.BasicDataSourceFactory; import org.onap.policy.common.utils.properties.exception.PropertyException; import org.onap.policy.drools.core.lock.PolicyResourceLockFeatureApi; import org.onap.policy.drools.features.PolicyEngineFeatureApi; -import org.onap.policy.drools.persistence.SystemPersistence; +import org.onap.policy.drools.persistence.SystemPersistenceConstants; import org.onap.policy.drools.system.PolicyEngine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,7 +58,7 @@ public class DistributedLockingFeature implements PolicyEngineFeatureApi, Policy private BasicDataSource dataSource; /** - * UUID. + * UUID. */ private static final UUID uuid = UUID.randomUUID(); @@ -80,7 +80,7 @@ public class DistributedLockingFeature implements PolicyEngineFeatureApi, Policy TargetLock lock = new TargetLock(resourceId, uuid, owner, dataSource); - return (lock.refresh(holdSec) ? OperResult.OPER_ACCEPTED : OperResult.OPER_DENIED); + return (lock.refresh(holdSec) ? OperResult.OPER_ACCEPTED : OperResult.OPER_DENIED); } @Override @@ -108,8 +108,8 @@ public class DistributedLockingFeature implements PolicyEngineFeatureApi, Policy public boolean afterStart(PolicyEngine engine) { try { - this.lockProps = new DistributedLockingProperties( - SystemPersistence.manager.getProperties(DistributedLockingFeature.CONFIGURATION_PROPERTIES_NAME)); + this.lockProps = new DistributedLockingProperties(SystemPersistenceConstants.getManager() + .getProperties(DistributedLockingFeature.CONFIGURATION_PROPERTIES_NAME)); this.dataSource = makeDataSource(); } catch (PropertyException e) { logger.error("DistributedLockingFeature feature properies have not been loaded", e); @@ -130,7 +130,7 @@ public class DistributedLockingFeature implements PolicyEngineFeatureApi, Policy /** * Make data source. - * + * * @return a new, pooled data source * @throws Exception exception */ diff --git a/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockingFeatureTest.java b/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockingFeatureTest.java index 90e8bfc0..68a5a31b 100644 --- a/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockingFeatureTest.java +++ b/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockingFeatureTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-2019 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. @@ -30,7 +30,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.common.utils.properties.exception.PropertyException; -import org.onap.policy.drools.persistence.SystemPersistence; +import org.onap.policy.drools.persistence.SystemPersistenceConstants; /** * Partially tests DistributedLockingFeature; most of the methods are tested via @@ -43,7 +43,7 @@ public class DistributedLockingFeatureTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - SystemPersistence.manager.setConfigurationDir("src/test/resources"); + SystemPersistenceConstants.getManager().setConfigurationDir("src/test/resources"); } @Before diff --git a/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/TargetLockTest.java b/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/TargetLockTest.java index 6fa1febb..84eba6b6 100644 --- a/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/TargetLockTest.java +++ b/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/TargetLockTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * feature-distributed-locking * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-2019 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. @@ -39,7 +39,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.drools.core.lock.PolicyResourceLockFeatureApi.OperResult; -import org.onap.policy.drools.persistence.SystemPersistence; +import org.onap.policy.drools.persistence.SystemPersistenceConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,7 +64,7 @@ public class TargetLockTest { public static void setup() { getDbConnection(); createTable(); - SystemPersistence.manager.setConfigurationDir("src/test/resources"); + SystemPersistenceConstants.getManager().setConfigurationDir("src/test/resources"); distLockFeat = new DistributedLockingFeature(); distLockFeat.afterStart(null); } |