Merge branch 'issue17' into 'niehs-development'

Issue17 See merge request conwaymc/metalnx-web!8
DICE-UNC · Nov 30, 2017 · f3e13a1 · f3e13a1
2 parents ee7206e + 5d20e8e
commit f3e13a1
Show file tree

Hide file tree

Showing 32 changed files with 3,816 additions and 2,894 deletions.
diff --git a/src/emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/dao/UserDao.java b/src/emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/dao/UserDao.java
@@ -73,4 +73,13 @@ public interface UserDao extends GenericDao<DataGridUser, Long> {
 	 * @return list of users
 	 */
 	public List<DataGridUser> findByQueryString(String query);
+
+	/**
+	 * Update advancedView by username
+	 * @param username
+	 * @param zone
+	 * @return <code>boolean</code> that is true for advanced view, otherwise is normal view
+	 */
+	//boolean updateAdvancedView(DataGridUser user);
+
 }
diff --git a/...metalnx-core/src/main/java/com/emc/metalnx/core/domain/entity/DataGridFilePermission.java b/...metalnx-core/src/main/java/com/emc/metalnx/core/domain/entity/DataGridFilePermission.java
@@ -18,55 +18,78 @@
 import java.io.Serializable;
 
 public class DataGridFilePermission implements Serializable {
-    private String userId;
-    private String username;
-    private String permission;
-    private String userType;
-    private String userZone;
-    private static final long serialVersionUID = 1L;
+	private String userId;
+	private String username;
+	private String permission;
+	private String userType;
+	private String userZone;
+	private static final long serialVersionUID = 1L;
 
-    public DataGridFilePermission() {
+	public DataGridFilePermission() {
 
-    }
+	}
 
-    public String getPermission() {
-        return permission;
-    }
+	public String getPermission() {
+		return permission;
+	}
 
-    public void setPermission(String permission) {
-        this.permission = permission;
-    }
+	public void setPermission(String permission) {
+		this.permission = permission;
+	}
 
-    public String getUsername() {
-        return username;
-    }
+	public String getUsername() {
+		return username;
+	}
 
-    public void setUsername(String username) {
-        this.username = username;
-    }
+	public void setUsername(String username) {
+		this.username = username;
+	}
 
-    public String getUserId() {
-        return userId;
-    }
+	public String getUserId() {
+		return userId;
+	}
 
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
 
-    public String getUserZone() {
-        return userZone;
-    }
+	public String getUserZone() {
+		return userZone;
+	}
 
-    public void setUserZone(String userZone) {
-        this.userZone = userZone;
-    }
+	public void setUserZone(String userZone) {
+		this.userZone = userZone;
+	}
 
-    public String getUserType() {
-        return userType;
-    }
+	public String getUserType() {
+		return userType;
+	}
 
-    public void setUserType(String userType) {
-        this.userType = userType;
-    }
+	public void setUserType(String userType) {
+		this.userType = userType;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("DataGridFilePermission [");
+		if (userId != null) {
+			builder.append("userId=").append(userId).append(", ");
+		}
+		if (username != null) {
+			builder.append("username=").append(username).append(", ");
+		}
+		if (permission != null) {
+			builder.append("permission=").append(permission).append(", ");
+		}
+		if (userType != null) {
+			builder.append("userType=").append(userType).append(", ");
+		}
+		if (userZone != null) {
+			builder.append("userZone=").append(userZone);
+		}
+		builder.append("]");
+		return builder.toString();
+	}
 
 }
diff --git a/...lnx-core/src/main/java/com/emc/metalnx/core/domain/entity/DataGridFilePropertySearch.java b/...lnx-core/src/main/java/com/emc/metalnx/core/domain/entity/DataGridFilePropertySearch.java
@@ -42,7 +42,19 @@ public DataGridFilePropertySearch(FilePropertyField filePropertyField, DataGridS
 
 	@Override
 	public String toString() {
-		return String.format("%s %s %s", attribute.getFieldName(), operator.toString(), value);
+		StringBuilder builder = new StringBuilder();
+		builder.append("DataGridFilePropertySearch [");
+		if (attribute != null) {
+			builder.append("attribute=").append(attribute).append(", ");
+		}
+		if (operator != null) {
+			builder.append("operator=").append(operator).append(", ");
+		}
+		if (value != null) {
+			builder.append("value=").append(value);
+		}
+		builder.append("]");
+		return builder.toString();
 	}
 
 	/**