#1 merge master into dev

DICE-UNC · Apr 12, 2019 · 98674cb · 98674cb
1 parent 04da059
commit 98674cb
Show file tree

Hide file tree

Showing 38 changed files with 2,208 additions and 1,426 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,4 @@ JargonVersion.java
 *.*~
 .dbeaver*
 test.metalnx.properties
+**/.vscode/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,21 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [] - XXXX
+### Added
+
+### Changed
+
+
+#### Factor out metalnx circular dependencies into abstracted services #5
+
+Factor out generic concepts like stars/shares in a way that they can be used by other code, e.g. REST API or other clients. This corrects some circular dependencies in MetaLnx. metalnx core and services libraries are pulled out into stand-alone packages and then set as dependencies in Metalnx itself.
+
+
+### Removed
+
diff --git a/README.md b/README.md
@@ -27,6 +27,4 @@ Note that the following bug and feature requests are logged in GitHub with relat
 
 ## Changes
 
-#### Factor out metalnx circular dependencies into abstracted services #5
-
-Factor out generic concepts like stars/shares in a way that they can be used by other code, e.g. REST API or other clients. This corrects some circular dependencies in MetaLnx. metalnx core and services libraries are pulled out into stand-alone packages and then set as dependencies in Metalnx itself.
+Refer to CHANGELOG.md
diff --git a/emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/entity/DataGridTemplate.java b/emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/entity/DataGridTemplate.java
@@ -1,12 +1,12 @@
- /* Copyright (c) 2018, University of North Carolina at Chapel Hill */
- /* Copyright (c) 2015-2017, Dell EMC */
-
+/* Copyright (c) 2018, University of North Carolina at Chapel Hill */
+/* Copyright (c) 2015-2017, Dell EMC */
 
 package com.emc.metalnx.core.domain.entity;
 
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
@@ -21,7 +21,6 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.hibernate.envers.Audited;
 import org.hibernate.envers.NotAudited;
 
 import com.emc.metalnx.core.domain.exceptions.DataGridTooLongTemplateNameException;
@@ -66,7 +65,7 @@ public class DataGridTemplate implements Serializable, Comparable<DataGridTempla
 	private Date modifyTs;
 
 	@OneToMany(mappedBy = "template", fetch = FetchType.EAGER)
-	private Set<DataGridTemplateField> fields;
+	private Set<DataGridTemplateField> fields = new HashSet<>();
 
 	private static final int TEMPLATE_NAME_MAX_LENGTH = 100;
 	private static final int TEMPLATE_DESC_MAX_LENGTH = 100;
@@ -94,8 +93,7 @@ public String getOwner() {
 	}
 
 	/**
-	 * @param owner
-	 *            the owner to set
+	 * @param owner the owner to set
 	 */
 	public void setOwner(String owner) {
 		this.owner = owner;
@@ -109,8 +107,7 @@ public String getDescription() {
 	}
 
 	/**
-	 * @param description
-	 *            the description to set
+	 * @param description the description to set
 	 * @throws DataGridTooLongTemplateNameException
 	 */
 	public void setDescription(String description) throws DataGridTooLongTemplateNameException {
@@ -129,8 +126,7 @@ public Date getCreateTs() {
 	}
 
 	/**
-	 * @param createTs
-	 *            the createTs to set
+	 * @param createTs the createTs to set
 	 */
 	public void setCreateTs(Date createTs) {
 		this.createTs = createTs;
@@ -144,8 +140,7 @@ public Date getModifyTs() {
 	}
 
 	/**
-	 * @param modifyTs
-	 *            the modifyTs to set
+	 * @param modifyTs the modifyTs to set
 	 */
 	public void setModifyTs(Date modifyTs) {
 		this.modifyTs = modifyTs;
@@ -159,8 +154,7 @@ public long getId() {
 	}
 
 	/**
-	 * @param id
-	 *            the id to set
+	 * @param id the id to set
 	 */
 	public void setId(long id) {
 		this.id = id;
@@ -174,8 +168,7 @@ public String getTemplateName() {
 	}
 
 	/**
-	 * @param the
-	 *            templateName to set
+	 * @param the templateName to set
 	 * @throws DataGridTooLongTemplateNameException
 	 */
 	public void setTemplateName(String templateName) throws DataGridTooLongTemplateNameException {
@@ -195,8 +188,7 @@ public String getUsageInformation() {
 	}
 
 	/**
-	 * @param usageInformation
-	 *            the usageInformation to set
+	 * @param usageInformation the usageInformation to set
 	 */
 	public void setUsageInformation(String usageInformation) {
 		this.usageInformation = usageInformation;
@@ -210,8 +202,7 @@ public String getAccessType() {
 	}
 
 	/**
-	 * @param accessType
-	 *            the accessType to set
+	 * @param accessType the accessType to set
 	 */
 	public void setAccessType(String accessType) {
 		this.accessType = accessType;
@@ -225,8 +216,7 @@ public Set<DataGridTemplateField> getFields() {
 	}
 
 	/**
-	 * @param fields
-	 *            the fields to set
+	 * @param fields the fields to set
 	 */
 	public void setFields(Set<DataGridTemplateField> fields) {
 		this.fields = fields;
@@ -240,8 +230,7 @@ public Integer getVersion() {
 	}
 
 	/**
-	 * @param version
-	 *            the version to set
+	 * @param version the version to set
 	 */
 	public void setVersion(Integer version) {
 		this.version = version;
@@ -255,8 +244,7 @@ public boolean isModified() {
 	}
 
 	/**
-	 * @param isModified
-	 *            the isModified to set
+	 * @param isModified the isModified to set
 	 */
 	public void setModified(boolean isModified) {
 		this.isModified = isModified;

diff --git a/emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/entity/DataGridTemplateField.java b/emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/entity/DataGridTemplateField.java
@@ -1,6 +1,5 @@
- /* Copyright (c) 2018, University of North Carolina at Chapel Hill */
- /* Copyright (c) 2015-2017, Dell EMC */
-
+/* Copyright (c) 2018, University of North Carolina at Chapel Hill */
+/* Copyright (c) 2015-2017, Dell EMC */
 
 package com.emc.metalnx.core.domain.entity;
 
@@ -16,7 +15,6 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.hibernate.envers.Audited;
 import org.hibernate.envers.NotAudited;
 
 import com.emc.metalnx.core.domain.exceptions.DataGridTemplateAttrException;
@@ -102,8 +100,7 @@ public Long getId() {
 	}
 
 	/**
-	 * @param id
-	 *            the id to set
+	 * @param id the id to set
 	 */
 	public void setId(long id) {
 		this.id = id;
@@ -117,8 +114,7 @@ public String getAttribute() {
 	}
 
 	/**
-	 * @param attribute
-	 *            the attribute to set
+	 * @param attribute the attribute to set
 	 * @throws DataGridTemplateAttrException
 	 */
 	public void setAttribute(String attribute) throws DataGridTemplateAttrException {
@@ -138,8 +134,7 @@ public String getValue() {
 	}
 
 	/**
-	 * @param value
-	 *            the value to set
+	 * @param value the value to set
 	 * @throws DataGridTemplateValueException
 	 */
 	public void setValue(String value) throws DataGridTemplateValueException {
@@ -159,8 +154,7 @@ public String getUnit() {
 	}
 
 	/**
-	 * @param unit
-	 *            the unit to set
+	 * @param unit the unit to set
 	 * @throws DataGridTemplateUnitException
 	 */
 	public void setUnit(String unit) throws DataGridTemplateUnitException {
@@ -180,8 +174,7 @@ public DataGridTemplate getTemplate() {
 	}
 
 	/**
-	 * @param template
-	 *            the template to set
+	 * @param template the template to set
 	 */
 	public void setTemplate(DataGridTemplate template) {
 		this.template = template;
@@ -195,8 +188,7 @@ public float getStartRange() {
 	}
 
 	/**
-	 * @param startRange
-	 *            the startRange to set
+	 * @param startRange the startRange to set
 	 */
 	public void setStartRange(float startRange) {
 		this.startRange = startRange;
@@ -210,8 +202,7 @@ public float getEndRange() {
 	}
 
 	/**
-	 * @param endRange
-	 *            the endRange to set
+	 * @param endRange the endRange to set
 	 */
 	public void setEndRange(float endRange) {
 		this.endRange = endRange;
@@ -225,8 +216,7 @@ public int getOrder() {
 	}
 
 	/**
-	 * @param order
-	 *            the order to set
+	 * @param order the order to set
 	 */
 	public void setOrder(int order) {
 		this.order = order;
@@ -251,9 +241,7 @@ public String toString() {
 		}
 		builder.append("startRange=").append(startRange).append(", endRange=").append(endRange).append(", order=")
 				.append(order).append(", ");
-		if (template != null) {
-			builder.append("template=").append(template);
-		}
+
 		builder.append("]");
 		return builder.toString();
 	}

diff --git a/emc-metalnx-services/pom.xml b/emc-metalnx-services/pom.xml
@@ -111,6 +111,10 @@
 			<artifactId>mail</artifactId>
 			<version>1.4.7</version>
 		</dependency>
+		<dependency>
+				<groupId>joda-time</groupId>
+				<artifactId>joda-time</artifactId>
+		</dependency>
 
 	</dependencies>
 
@@ -324,6 +328,13 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>${maven.surefire.plugin.version}</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.surefire</groupId>
+						<artifactId>surefire-junit47</artifactId>
+						<version>3.0.0-M3</version>
+					</dependency>
+				</dependencies>
 				<configuration>
 					<forkCount>0</forkCount>
 				</configuration>