Merge "Adding Junit"

[so.git] / adapters / mso-vfc-adapter / src / main / java / org / openecomp / mso / adapters / vfc / util / ValidateUtil.java

diff --git a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/ValidateUtil.java b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/ValidateUtil.java
index 1d8549c..8bfa933 100644 (file)
--- a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/ValidateUtil.java
+++ b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/ValidateUtil.java
@@ -17,6 +17,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  */\r
+\r
 package org.openecomp.mso.adapters.vfc.util;\r
 \r
 import org.openecomp.mso.adapters.vfc.constant.HttpCode;\r
@@ -26,60 +27,61 @@ import org.slf4j.LoggerFactory;
 \r
 public class ValidateUtil {\r
 \r
-    /**\r
-     * Log server.\r
-     */\r
-    private static final Logger LOGGER = LoggerFactory.getLogger(ValidateUtil.class);\r
-\r
-    /**\r
-     * Constructor<br/>\r
-     * <p>\r
-     * </p>\r
-     * \r
-     * @since GSO 0.5\r
-     */\r
-    private ValidateUtil() {\r
+  /**\r
+   * Log server.\r
+   */\r
+  private static final Logger LOGGER = LoggerFactory.getLogger(ValidateUtil.class);\r
 \r
-    }\r
+  /**\r
+   * Constructor<br/>\r
+   * <p>\r
+   * </p>\r
+   * \r
+   * @since ONAP Amsterdam Release 2017-9-6\r
+   */\r
+  private ValidateUtil() {\r
 \r
-    /**\r
-     * Assert String parameter.<br/>\r
-     * \r
-     * @param paramValue parameter data\r
-     * @param name of parameter\r
-     * @since GSO 0.5\r
-     */\r
-    public static void assertStringNotNull(String paramValue, String paramName) {\r
-        if(null != paramValue && !paramValue.isEmpty()) {\r
-            return;\r
-        }\r
+  }\r
 \r
-        LOGGER.error(paramName + ": Parameter is null or empty.");\r
-        throw new ApplicationException(HttpCode.BAD_REQUEST, paramName + ": Invalid parameter.");\r
+  /**\r
+   * Assert String parameter.<br/>\r
+   * \r
+   * @param paramValue parameter data\r
+   * @param paramName parameter name\r
+   * @since ONAP Amsterdam Release 2017-9-6\r
+   */\r
+  public static void assertStringNotNull(String paramValue, String paramName)\r
+      throws ApplicationException {\r
+    if (null != paramValue && !paramValue.isEmpty()) {\r
+      return;\r
     }\r
 \r
-    /**\r
-     * Assert object is null.<br/>\r
-     * \r
-     * @param object data object\r
-     * @since GSO 0.5\r
-     */\r
-    public static void assertObjectNotNull(Object object) {\r
-        if(null == object) {\r
-            LOGGER.error("Object is null.");\r
-            throw new ApplicationException(HttpCode.BAD_REQUEST, "Object is null.");\r
-        }\r
+    LOGGER.error(paramName + ": Parameter is null or empty.");\r
+    throw new ApplicationException(HttpCode.BAD_REQUEST, paramName + ": Invalid parameter.");\r
+  }\r
 \r
+  /**\r
+   * Assert object is null.<br/>\r
+   * \r
+   * @param object data object\r
+   * @since ONAP Amsterdam Release 2017-9-6\r
+   */\r
+  public static void assertObjectNotNull(Object object) throws ApplicationException {\r
+    if (null == object) {\r
+      LOGGER.error("Object is null.");\r
+      throw new ApplicationException(HttpCode.BAD_REQUEST, "Object is null.");\r
     }\r
 \r
-    /**\r
-     * <br>\r
-     * \r
-     * @param str\r
-     * @return\r
-     * @since ONAP Amsterdam Release\r
-     */\r
-    public static boolean isStrEmpty(String str) {\r
-        return null == str || str.isEmpty();\r
-    }\r
+  }\r
+\r
+  /**\r
+   * <br>\r
+   * \r
+   * @param str\r
+   * @return\r
+   * @since ONAP Amsterdam Release\r
+   */\r
+  public static boolean isStrEmpty(String str) {\r
+    return null == str || str.isEmpty();\r
+  }\r
 }\r