Fix more sonar issues in models: yaml to dao 36/89936/6
authorJim Hahn <jrh3@att.com>
Thu, 13 Jun 2019 22:18:39 +0000 (18:18 -0400)
committerJim Hahn <jrh3@att.com>
Mon, 17 Jun 2019 18:53:51 +0000 (14:53 -0400)
commit6347aed1148a9fab8f7f45e46be71b8bdfc52924
tree36b02ba338e7a17160347360a2dee03596bfb21d
parentf59ec395bf1e41df894f884e70ff3185280668c0
Fix more sonar issues in models: yaml to dao

Extracted common Strings into constants.
Reduced "cyclomatic complexity" in some return statements.
Used assertj to eliminate "log or rethrow" messages in junit tests.

models-yaml
models-base
models-dao

Change-Id: I20548d4cf5e67d085245e0d54df8ba0116ec86ec
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
37 files changed:
models-base/src/test/java/org/onap/policy/models/base/ExceptionsTest.java
models-base/src/test/java/org/onap/policy/models/base/ModelServiceTest.java
models-base/src/test/java/org/onap/policy/models/base/PfConceptContainerTest.java
models-base/src/test/java/org/onap/policy/models/base/PfConceptGetterImplTest.java
models-base/src/test/java/org/onap/policy/models/base/PfKeyTest.java
models-base/src/test/java/org/onap/policy/models/base/PfKeyUseTest.java
models-base/src/test/java/org/onap/policy/models/base/PfModelTest.java
models-base/src/test/java/org/onap/policy/models/base/PfObjectFilterTest.java
models-base/src/test/java/org/onap/policy/models/base/PfReferenceKeyTest.java
models-base/src/test/java/org/onap/policy/models/base/PfUtilsTest.java
models-base/src/test/java/org/onap/policy/models/base/ValidatedTest.java
models-base/src/test/java/org/onap/policy/models/base/ValidationTest.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConcept.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfKey.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfModel.java
models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfNameVersion.java
models-dao/src/test/java/org/onap/policy/models/dao/DaoMiscTest.java
models-dao/src/test/java/org/onap/policy/models/dao/DummyReferenceEntity.java
models-dao/src/test/java/org/onap/policy/models/dao/EntityTest.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/Policy.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/Target.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuard.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/GuardPolicy.java
models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/builder/impl/ControlLoopGuardBuilderImpl.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/CompilerExceptionTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopGuardCompilerTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ConstraintTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardBuilderTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuardTest.java
models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/GuardPolicyTest.java
models-interactions/model-yaml/src/test/resources/v1.0.0/test_evil.yaml