From f47919f1fe367b612fa9c96d34c59f01a541e882 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Mon, 8 Apr 2019 14:14:34 -0400 Subject: Replaced all tabs with spaces in java and pom.xml Added in maven plugins to enforce coding style rules Added in eclipse java formatting xml Change-Id: I3727bbf4ce8dc66abfd8ad21b6cfd0890c5d3ff0 Issue-ID: SO-1765 Signed-off-by: Benjamin, Max (mb388a) --- .../onap/so/adapters/vnfmadapter/VnfmAdapterApplication.java | 8 +++----- .../onap/so/adapters/vnfmadapter/WebSecurityConfigImpl.java | 2 +- .../so/adapters/vnfmadapter/extclients/aai/AaiHelper.java | 4 ++-- .../so/adapters/vnfmadapter/jobmanagement/JobManager.java | 12 +++++------- .../so/adapters/vnfmadapter/jobmanagement/VnfmOperation.java | 4 ++-- .../notificationhandling/NotificationHandler.java | 4 ++-- 6 files changed, 15 insertions(+), 19 deletions(-) (limited to 'adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org') diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/VnfmAdapterApplication.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/VnfmAdapterApplication.java index d7021e7eb8..27b076c6c7 100755 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/VnfmAdapterApplication.java +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/VnfmAdapterApplication.java @@ -29,12 +29,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * The spring boot application for the VNFM (Virtual Network Function Manager) Adapter. *

- * The VNFM Adapter receives requests through its REST API {@link VnfmAdapterController} which it - * adapts into ETSI SOL003 compliant LCM (Life Cycle Management) calls towards an ETSI compliant - * VNFM. + * The VNFM Adapter receives requests through its REST API {@link VnfmAdapterController} which it adapts into ETSI + * SOL003 compliant LCM (Life Cycle Management) calls towards an ETSI compliant VNFM. * - * @see ETSI + * @see ETSI * SOL003 v2.5.1 */ @SpringBootApplication(scanBasePackages = {"org.onap.so"}) diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/WebSecurityConfigImpl.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/WebSecurityConfigImpl.java index 6baa672535..2b33e8b11d 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/WebSecurityConfigImpl.java +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/WebSecurityConfigImpl.java @@ -36,7 +36,7 @@ public class WebSecurityConfigImpl extends WebSecurityConfig { @Override protected void configure(final HttpSecurity http) throws Exception { - http.csrf().disable().authorizeRequests().antMatchers("/manage/health","/manage/info").permitAll() + http.csrf().disable().authorizeRequests().antMatchers("/manage/health", "/manage/info").permitAll() .antMatchers("/**").hasAnyRole(StringUtils.collectionToDelimitedString(getRoles(), ",")).and() .httpBasic(); } diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/aai/AaiHelper.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/aai/AaiHelper.java index 77951062e8..9139d5e66c 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/aai/AaiHelper.java +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/aai/AaiHelper.java @@ -147,8 +147,8 @@ public class AaiHelper { } /** - * Select a VNFM to use for the given generic VNF. Should only be used when no VNFM has already been - * assigned to the VNF. + * Select a VNFM to use for the given generic VNF. Should only be used when no VNFM has already been assigned to the + * VNF. * * @param vnf the generic VNF * @return the VNFM to use diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/jobmanagement/JobManager.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/jobmanagement/JobManager.java index 89356c1b67..7034b7f5ee 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/jobmanagement/JobManager.java +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/jobmanagement/JobManager.java @@ -37,8 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** - * Manages jobs enabling the status of jobs to be queried. A job is associated with an operation on - * a VNFM. + * Manages jobs enabling the status of jobs to be queried. A job is associated with an operation on a VNFM. */ @Component public class JobManager { @@ -57,9 +56,8 @@ public class JobManager { * * @param vnfmId the VNFM the operation relates to * @param operationId the ID of the associated VNFM operation - * @param waitForNotificationForSuccess if set to true the - * {@link QueryJobResponse#getOperationState()} shall not return - * {@link org.onap.vnfmadapter.v1.model.OperationStateEnum#COMPLETED} unless a required + * @param waitForNotificationForSuccess if set to true the {@link QueryJobResponse#getOperationState()} + * shall not return {@link org.onap.vnfmadapter.v1.model.OperationStateEnum#COMPLETED} unless a required * notification has been processed * @return the ID of the job. Can be used to query the job using {@link #getVnfmOperation(String)} */ @@ -75,8 +73,8 @@ public class JobManager { * Get the operation, associated with the given job ID, from the VNFM. * * @param jobId the job ID - * @return the associated operation from the VNFM, or null of no operation is - * associated with the given job ID + * @return the associated operation from the VNFM, or null of no operation is associated with the given + * job ID */ public QueryJobResponse getVnfmOperation(final String jobId) { final VnfmOperation vnfmOperation = mapOfJobIdToVnfmOperation.get(jobId); diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/jobmanagement/VnfmOperation.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/jobmanagement/VnfmOperation.java index e0ad327bd3..3ed66ad713 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/jobmanagement/VnfmOperation.java +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/jobmanagement/VnfmOperation.java @@ -57,8 +57,8 @@ public class VnfmOperation { /** * Set the required notification has been processed for the operation. * - * @param notificationProcessingWasSuccessful true if the notification processing was - * successful, false otherwise + * @param notificationProcessingWasSuccessful true if the notification processing was successful, + * false otherwise */ public void setNotificationProcessed(final boolean notificationProcessingWasSuccessful) { this.notificationStatus = diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/notificationhandling/NotificationHandler.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/notificationhandling/NotificationHandler.java index b82ed86beb..a81451b141 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/notificationhandling/NotificationHandler.java +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/notificationhandling/NotificationHandler.java @@ -40,8 +40,8 @@ import org.onap.so.adapters.vnfmadapter.jobmanagement.JobManager; import org.slf4j.Logger; /** - * Performs updates to AAI based on a received notification. The updates are executed in a separate - * thread so as the notification response to the VNFM is not delayed. + * Performs updates to AAI based on a received notification. The updates are executed in a separate thread so as the + * notification response to the VNFM is not delayed. */ public class NotificationHandler implements Runnable { private static Logger logger = getLogger(NotificationHandler.class); -- cgit 1.2.3-korg