From 7d04c23c7c51738d68f325e450ac408c1ae9905f Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 29 Jun 2021 17:13:09 +0100 Subject: Update CLAMP: checkstyle 8.43/Spring dependencies Updates are indentation changes on annotations and rationallization of the dependencies for Spring/Springboot Generation of swagger.json, swagger.html and swagger.pdf temporarily disabled due to a missing dependency in the generation toolchain. Issue-ID: POLICY-3209 Change-Id: Iff5881df45ef54b20fa30f63e2393cc1cdbf4bfe Signed-off-by: liamfallon --- runtime/src/main/java/org/onap/policy/clamp/clds/Application.java | 4 ++-- .../java/org/onap/policy/clamp/loop/template/LoopElementModel.java | 5 +++-- runtime/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'runtime/src/main/java') diff --git a/runtime/src/main/java/org/onap/policy/clamp/clds/Application.java b/runtime/src/main/java/org/onap/policy/clamp/clds/Application.java index 07c174293..bdab9c9a2 100644 --- a/runtime/src/main/java/org/onap/policy/clamp/clds/Application.java +++ b/runtime/src/main/java/org/onap/policy/clamp/clds/Application.java @@ -6,6 +6,7 @@ * reserved. * ================================================================================ * Modifications Copyright (c) 2019 Samsung + * Modifications Copyright (C) 2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +21,6 @@ * limitations under the License. * ============LICENSE_END============================================ * =================================================================== - * */ package org.onap.policy.clamp.clds; @@ -61,7 +61,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @ComponentScan(basePackages = {"org.onap.policy.clamp"}) @SpringBootApplication(exclude = {SecurityAutoConfiguration.class, UserDetailsServiceAutoConfiguration.class, - ServletMappingAutoConfiguration.class}) + ServletMappingAutoConfiguration.class}) @EnableJpaRepositories(basePackages = {"org.onap.policy.clamp"}) @EntityScan(basePackages = {"org.onap.policy.clamp"}) @EnableTransactionManagement diff --git a/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java index 6eb3c7195..52f1c5d23 100644 --- a/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java +++ b/runtime/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java @@ -4,6 +4,7 @@ * ================================================================================ * Copyright (C) 2018 AT&T Intellectual Property. All rights * reserved. + * Modifications Copyright (C) 2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -103,8 +104,8 @@ public class LoopElementModel extends AuditEntity implements Serializable { name = "loopelementmodels_to_policymodels", joinColumns = @JoinColumn(name = "loop_element_name", referencedColumnName = "name"), inverseJoinColumns = { - @JoinColumn(name = "policy_model_type", referencedColumnName = "policy_model_type"), - @JoinColumn(name = "policy_model_version", referencedColumnName = "version")}) + @JoinColumn(name = "policy_model_type", referencedColumnName = "policy_model_type"), + @JoinColumn(name = "policy_model_version", referencedColumnName = "version")}) @SortNatural private SortedSet policyModels = new TreeSet<>(); diff --git a/runtime/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java b/runtime/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java index 4f748d5dd..40ea25ff8 100644 --- a/runtime/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java +++ b/runtime/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java @@ -4,6 +4,7 @@ * ================================================================================ * Copyright (C) 2020 AT&T Intellectual Property. All rights * reserved. + * Modifications Copyright (C) 2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,8 +71,8 @@ public class Dictionary extends AuditEntity implements Serializable { name = "dictionary_to_dictionaryelements", joinColumns = @JoinColumn(name = "dictionary_name", referencedColumnName = "name"), inverseJoinColumns = {@JoinColumn( - name = "dictionary_element_short_name", - referencedColumnName = "short_name")}) + name = "dictionary_element_short_name", + referencedColumnName = "short_name")}) private Set dictionaryElements = new HashSet<>(); /** -- cgit 1.2.3-korg