From c85a8965e876fde2089582a6468eb02ce18bafd5 Mon Sep 17 00:00:00 2001
From: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Date: Wed, 18 Mar 2020 09:38:27 +0100
Subject: Resolve all checkstyle warnings

Issue-ID: AAF-1107
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Change-Id: I28cfc2b82f1a4800a984e30f59ff36fe90bebb38
---
 .../configuration/model/Authentication.java        | 14 +++++++------
 .../certification/configuration/model/CaMode.java  |  2 +-
 .../configuration/model/Cmpv2Server.java           | 23 ++++++++++++----------
 3 files changed, 22 insertions(+), 17 deletions(-)

(limited to 'certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model')

diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Authentication.java b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Authentication.java
index 3785cf8e..e4c15518 100644
--- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Authentication.java
+++ b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Authentication.java
@@ -25,11 +25,13 @@ import org.hibernate.validator.constraints.Length;
 
 public class Authentication {
 
+    private static final int MAX_IAK_RV_LENGTH = 256;
+
     @NotNull
-    @Length(min = 1, max = 256)
+    @Length(min = 1, max = MAX_IAK_RV_LENGTH)
     private String iak;
     @NotNull
-    @Length(min = 1, max = 256)
+    @Length(min = 1, max = MAX_IAK_RV_LENGTH)
     private String rv;
 
     public String getIak() {
@@ -50,9 +52,9 @@ public class Authentication {
 
     @Override
     public String toString() {
-        return "Authentication{" +
-                "  iak=*****" +
-                ", rv=*****" +
-                '}';
+        return "Authentication{"
+                + "  iak=*****"
+                + ", rv=*****"
+                + '}';
     }
 }
diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/CaMode.java b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/CaMode.java
index 2186b6ff..374feb3b 100644
--- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/CaMode.java
+++ b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/CaMode.java
@@ -29,7 +29,7 @@ public enum CaMode {
         this.profile = profile;
     }
 
-    public String getProfile(){
+    public String getProfile() {
         return profile;
     }
 }
diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Cmpv2Server.java b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Cmpv2Server.java
index 20b83b82..51d91966 100644
--- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Cmpv2Server.java
+++ b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/model/Cmpv2Server.java
@@ -22,23 +22,26 @@ package org.onap.aaf.certservice.certification.configuration.model;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+
 import org.bouncycastle.asn1.x500.X500Name;
 import org.hibernate.validator.constraints.Length;
-import org.onap.aaf.certservice.certification.configuration.validation.constraints.Cmpv2URL;
+import org.onap.aaf.certservice.certification.configuration.validation.constraints.Cmpv2Url;
 
 public class Cmpv2Server {
 
+    private static final int MAX_CA_NAME_LENGTH = 128;
+
     @NotNull
     @Valid
     private Authentication authentication;
     @NotNull
     private CaMode caMode;
     @NotNull
-    @Length(min = 1, max = 128)
+    @Length(min = 1, max = MAX_CA_NAME_LENGTH)
     private String caName;
     @NotNull
     private X500Name issuerDN;
-    @Cmpv2URL
+    @Cmpv2Url
     private String url;
 
     public Authentication getAuthentication() {
@@ -83,13 +86,13 @@ public class Cmpv2Server {
 
     @Override
     public String toString() {
-        return "Cmpv2Server{" +
-                "authentication=" + authentication +
-                ", caMode=" + caMode +
-                ", caName='" + caName + '\'' +
-                ", issuerDN='" + issuerDN + '\'' +
-                ", url='" + url + '\'' +
-                '}';
+        return "Cmpv2Server{"
+                + "authentication=" + authentication
+                + ", caMode=" + caMode
+                + ", caName='" + caName + '\''
+                + ", issuerDN='" + issuerDN + '\''
+                + ", url='" + url + '\''
+                + '}';
     }
 
 }
-- 
cgit 1.2.3-korg