Adjust code for Sonar issues

Made non-functional updates to address static code analysis issues.
Update license header with simple double-quote characters.

Issue: PORTAL-72, PORTAL-90
Change-Id: Ic2c330daea07d721f0e6b350ebf03da97073f7ce
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

6 files changed, 810 insertions, 737 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/LoginBean.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/LoginBean.java
index 0f156bce..dc6806a8 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/LoginBean.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/LoginBean.java
@@ -6,7 +6,7 @@
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
+ * under the Apache License, Version 2.0 (the "License");
  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -44,163 +44,170 @@ import org.onap.portalsdk.core.domain.support.FusionCommand;
 
 public class LoginBean extends FusionCommand {
 
-    private String loginId;
-    private String loginPwd;
-    private String hrid;
-    private String userid;
-    private String siteAccess;
-    private String loginErrorMessage;
-
-    private User user;
-    @SuppressWarnings("rawtypes")
-    private Set  menu;
-    @SuppressWarnings("rawtypes")
-    private Set  businessDirectMenu;
-
-    /**
-     * getLoginId
-     *
-     * @return String
-     */
-    public String getLoginId() {
-        return loginId;
-    }
-
-    /**
-     * getLoginPwd
-     *
-     * @return String
-     */
-    public String getLoginPwd() {
-        return loginPwd;
-    }
-
-    /**
-     * getMenu
-     *
-     * @return Set
-     */
-    @SuppressWarnings("rawtypes")
-    public Set getMenu() {
-        return menu;
-    }
-
-    /**
-     * getUser
-     *
-     * @return User
-     */
-    public User getUser() {
-        return user;
-    }
-
-    /**
-     * getHrid
-     *
-     * @return String
-     */
-    public String getHrid() {
-        return hrid;
-    }
-
-    /**
-     * getSiteAccess
-     *
-     * @return String
-     */
-    public String getSiteAccess() {
-        return siteAccess;
-    }
-
-    /**
-     * getBusinessDirectMenu
-     *
-     * @return Set
-     */
-    @SuppressWarnings("rawtypes")
-    public Set getBusinessDirectMenu() {
-        return businessDirectMenu;
-    }
-
-    /**
-     * getLoginErrorMessage
-     *
-     * @return String
-     */
-    public String getLoginErrorMessage() {
-        return loginErrorMessage;
-    }
-
-    /**
-     * setLoginId
-     *
-     * @param loginId String
-     */
-    public void setLoginId(String loginId) {
-        this.loginId = loginId;
-    }
-
-    /**
-     * setLoginPwd
-     *
-     * @param loginPwd String
-     */
-    public void setLoginPwd(String loginPwd) {
-        this.loginPwd = loginPwd;
-    }
-
-    @SuppressWarnings("rawtypes")
-    public void setMenu(Set menu) {
-        this.menu = menu;
-    }
-
-    /**
-     * setUser
-     *
-     * @param user User
-     */
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    /**
-     * setHrid
-     *
-     * @param hrid String
-     */
-    public void setHrid(String hrid) {
-        this.hrid = hrid;
-    }
-
-    /**
-     * setSiteAccess
-     *
-     * @param siteAccess String
-     */
-    public void setSiteAccess(String siteAccess) {
-        this.siteAccess = siteAccess;
-    }
-
-    /**
-     * setBusinessDirectMenu
-     *
-     * @param businessDirectMenu Set
-     */
-    @SuppressWarnings("rawtypes")
-    public void setBusinessDirectMenu(Set businessDirectMenu) {
-        this.businessDirectMenu = businessDirectMenu;
-    }
-
-    /**
-     * setLoginErrorMessage
-     *
-     * @param loginErrorMessage String
-     */
-    public void setLoginErrorMessage(String loginErrorMessage) {
-        this.loginErrorMessage = loginErrorMessage;
-    }
-
-    public String getUserid() {
+	private String loginId;
+	private String loginPwd;
+	private String hrid;
+	private String userid;
+	private String siteAccess;
+	private String loginErrorMessage;
+
+	private User user;
+	@SuppressWarnings("rawtypes")
+	private Set menu;
+	@SuppressWarnings("rawtypes")
+	private Set businessDirectMenu;
+
+	/**
+	 * getLoginId
+	 *
+	 * @return String
+	 */
+	public String getLoginId() {
+		return loginId;
+	}
+
+	/**
+	 * getLoginPwd
+	 *
+	 * @return String
+	 */
+	public String getLoginPwd() {
+		return loginPwd;
+	}
+
+	/**
+	 * getMenu
+	 *
+	 * @return Set
+	 */
+	@SuppressWarnings("rawtypes")
+	public Set getMenu() {
+		return menu;
+	}
+
+	/**
+	 * getUser
+	 *
+	 * @return User
+	 */
+	public User getUser() {
+		return user;
+	}
+
+	/**
+	 * getHrid
+	 *
+	 * @return String
+	 */
+	public String getHrid() {
+		return hrid;
+	}
+
+	/**
+	 * getSiteAccess
+	 *
+	 * @return String
+	 */
+	public String getSiteAccess() {
+		return siteAccess;
+	}
+
+	/**
+	 * getBusinessDirectMenu
+	 *
+	 * @return Set
+	 */
+	@SuppressWarnings("rawtypes")
+	public Set getBusinessDirectMenu() {
+		return businessDirectMenu;
+	}
+
+	/**
+	 * getLoginErrorMessage
+	 *
+	 * @return String
+	 */
+	public String getLoginErrorMessage() {
+		return loginErrorMessage;
+	}
+
+	/**
+	 * setLoginId
+	 *
+	 * @param loginId
+	 *            String
+	 */
+	public void setLoginId(String loginId) {
+		this.loginId = loginId;
+	}
+
+	/**
+	 * setLoginPwd
+	 *
+	 * @param loginPwd
+	 *            String
+	 */
+	public void setLoginPwd(String loginPwd) {
+		this.loginPwd = loginPwd;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public void setMenu(Set menu) {
+		this.menu = menu;
+	}
+
+	/**
+	 * setUser
+	 *
+	 * @param user
+	 *            User
+	 */
+	public void setUser(User user) {
+		this.user = user;
+	}
+
+	/**
+	 * setHrid
+	 *
+	 * @param hrid
+	 *            String
+	 */
+	public void setHrid(String hrid) {
+		this.hrid = hrid;
+	}
+
+	/**
+	 * setSiteAccess
+	 *
+	 * @param siteAccess
+	 *            String
+	 */
+	public void setSiteAccess(String siteAccess) {
+		this.siteAccess = siteAccess;
+	}
+
+	/**
+	 * setBusinessDirectMenu
+	 *
+	 * @param businessDirectMenu
+	 *            Set
+	 */
+	@SuppressWarnings("rawtypes")
+	public void setBusinessDirectMenu(Set businessDirectMenu) {
+		this.businessDirectMenu = businessDirectMenu;
+	}
+
+	/**
+	 * setLoginErrorMessage
+	 *
+	 * @param loginErrorMessage
+	 *            String
+	 */
+	public void setLoginErrorMessage(String loginErrorMessage) {
+		this.loginErrorMessage = loginErrorMessage;
+	}
+
+	public String getUserid() {
 		return userid;
 	}
 
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/PostDroolsBean.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/PostDroolsBean.java
index 89052495..005ecd5e 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/PostDroolsBean.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/PostDroolsBean.java
@@ -6,7 +6,7 @@
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
+ * under the Apache License, Version 2.0 (the "License");
  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -42,28 +42,32 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 @JsonSerialize
 public class PostDroolsBean {
 
-    private String droolsFile;
-    private String className;
-    private String selectedRules;
-    
+	private String droolsFile;
+	private String className;
+	private String selectedRules;
+
 	public String getDroolsFile() {
 		return droolsFile;
 	}
+
 	public void setDroolsFile(String droolsFile) {
 		this.droolsFile = droolsFile;
 	}
+
 	public String getSelectedRules() {
 		return selectedRules;
 	}
+
 	public void setSelectedRules(String selectedRules) {
 		this.selectedRules = selectedRules;
 	}
+
 	public String getClassName() {
 		return className;
 	}
+
 	public void setClassName(String className) {
 		this.className = className;
-	} 
+	}
 
-   
-}	
+}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/PostSearchBean.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/PostSearchBean.java
index 3b32364e..b18cfc93 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/PostSearchBean.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/PostSearchBean.java
@@ -6,7 +6,7 @@
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
+ * under the Apache License, Version 2.0 (the "License");
  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -47,271 +47,347 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 @JsonSerialize
 public class PostSearchBean extends SearchBase {
 
-    private User     user     = null;
-    private User     userOrig = null;
-    private String[] selected;
-    private String[] postHrid;
-    private String[] postOrgUserId;
-    private String[] postFirstName;
-    private String[] postLastName;
-    private String[] postOrgCode;
-    private String[] postPhone;
-    private String[] postEmail;
-    private String[] postAddress1;
-    private String[] postAddress2;
-    private String[] postCity;
-    private String[] postState;
-    private String[] postZipCode;
-    private String[] postLocationClli;
-    private String[] postBusinessCountryCode;
-    private String[] postBusinessCountryName;
-    private String[] postDepartment;
-    private String[] postDepartmentName;
-    private String[] postBusinessUnit;
-    private String[] postBusinessUnitName;
-    private String[] postJobTitle;
-    private String[] postOrgManagerUserId;
-    private String[] postCommandChain;
-    private String[] postCompanyCode;
-    private String[] postCompany;
-    private String[] postCostCenter;
-    private String[] postSiloStatus;
-    private String[] postFinancialLocCode;
-
-
-    @SuppressWarnings("rawtypes")
-    public PostSearchBean() {
-      this(null);
-    } // PostSearchBean
-
-    @SuppressWarnings("rawtypes")
-    public PostSearchBean(List items) {
-      super(items);
-
-      user     = new User();
-      userOrig = new User();
-
-      setSortBy1("");
-      setSortBy1Orig("");
-
-      //setSortByList(...);
-    }	// PostSearchBean
-
-
-    public String getFirstName()                      { return user.getFirstName(); }
-    public String getLastName()                       { return user.getLastName(); }
-    public String getHrid()                           { return user.getHrid(); }
-    public String getOrgUserId()                          { return user.getOrgUserId(); }
-    public String getOrgCode()                        { return user.getOrgCode(); }
-    public String getEmail()                          { return user.getEmail(); }
-    public String getOrgManagerUserId()                  { return user.getOrgManagerUserId(); }
-    
-    public String getFirstNameOrig()                  { return user.getFirstName(); }
-    public String getLastNameOrig()                   { return user.getLastName(); }
-    public String getHridOrig()                       { return user.getHrid(); }
-    public String getOrgUserIdOrig()                      { return user.getOrgUserId(); }
-    public String getOrgCodeOrig()                    { return user.getOrgCode(); }
-    public String getEmailOrig()                      { return user.getEmail(); }
-    public String getOrgManagerUserIdOrig()              { return user.getOrgManagerUserId(); }
-    
-    
-    public User getUser()                             { return user; }
-
-    public String[] getPostEmail() {
-        return postEmail;
-    }
-
-    public String[] getPostFirstName() {
-        return postFirstName;
-    }
-
-    public String[] getPostHrid() {
-        return postHrid;
-    }
-
-    public String[] getPostLastName() {
-        return postLastName;
-    }
-
-    public String[] getPostOrgCode() {
-        return postOrgCode;
-    }
-
-    public String[] getPostPhone() {
-        return postPhone;
-    }
-
-    public String[] getPostOrgUserId() {
-        return postOrgUserId;
-    }
-
-    public String[] getSelected() {
-        return selected;
-    }
-
-    public String[] getPostAddress1() {
-        return postAddress1;
-    }
-
-    public String[] getPostBusinessCountryCode() {
-        return postBusinessCountryCode;
-    }
-
-    public String[] getPostCity() {
-        return postCity;
-    }
-
-    public String[] getPostCommandChain() {
-        return postCommandChain;
-    }
-
-    public String[] getPostCompany() {
-        return postCompany;
-    }
-
-    public String[] getPostCompanyCode() {
-        return postCompanyCode;
-    }
-
-    public String[] getPostDepartment() {
-        return postDepartment;
-    }
-
-    public String[] getPostDepartmentName() {
-        return postDepartmentName;
-    }
-
-    public String[] getPostBusinessCountryName() {
-        return postBusinessCountryName;
-    }
-
-    public String[] getPostJobTitle() {
-        return postJobTitle;
-    }
-
-    public String[] getPostLocationClli() {
-        return postLocationClli;
-    }
-
-    public String[] getPostOrgManagerUserId() {
-        return postOrgManagerUserId;
-    }
-
-    public String[] getPostState() {
-        return postState;
-    }
-
-    public String[] getPostZipCode() {
-        return postZipCode;
-    }
-
-    public void setFirstName(String value)            { user.setFirstName(value); }
-    public void setLastName(String value)             { user.setLastName(value); }
-    public void setHrid(String value)                 { user.setHrid(value); }
-    public void setOrgUserId(String value)                { user.setOrgUserId(value); }
-    public void setOrgCode(String value)              { user.setOrgCode(value); }
-    public void setEmail(String value)                { user.setEmail(value); }
-    public void setOrgManagerUserId(String value)        { user.setOrgManagerUserId(value); }
-    
-    public void setFirstNameOrig(String value)        { userOrig.setFirstName(value); }
-    public void setLastNameOrig(String value)         { userOrig.setLastName(value); }
-    public void setHridOrig(String value)             { userOrig.setHrid(value); }
-    public void setOrgUserIdOrig(String value)            { userOrig.setOrgUserId(value); }
-    public void setOrgCodeOrig(String value)          { userOrig.setOrgCode(value); }
-    public void setEmailOrig(String value)            { userOrig.setEmail(value); }
-    public void setOrgManagerUserIdOrig(String value)    { userOrig.setOrgManagerUserId(value); }
-    
-    public void setUser(User value)                   { this.user = value; }
-
-    public void setPostEmail(String[] postEmail) {
-        this.postEmail = postEmail;
-    }
-
-    public void setPostFirstName(String[] postFirstName) {
-        this.postFirstName = postFirstName;
-    }
-
-    public void setPostHrid(String[] postHrid) {
-        this.postHrid = postHrid;
-    }
-
-    public void setPostLastName(String[] postLastName) {
-        this.postLastName = postLastName;
-    }
-
-    public void setPostOrgCode(String[] postOrgCode) {
-        this.postOrgCode = postOrgCode;
-    }
-
-    public void setPostPhone(String[] postPhone) {
-        this.postPhone = postPhone;
-    }
-
-    public void setPostOrgUserId(String[] postOrgUserId) {
-        this.postOrgUserId = postOrgUserId;
-    }
-
-    public void setSelected(String[] selected) {
-        this.selected = selected;
-    }
-
-    public void setPostAddress1(String[] postAddress1) {
-        this.postAddress1 = postAddress1;
-    }
-
-    public void setPostBusinessCountryCode(String[] postBusinessCountryCode) {
-        this.postBusinessCountryCode = postBusinessCountryCode;
-    }
-
-    public void setPostCity(String[] postCity) {
-        this.postCity = postCity;
-    }
-
-    public void setPostCommandChain(String[] postCommandChain) {
-        this.postCommandChain = postCommandChain;
-    }
-
-    public void setPostCompany(String[] postCompany) {
-        this.postCompany = postCompany;
-    }
-
-    public void setPostCompanyCode(String[] postCompanyCode) {
-        this.postCompanyCode = postCompanyCode;
-    }
-
-    public void setPostDepartment(String[] postDepartment) {
-        this.postDepartment = postDepartment;
-    }
-
-    public void setPostDepartmentName(String[] postDepartmentName) {
-        this.postDepartmentName = postDepartmentName;
-    }
-
-    public void setPostBusinessCountryName(String[] postBusinessCountryName) {
-        this.postBusinessCountryName = postBusinessCountryName;
-    }
-
-    public void setPostJobTitle(String[] postJobTitle) {
-        this.postJobTitle = postJobTitle;
-    }
-
-    public void setPostLocationClli(String[] postLocationClli) {
-        this.postLocationClli = postLocationClli;
-    }
-
-    public void setPostOrgManagerUserId(String[] postOrgManagerUserId) {
-        this.postOrgManagerUserId = postOrgManagerUserId;
-    }
-
-    public void setPostState(String[] postState) {
-        this.postState = postState;
-    }
-
-    public void setPostZipCode(String[] postZipCode) {
-        this.postZipCode = postZipCode;
-    }
-    
-    public String[] getPostAddress2() {
+	private User user = null;
+	private User userOrig = null;
+	private String[] selected;
+	private String[] postHrid;
+	private String[] postOrgUserId;
+	private String[] postFirstName;
+	private String[] postLastName;
+	private String[] postOrgCode;
+	private String[] postPhone;
+	private String[] postEmail;
+	private String[] postAddress1;
+	private String[] postAddress2;
+	private String[] postCity;
+	private String[] postState;
+	private String[] postZipCode;
+	private String[] postLocationClli;
+	private String[] postBusinessCountryCode;
+	private String[] postBusinessCountryName;
+	private String[] postDepartment;
+	private String[] postDepartmentName;
+	private String[] postBusinessUnit;
+	private String[] postBusinessUnitName;
+	private String[] postJobTitle;
+	private String[] postOrgManagerUserId;
+	private String[] postCommandChain;
+	private String[] postCompanyCode;
+	private String[] postCompany;
+	private String[] postCostCenter;
+	private String[] postSiloStatus;
+	private String[] postFinancialLocCode;
+
+	public PostSearchBean() {
+		this(null);
+	}
+
+	@SuppressWarnings("rawtypes")
+	public PostSearchBean(List items) {
+		super(items);
+		user = new User();
+		userOrig = new User();
+		setSortBy1("");
+		setSortBy1Orig("");
+	}
+
+	public String getFirstName() {
+		return user.getFirstName();
+	}
+
+	public String getLastName() {
+		return user.getLastName();
+	}
+
+	public String getHrid() {
+		return user.getHrid();
+	}
+
+	public String getOrgUserId() {
+		return user.getOrgUserId();
+	}
+
+	public String getOrgCode() {
+		return user.getOrgCode();
+	}
+
+	public String getEmail() {
+		return user.getEmail();
+	}
+
+	public String getOrgManagerUserId() {
+		return user.getOrgManagerUserId();
+	}
+
+	public String getFirstNameOrig() {
+		return user.getFirstName();
+	}
+
+	public String getLastNameOrig() {
+		return user.getLastName();
+	}
+
+	public String getHridOrig() {
+		return user.getHrid();
+	}
+
+	public String getOrgUserIdOrig() {
+		return user.getOrgUserId();
+	}
+
+	public String getOrgCodeOrig() {
+		return user.getOrgCode();
+	}
+
+	public String getEmailOrig() {
+		return user.getEmail();
+	}
+
+	public String getOrgManagerUserIdOrig() {
+		return user.getOrgManagerUserId();
+	}
+
+	public User getUser() {
+		return user;
+	}
+
+	public String[] getPostEmail() {
+		return postEmail;
+	}
+
+	public String[] getPostFirstName() {
+		return postFirstName;
+	}
+
+	public String[] getPostHrid() {
+		return postHrid;
+	}
+
+	public String[] getPostLastName() {
+		return postLastName;
+	}
+
+	public String[] getPostOrgCode() {
+		return postOrgCode;
+	}
+
+	public String[] getPostPhone() {
+		return postPhone;
+	}
+
+	public String[] getPostOrgUserId() {
+		return postOrgUserId;
+	}
+
+	public String[] getSelected() {
+		return selected;
+	}
+
+	public String[] getPostAddress1() {
+		return postAddress1;
+	}
+
+	public String[] getPostBusinessCountryCode() {
+		return postBusinessCountryCode;
+	}
+
+	public String[] getPostCity() {
+		return postCity;
+	}
+
+	public String[] getPostCommandChain() {
+		return postCommandChain;
+	}
+
+	public String[] getPostCompany() {
+		return postCompany;
+	}
+
+	public String[] getPostCompanyCode() {
+		return postCompanyCode;
+	}
+
+	public String[] getPostDepartment() {
+		return postDepartment;
+	}
+
+	public String[] getPostDepartmentName() {
+		return postDepartmentName;
+	}
+
+	public String[] getPostBusinessCountryName() {
+		return postBusinessCountryName;
+	}
+
+	public String[] getPostJobTitle() {
+		return postJobTitle;
+	}
+
+	public String[] getPostLocationClli() {
+		return postLocationClli;
+	}
+
+	public String[] getPostOrgManagerUserId() {
+		return postOrgManagerUserId;
+	}
+
+	public String[] getPostState() {
+		return postState;
+	}
+
+	public String[] getPostZipCode() {
+		return postZipCode;
+	}
+
+	public void setFirstName(String value) {
+		user.setFirstName(value);
+	}
+
+	public void setLastName(String value) {
+		user.setLastName(value);
+	}
+
+	public void setHrid(String value) {
+		user.setHrid(value);
+	}
+
+	public void setOrgUserId(String value) {
+		user.setOrgUserId(value);
+	}
+
+	public void setOrgCode(String value) {
+		user.setOrgCode(value);
+	}
+
+	public void setEmail(String value) {
+		user.setEmail(value);
+	}
+
+	public void setOrgManagerUserId(String value) {
+		user.setOrgManagerUserId(value);
+	}
+
+	public void setFirstNameOrig(String value) {
+		userOrig.setFirstName(value);
+	}
+
+	public void setLastNameOrig(String value) {
+		userOrig.setLastName(value);
+	}
+
+	public void setHridOrig(String value) {
+		userOrig.setHrid(value);
+	}
+
+	public void setOrgUserIdOrig(String value) {
+		userOrig.setOrgUserId(value);
+	}
+
+	public void setOrgCodeOrig(String value) {
+		userOrig.setOrgCode(value);
+	}
+
+	public void setEmailOrig(String value) {
+		userOrig.setEmail(value);
+	}
+
+	public void setOrgManagerUserIdOrig(String value) {
+		userOrig.setOrgManagerUserId(value);
+	}
+
+	public void setUser(User value) {
+		this.user = value;
+	}
+
+	public void setPostEmail(String[] postEmail) {
+		this.postEmail = postEmail;
+	}
+
+	public void setPostFirstName(String[] postFirstName) {
+		this.postFirstName = postFirstName;
+	}
+
+	public void setPostHrid(String[] postHrid) {
+		this.postHrid = postHrid;
+	}
+
+	public void setPostLastName(String[] postLastName) {
+		this.postLastName = postLastName;
+	}
+
+	public void setPostOrgCode(String[] postOrgCode) {
+		this.postOrgCode = postOrgCode;
+	}
+
+	public void setPostPhone(String[] postPhone) {
+		this.postPhone = postPhone;
+	}
+
+	public void setPostOrgUserId(String[] postOrgUserId) {
+		this.postOrgUserId = postOrgUserId;
+	}
+
+	public void setSelected(String[] selected) {
+		this.selected = selected;
+	}
+
+	public void setPostAddress1(String[] postAddress1) {
+		this.postAddress1 = postAddress1;
+	}
+
+	public void setPostBusinessCountryCode(String[] postBusinessCountryCode) {
+		this.postBusinessCountryCode = postBusinessCountryCode;
+	}
+
+	public void setPostCity(String[] postCity) {
+		this.postCity = postCity;
+	}
+
+	public void setPostCommandChain(String[] postCommandChain) {
+		this.postCommandChain = postCommandChain;
+	}
+
+	public void setPostCompany(String[] postCompany) {
+		this.postCompany = postCompany;
+	}
+
+	public void setPostCompanyCode(String[] postCompanyCode) {
+		this.postCompanyCode = postCompanyCode;
+	}
+
+	public void setPostDepartment(String[] postDepartment) {
+		this.postDepartment = postDepartment;
+	}
+
+	public void setPostDepartmentName(String[] postDepartmentName) {
+		this.postDepartmentName = postDepartmentName;
+	}
+
+	public void setPostBusinessCountryName(String[] postBusinessCountryName) {
+		this.postBusinessCountryName = postBusinessCountryName;
+	}
+
+	public void setPostJobTitle(String[] postJobTitle) {
+		this.postJobTitle = postJobTitle;
+	}
+
+	public void setPostLocationClli(String[] postLocationClli) {
+		this.postLocationClli = postLocationClli;
+	}
+
+	public void setPostOrgManagerUserId(String[] postOrgManagerUserId) {
+		this.postOrgManagerUserId = postOrgManagerUserId;
+	}
+
+	public void setPostState(String[] postState) {
+		this.postState = postState;
+	}
+
+	public void setPostZipCode(String[] postZipCode) {
+		this.postZipCode = postZipCode;
+	}
+
+	public String[] getPostAddress2() {
 		return postAddress2;
 	}
 
@@ -367,27 +443,25 @@ public class PostSearchBean extends SearchBase {
 		this.postFinancialLocCode = postFinancialLocCode;
 	}
 
+	@Override
 	public void resetSearch() {
-          super.resetSearch();
-          setUser(new User());
-	} // resetSearch
-
+		super.resetSearch();
+		setUser(new User());
+	}
 
+	@Override
 	public boolean isCriteriaUpdated() {
-          if(user==null&&userOrig==null)
-            return false;
-          else if(user==null||userOrig==null)
-            return true;
-          else
-            return (! (
-                Utilities.nvl(user.getFirstName()).equals(Utilities.nvl(userOrig.getFirstName()))&&
-                Utilities.nvl(user.getLastName()).equals(Utilities.nvl(userOrig.getLastName()))&&
-                //Utilities.nvl(user.getHrid()).equals(Utilities.nvl(userOrig.getHrid()))&&
-                Utilities.nvl(user.getOrgUserId()).equals(Utilities.nvl(userOrig.getOrgUserId()))&&
-                Utilities.nvl(user.getOrgCode()).equals(Utilities.nvl(userOrig.getOrgCode()))&&
-                Utilities.nvl(user.getEmail()).equals(Utilities.nvl(userOrig.getEmail()))&&
-                Utilities.nvl(user.getOrgManagerUserId()).equals(Utilities.nvl(userOrig.getOrgManagerUserId()))&&
-                true));
-       } // isCriteriaUpdated
-
-}	// PostSearchBean
+		if (user == null && userOrig == null)
+			return false;
+		else if (user == null || userOrig == null)
+			return true;
+		else
+			return !(Utilities.nvl(user.getFirstName()).equals(Utilities.nvl(userOrig.getFirstName()))
+					&& Utilities.nvl(user.getLastName()).equals(Utilities.nvl(userOrig.getLastName()))
+					&& Utilities.nvl(user.getOrgUserId()).equals(Utilities.nvl(userOrig.getOrgUserId()))
+					&& Utilities.nvl(user.getOrgCode()).equals(Utilities.nvl(userOrig.getOrgCode()))
+					&& Utilities.nvl(user.getEmail()).equals(Utilities.nvl(userOrig.getEmail()))
+					&& Utilities.nvl(user.getOrgManagerUserId()).equals(Utilities.nvl(userOrig.getOrgManagerUserId())));
+	}
+
+}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/UserRowBean.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/UserRowBean.java
index 49854e6b..8c768102 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/UserRowBean.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/UserRowBean.java
@@ -6,7 +6,7 @@
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
+ * under the Apache License, Version 2.0 (the "License");
  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -41,63 +41,50 @@ import org.onap.portalsdk.core.domain.User;
 
 public class UserRowBean extends User {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -2724597119083972190L;
-    private String  sessionId;
-    private String  lastAccess;
-    private String  remaining;
-    private String 	loginTime;
-    private String 	LastLoginTime;
-
-    
-    public String getLastAccess(){
-        return this.lastAccess;
-    }
-
-    
-    public void setLastAccess(String lastAccess){
-        this.lastAccess = lastAccess;
-    }
-
+	private String sessionId;
+	private String lastAccess;
+	private String remaining;
+	private String loginTime;
+	private String lastLoginTime;
+
+	public String getLastAccess() {
+		return this.lastAccess;
+	}
 
-    public String getRemaining(){
-        return this.remaining;
-    }
+	public void setLastAccess(final String lastAccess) {
+		this.lastAccess = lastAccess;
+	}
 
-    
-    public void setRemaining(String remaining){
-        this.remaining = remaining;
-    }
+	public String getRemaining() {
+		return this.remaining;
+	}
 
+	public void setRemaining(final String remaining) {
+		this.remaining = remaining;
+	}
 
 	public String getSessionId() {
 		return sessionId;
 	}
 
-
-	public void setSessionId(String sessionId) {
+	public void setSessionId(final String sessionId) {
 		this.sessionId = sessionId;
 	}
 
-
 	public String getLoginTime() {
 		return loginTime;
 	}
 
-
-	public void setLoginTime(String loginTime) {
+	public void setLoginTime(final String loginTime) {
 		this.loginTime = loginTime;
 	}
 
-
 	public String getLastLoginTime() {
-		return LastLoginTime;
+		return lastLoginTime;
 	}
 
-
-	public void setLastLoginTime(String lastLoginTime) {
-		LastLoginTime = lastLoginTime;
+	public void setLastLoginTime(final String lastLoginTime) {
+		this.lastLoginTime = lastLoginTime;
 	}
 }
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/support/SearchBase.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/support/SearchBase.java
index c053d95b..dcd14b91 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/support/SearchBase.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/support/SearchBase.java
@@ -6,7 +6,7 @@
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
+ * under the Apache License, Version 2.0 (the "License");
  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -37,252 +37,240 @@
  */
 package org.onap.portalsdk.core.command.support;
 
-import java.util.*;
+import java.util.List;
 
 import org.onap.portalsdk.core.domain.support.FusionCommand;
 
 public abstract class SearchBase extends FusionCommand {
 
-    public static String SORT_BY_MODIFIER_DESC = "D";
-    public static String SORT_BY_MODIFIER_ASC  = "A";
-    public static String SORT_BY_MODIFIER_DESC_IMAGE_NAME = "sort_desc.gif";
-    public static String SORT_BY_MODIFIER_ASC_IMAGE_NAME  = "sort_asc.gif";
+	public static final String SORT_BY_MODIFIER_DESC = "D";
+	public static final String SORT_BY_MODIFIER_ASC = "A";
+	public static final String SORT_BY_MODIFIER_DESC_IMAGE_NAME = "sort_desc.gif";
+	public static final String SORT_BY_MODIFIER_ASC_IMAGE_NAME = "sort_asc.gif";
 
+	private String sortBy1 = null;
+	private String sortBy2 = null;
+	private String sortBy3 = null;
 
-    private String sortBy1 = null;
-    private String sortBy2 = null;
-    private String sortBy3 = null;
+	private String sortBy1Orig = null;
+	private String sortBy2Orig = null;
+	private String sortBy3Orig = null;
 
-    private String sortBy1Orig = null;
-    private String sortBy2Orig = null;
-    private String sortBy3Orig = null;
+	private String sortByModifier1 = null;
+	private String sortByModifier2 = null;
+	private String sortByModifier3 = null;
 
-    private String sortByModifier1 = null;
-    private String sortByModifier2 = null;
-    private String sortByModifier3 = null;
+	private String sortByModifier1Orig = null;
+	private String sortByModifier2Orig = null;
+	private String sortByModifier3Orig = null;
 
-    private String sortByModifier1Orig = null;
-    private String sortByModifier2Orig = null;
-    private String sortByModifier3Orig = null;
+	private String accessType = "WRITE";
 
-    private String accessType = "WRITE"; //null;
+	private String submitAction = "";
+	private String masterId = "";
+	private String detailId = "";
 
-    private String submitAction = "";
-    private String masterId = "";
-    private String detailId = "";
+	private String showResult = "Y";
 
-    private String showResult = "Y";
+	private SearchResult searchResult = null;
 
-    private SearchResult searchResult = null;
-    private boolean sortingUpdated;
+	@SuppressWarnings("rawtypes")
+	public SearchBase(List items) {
+		searchResult = (items == null) ? (new SearchResult()) : (new SearchResult(items));
+	} // SearchBase
 
-    @SuppressWarnings("rawtypes")
-    public SearchBase(List items) {
-        searchResult = (items == null) ? (new SearchResult()) : (new SearchResult(items));
-    } // SearchBase
+	public String getSortBy1() {
+		return sortBy1;
+	}
 
+	public String getSortBy2() {
+		return sortBy2;
+	}
 
-    public String getSortBy1() {
-        return sortBy1;
-    }
+	public String getSortBy3() {
+		return sortBy3;
+	}
 
-    public String getSortBy2() {
-        return sortBy2;
-    }
+	public String getSortBy1Orig() {
+		return sortBy1;
+	}
 
-    public String getSortBy3() {
-        return sortBy3;
-    }
+	public String getSortBy2Orig() {
+		return sortBy2;
+	}
 
-    public String getSortBy1Orig() {
-        return sortBy1;
-    }
+	public String getSortBy3Orig() {
+		return sortBy3;
+	}
 
-    public String getSortBy2Orig() {
-        return sortBy2;
-    }
+	public String getAccessType() {
+		return accessType;
+	}
 
-    public String getSortBy3Orig() {
-        return sortBy3;
-    }
+	public String getSubmitAction() {
+		return submitAction;
+	}
 
-    public String getAccessType() {
-        return accessType;
-    }
+	public String getMasterId() {
+		return masterId;
+	}
 
-    public String getSubmitAction() {
-        return submitAction;
-    }
+	public String getDetailId() {
+		return detailId;
+	}
 
-    public String getMasterId() {
-        return masterId;
-    }
+	public String getShowResult() {
+		return showResult;
+	}
 
-    public String getDetailId() {
-        return detailId;
-    }
+	public SearchResult getSearchResult() {
+		return searchResult;
+	}
 
-    public String getShowResult() {
-        return showResult;
-    }
+	public String getSortByModifier1() {
+		return sortByModifier1;
+	}
 
-    //public ArrayList getSortByList()      { return sortByList; }
+	public String getSortByModifier1Orig() {
+		return sortByModifier1;
+	}
 
-    public SearchResult getSearchResult() {
-        return searchResult;
-    }
+	public String getSortByModifier2() {
+		return sortByModifier2;
+	}
 
-    public String getSortByModifier1() {
-        return sortByModifier1;
-    }
+	public String getSortByModifier2Orig() {
+		return sortByModifier2;
+	}
 
-    public String getSortByModifier1Orig() {
-        return sortByModifier1;
-    }
+	public String getSortByModifier3() {
+		return sortByModifier3;
+	}
 
-    public String getSortByModifier2() {
-        return sortByModifier2;
-    }
+	public String getSortByModifier3Orig() {
+		return sortByModifier3;
+	}
 
-    public String getSortByModifier2Orig() {
-        return sortByModifier2;
-    }
+	public int getPageNo() {
+		return (isCriteriaUpdated() || isSortingUpdated()) ? 0 : getSearchResult().getPageNo();
+	}
 
-    public String getSortByModifier3() {
-        return sortByModifier3;
-    }
+	public int getPageSize() {
+		return getSearchResult().getPageSize();
+	}
 
-    public String getSortByModifier3Orig() {
-        return sortByModifier3;
-    }
+	public int getDataSize() {
+		return getSearchResult().getDataSize();
+	}
 
-    public int getPageNo() {
-        return (isCriteriaUpdated() || isSortingUpdated()) ? 0 : getSearchResult().getPageNo();
-    }
-
-    public int getPageSize() {
-        return getSearchResult().getPageSize();
-    }
-
-    public int getDataSize() {
-        return getSearchResult().getDataSize();
-    }
-
-    public int getNewDataSize() {
-        return isCriteriaUpdated() ? -1 : getDataSize();
-    }
-
-
-    public void setSortBy1(String sortBy1) {
-        this.sortBy1 = sortBy1;
-    }
-
-    public void setSortBy2(String sortBy2) {
-        this.sortBy2 = sortBy2;
-    }
-
-    public void setSortBy3(String sortBy3) {
-        this.sortBy3 = sortBy3;
-    }
-
-    public void setSortBy1Orig(String sortBy1Orig) {
-        this.sortBy1Orig = sortBy1Orig;
-    }
-
-    public void setSortBy2Orig(String sortBy2Orig) {
-        this.sortBy2Orig = sortBy2Orig;
-    }
-
-    public void setSortBy3Orig(String sortBy3Orig) {
-        this.sortBy3Orig = sortBy3Orig;
-    }
-
-    public void setAccessType(String accessType) {
-        this.accessType = accessType;
-    }
-
-    public void setSubmitAction(String submitAction) {
-        this.submitAction = submitAction;
-    }
-
-    public void setMasterId(String masterId) {
-        this.masterId = masterId;
-    }
-
-    public void setDetailId(String detailId) {
-        this.detailId = detailId;
-    }
-
-    public void setShowResult(String showResult) {
-        this.showResult = showResult;
-    }
-
-    public void setSearchResult(SearchResult searchResult) {
-        this.searchResult = searchResult;
-    }
-
-    public void setSortByModifier1(String sortByModifier1) {
-        this.sortByModifier1 = sortByModifier1;
-    }
-
-    public void setSortByModifier1Orig(String sortByModifier1Orig) {
-        this.sortByModifier1Orig = sortByModifier1Orig;
-    }
-
-    public void setSortByModifier2(String sortByModifier2) {
-        this.sortByModifier2 = sortByModifier2;
-    }
-
-    public void setSortByModifier2Orig(String sortByModifier2Orig) {
-        this.sortByModifier2Orig = sortByModifier2Orig;
-    }
-
-    public void setSortByModifier3(String sortByModifier3) {
-        this.sortByModifier3 = sortByModifier3;
-    }
-
-    public void setSortByModifier3Orig(String sortByModifier3Orig) {
-        this.sortByModifier3Orig = sortByModifier3Orig;
-    }
-
-    public void setSortingUpdated(boolean sortingUpdated) {
-        this.sortingUpdated = sortingUpdated;
-    }
-
-    public void setPageNo(int pageNo) {
-        getSearchResult().setPageNo(pageNo);
-    }
-
-    public void setPageSize(int pageSize) {
-        getSearchResult().setPageSize(pageSize);
-    }
-
-    public void setDataSize(int dataSize) {
-        getSearchResult().setDataSize(dataSize);
-    }
-
-
-    public void resetSearch() {
-        setSortBy1(null);
-        setSortBy2(null);
-        setSortBy3(null);
-        setSortByModifier1(SearchBase.SORT_BY_MODIFIER_ASC);
-        setSortByModifier2(SearchBase.SORT_BY_MODIFIER_ASC);
-        setSortByModifier3(SearchBase.SORT_BY_MODIFIER_ASC);
-        setPageNo(0);
-        setDataSize( -1);
-    } // resetSearch
-
-
-    public abstract boolean isCriteriaUpdated();
-
-    public boolean isSortingUpdated() {
-        return (!(Utilities.nvl(sortBy1).equals(Utilities.nvl(sortBy1Orig)) &&
-                  Utilities.nvl(sortBy2).equals(Utilities.nvl(sortBy2Orig)) &&
-                  Utilities.nvl(sortBy3).equals(Utilities.nvl(sortBy3Orig)) &&
-                  Utilities.nvl(sortByModifier1).equals(Utilities.nvl(sortByModifier1Orig)) &&
-                  Utilities.nvl(sortByModifier2).equals(Utilities.nvl(sortByModifier2Orig)) &&
-                  Utilities.nvl(sortByModifier3).equals(Utilities.nvl(sortByModifier3Orig))));
-    } // isSortingUpdated
-
-} // SearchBase
+	public int getNewDataSize() {
+		return isCriteriaUpdated() ? -1 : getDataSize();
+	}
+
+	public void setSortBy1(String sortBy1) {
+		this.sortBy1 = sortBy1;
+	}
+
+	public void setSortBy2(String sortBy2) {
+		this.sortBy2 = sortBy2;
+	}
+
+	public void setSortBy3(String sortBy3) {
+		this.sortBy3 = sortBy3;
+	}
+
+	public void setSortBy1Orig(String sortBy1Orig) {
+		this.sortBy1Orig = sortBy1Orig;
+	}
+
+	public void setSortBy2Orig(String sortBy2Orig) {
+		this.sortBy2Orig = sortBy2Orig;
+	}
+
+	public void setSortBy3Orig(String sortBy3Orig) {
+		this.sortBy3Orig = sortBy3Orig;
+	}
+
+	public void setAccessType(String accessType) {
+		this.accessType = accessType;
+	}
+
+	public void setSubmitAction(String submitAction) {
+		this.submitAction = submitAction;
+	}
+
+	public void setMasterId(String masterId) {
+		this.masterId = masterId;
+	}
+
+	public void setDetailId(String detailId) {
+		this.detailId = detailId;
+	}
+
+	public void setShowResult(String showResult) {
+		this.showResult = showResult;
+	}
+
+	public void setSearchResult(SearchResult searchResult) {
+		this.searchResult = searchResult;
+	}
+
+	public void setSortByModifier1(String sortByModifier1) {
+		this.sortByModifier1 = sortByModifier1;
+	}
+
+	public void setSortByModifier1Orig(String sortByModifier1Orig) {
+		this.sortByModifier1Orig = sortByModifier1Orig;
+	}
+
+	public void setSortByModifier2(String sortByModifier2) {
+		this.sortByModifier2 = sortByModifier2;
+	}
+
+	public void setSortByModifier2Orig(String sortByModifier2Orig) {
+		this.sortByModifier2Orig = sortByModifier2Orig;
+	}
+
+	public void setSortByModifier3(String sortByModifier3) {
+		this.sortByModifier3 = sortByModifier3;
+	}
+
+	public void setSortByModifier3Orig(String sortByModifier3Orig) {
+		this.sortByModifier3Orig = sortByModifier3Orig;
+	}
+
+	public void setPageNo(int pageNo) {
+		getSearchResult().setPageNo(pageNo);
+	}
+
+	public void setPageSize(int pageSize) {
+		getSearchResult().setPageSize(pageSize);
+	}
+
+	public void setDataSize(int dataSize) {
+		getSearchResult().setDataSize(dataSize);
+	}
+
+	public void resetSearch() {
+		setSortBy1(null);
+		setSortBy2(null);
+		setSortBy3(null);
+		setSortByModifier1(SearchBase.SORT_BY_MODIFIER_ASC);
+		setSortByModifier2(SearchBase.SORT_BY_MODIFIER_ASC);
+		setSortByModifier3(SearchBase.SORT_BY_MODIFIER_ASC);
+		setPageNo(0);
+		setDataSize(-1);
+	}
+
+	public abstract boolean isCriteriaUpdated();
+
+	public boolean isSortingUpdated() {
+		return !(Utilities.nvl(sortBy1).equals(Utilities.nvl(sortBy1Orig))
+				&& Utilities.nvl(sortBy2).equals(Utilities.nvl(sortBy2Orig))
+				&& Utilities.nvl(sortBy3).equals(Utilities.nvl(sortBy3Orig))
+				&& Utilities.nvl(sortByModifier1).equals(Utilities.nvl(sortByModifier1Orig))
+				&& Utilities.nvl(sortByModifier2).equals(Utilities.nvl(sortByModifier2Orig))
+				&& Utilities.nvl(sortByModifier3).equals(Utilities.nvl(sortByModifier3Orig)));
+	}
+
+}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/support/SearchResult.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/support/SearchResult.java
index d1c1f315..35985c9f 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/support/SearchResult.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/command/support/SearchResult.java
@@ -6,7 +6,7 @@
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
+ * under the Apache License, Version 2.0 (the "License");
  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -37,49 +37,62 @@
  */
 package org.onap.portalsdk.core.command.support;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 @SuppressWarnings("rawtypes")
 public class SearchResult extends ArrayList implements java.io.Serializable {
-	/**
-	 * 
-	 */
+
 	private static final long serialVersionUID = -451947878984459011L;
-	private int pageNo   = 0;
+	private int pageNo = 0;
 	private int pageSize = 50;
 	private int dataSize = -1;
 
-	private String accessType   = null;
-
-	//private boolean empty = true;	// Overrides collections [isEmpty] with searchResult present/not present logic
-
+	private String accessType = null;
 
-	public SearchResult() {}
+	public SearchResult() {
+		super();
+	}
 
 	@SuppressWarnings("unchecked")
 	public SearchResult(List items) {
 		super(items);
-	}	// SearchResult
+	}
+
+	public int getPageNo() {
+		return pageNo;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
 
-	/*public SearchResult(boolean empty) {
-		this();
-		this.empty = empty;
-	}	// SearchResult*/
+	public int getDataSize() {
+		return dataSize;
+	}
 
+	public int getSize() {
+		return size();
+	} // for Struts bean property access
 
-	public int getPageNo()   { return pageNo; }
-	public int getPageSize() { return pageSize; }
-	public int getDataSize() { return dataSize; }
+	public String getAccessType() {
+		return accessType;
+	}
 
-	public int     getSize() { return size(); }	// for Struts bean property access
-	//public boolean isEmpty() { return empty; }
+	public void setPageNo(int pageNo) {
+		this.pageNo = pageNo;
+	}
 
-	public String getAccessType() { return accessType; }
+	public void setPageSize(int pageSize) {
+		this.dataSize = pageSize;
+	}
 
-	public void setPageNo(int pageNo)     { this.pageNo=pageNo; }
-	public void setPageSize(int pageSize) { this.dataSize=pageSize; }
-	public void setDataSize(int dataSize) { this.dataSize=dataSize; }
+	public void setDataSize(int dataSize) {
+		this.dataSize = dataSize;
+	}
 
-	public void setAccessType(String accessType) { this.accessType = accessType; }
+	public void setAccessType(String accessType) {
+		this.accessType = accessType;
+	}
 
-}	// SearchResult
+}