JUnits for coverage

[portal.git] / ecomp-portal-BE-os / src / main / java / org / onap / portalapp / portal / service / UserServiceImpl.java

diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java
index 82be074..b5ccfc0 100644 (file)
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START==========================================
  * ONAP Portal
  * ===================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
@@ -48,10 +48,8 @@ import java.util.List;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.onap.portalapp.portal.domain.EPUser;
-import org.onap.portalapp.portal.service.UserService;
-import org.onap.portalapp.portal.service.UserServiceImpl;
 import org.onap.portalapp.portal.utils.EPSystemProperties;
-import org.onap.portalsdk.core.FusionObject.Utilities;
+import org.onap.portalsdk.core.domain.FusionObject.Utilities;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.onboarding.util.CipherUtil;
 import org.onap.portalsdk.core.service.DataAccessService;
@@ -130,7 +128,9 @@ public class UserServiceImpl implements UserService {
                                logger.error(EELFLoggerDelegate.errorLogger, "getUserByUserId failed", e);
                        } finally {
                                try {
+                                       if(in!=null) {
                                        in.close();
+                                       }
                                        con.disconnect();
                                } catch (IOException e) {
                                        logger.error(EELFLoggerDelegate.errorLogger, "getUserByUserId 2 failed", e);
@@ -187,8 +187,9 @@ public class UserServiceImpl implements UserService {
 
                                in = new BufferedReader(new InputStreamReader(con.getInputStream(), "UTF-8"));
                                String inputLine;
-                               while ((inputLine = in.readLine()) != null)
+                               while ((inputLine = in.readLine()) != null) {
                                        response.append(inputLine);
+                               }
                                JSONObject jObject = new JSONObject(response.toString()); // json
                                JSONArray jsonUsers = jObject.getJSONArray("response"); // get data object
                                for (int i = 0; i < jsonUsers.length(); i++) {
@@ -222,8 +223,10 @@ public class UserServiceImpl implements UserService {
                                logger.error(EELFLoggerDelegate.errorLogger, "getUserByFirstLastName failed", e);
                        } finally {
                                try {
+                                       if(in!=null) {
                                        in.close();
                                        con.disconnect();
+                                       }
                                } catch (IOException e) {
                                        logger.error(EELFLoggerDelegate.errorLogger, "getUserByFirstLastName 2 failed", e);
                                }