#209 code reformat and release prep

README.md

@@ -6,9 +6,6 @@
 
 ## News
 
-4.2.3 Compatability and maintenance
-for milestone: https://github.com/DICE-UNC/jargon/milestone/23
->>>>>>> origin/4-2-stable
 
 https://github.com/DICE-UNC/jargon/milestone/24
 

data-profile/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>jargon</artifactId>
 		<groupId>org.irods</groupId>
-		<version>4.3.0.0-SNAPSHOT</version>
+		<version>4.3.0.0-RELEASE</version>
 	</parent>
 	<groupId>org.irods.jargon</groupId>
 	<artifactId>data-profile</artifactId>

data-profile/src/main/java/org/irods/jargon/dataprofile/DataProfile.java

@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.irods.jargon.dataprofile;
 
@@ -14,7 +14,7 @@
 /**
  * Represents a consolidated summary of a data object or collection as a simple
  * POJO
- * 
+ *
  * @author Mike Conway - DICE
  *
  */
@@ -29,7 +29,7 @@ public class DataProfile<T extends IRODSDomainObject> {
 	private String mimeType = "";
 	private String infoType = "";
 	private List<IRODSTagValue> irodsTagValues = new ArrayList<IRODSTagValue>();
-	
+
 	/**
 	 * parent of the current data object
 	 */
@@ -43,7 +43,7 @@ public class DataProfile<T extends IRODSDomainObject> {
 	 */
 	private List<String> pathComponents = null;
 
-	public void setDomainObject(T domainObject) {
+	public void setDomainObject(final T domainObject) {
 		this.domainObject = domainObject;
 	}
 
@@ -52,7 +52,7 @@ public T getDomainObject() {
 	}
 
 	/**
-	 * 
+	 *
 	 */
 	public DataProfile() {
 	}
@@ -73,43 +73,43 @@ public boolean isShared() {
 		return isShared;
 	}
 
-	public void setMetadata(List<MetaDataAndDomainData> metadata) {
+	public void setMetadata(final List<MetaDataAndDomainData> metadata) {
 		this.metadata = metadata;
 	}
 
-	public void setAcls(List<UserFilePermission> acls) {
+	public void setAcls(final List<UserFilePermission> acls) {
 		this.acls = acls;
 	}
 
-	public void setStarred(boolean isStarred) {
+	public void setStarred(final boolean isStarred) {
 		this.isStarred = isStarred;
 	}
 
-	public void setShared(boolean isShared) {
+	public void setShared(final boolean isShared) {
 		this.isShared = isShared;
 	}
 
 	public String getMimeType() {
 		return mimeType;
 	}
 
-	public void setMimeType(String mimeType) {
+	public void setMimeType(final String mimeType) {
 		this.mimeType = mimeType;
 	}
 
 	public boolean isFile() {
 		return file;
 	}
 
-	public void setFile(boolean file) {
+	public void setFile(final boolean file) {
 		this.file = file;
 	}
 
 	public List<IRODSTagValue> getIrodsTagValues() {
 		return irodsTagValues;
 	}
 
-	public void setIrodsTagValues(List<IRODSTagValue> irodsTagValues) {
+	public void setIrodsTagValues(final List<IRODSTagValue> irodsTagValues) {
 		this.irodsTagValues = irodsTagValues;
 	}
 
@@ -124,7 +124,7 @@ public String getParentPath() {
 	 * @param parentPath
 	 *            the parentPath to set
 	 */
-	public void setParentPath(String parentPath) {
+	public void setParentPath(final String parentPath) {
 		this.parentPath = parentPath;
 	}
 
@@ -139,7 +139,7 @@ public String getChildName() {
 	 * @param childName
 	 *            the childName to set
 	 */
-	public void setChildName(String childName) {
+	public void setChildName(final String childName) {
 		this.childName = childName;
 	}
 
@@ -154,22 +154,21 @@ public List<String> getPathComponents() {
 	 * @param pathComponents
 	 *            the pathComponents to set
 	 */
-	public void setPathComponents(List<String> pathComponents) {
+	public void setPathComponents(final List<String> pathComponents) {
 		this.pathComponents = pathComponents;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
 	public String toString() {
-		return "DataProfile [file=" + file + ", domainObject=" + domainObject
-				+ ", metadata=" + metadata + ", acls=" + acls + ", isStarred="
-				+ isStarred + ", isShared=" + isShared + ", mimeType="
-				+ mimeType + ", infoType=" + infoType + ", irodsTagValues="
-				+ irodsTagValues + ", parentPath=" + parentPath
-				+ ", childName=" + childName + ", pathComponents="
-				+ pathComponents + "]";
+		return "DataProfile [file=" + file + ", domainObject=" + domainObject + ", metadata=" + metadata + ", acls="
+				+ acls + ", isStarred=" + isStarred + ", isShared=" + isShared + ", mimeType=" + mimeType
+				+ ", infoType=" + infoType + ", irodsTagValues=" + irodsTagValues + ", parentPath=" + parentPath
+				+ ", childName=" + childName + ", pathComponents=" + pathComponents + "]";
 	}
 
 	/**
@@ -180,9 +179,10 @@ public String getInfoType() {
 	}
 
 	/**
-	 * @param infoType the infoType to set
+	 * @param infoType
+	 *            the infoType to set
 	 */
-	public void setInfoType(String infoType) {
+	public void setInfoType(final String infoType) {
 		this.infoType = infoType;
 	}
 

data-profile/src/main/java/org/irods/jargon/dataprofile/DataProfileService.java

@@ -7,7 +7,7 @@ public interface DataProfileService {
 
 	/**
 	 * Retrieve a summary profile of a data object or collection
-	 * 
+	 *
 	 * @param irodsAbsolutePath
 	 *            <code>String</code> with the absolute path to an iRODS file or
 	 *            collection

data-profile/src/main/java/org/irods/jargon/dataprofile/DataProfileServiceFactoryImpl.java

@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.irods.jargon.dataprofile;
 
@@ -11,7 +11,7 @@
 /**
  * Simple class that produces a configured instance of the DataProfileService
  * with the default data type resolution service configured
- * 
+ *
  * @author Mike Conway - DICE
  *
  */
@@ -21,25 +21,22 @@ public class DataProfileServiceFactoryImpl extends AbstractJargonService {
 	 * @param irodsAccessObjectFactory
 	 * @param irodsAccount
 	 */
-	public DataProfileServiceFactoryImpl(
-			IRODSAccessObjectFactory irodsAccessObjectFactory,
-			IRODSAccount irodsAccount) {
+	public DataProfileServiceFactoryImpl(final IRODSAccessObjectFactory irodsAccessObjectFactory,
+			final IRODSAccount irodsAccount) {
 		super(irodsAccessObjectFactory, irodsAccount);
 	}
 
 	/**
-	 * 
+	 *
 	 */
 	public DataProfileServiceFactoryImpl() {
 	}
 
-	public DataProfileService instanceDataProfileService()
-			throws JargonException {
+	public DataProfileService instanceDataProfileService() throws JargonException {
 
 		DataTypeResolutionService dataTypeResolutionService = new DataTypeResolutionServiceImpl(
-				this.getIrodsAccessObjectFactory(), this.getIrodsAccount());
-		return new DataProfileServiceImpl(this.getIrodsAccessObjectFactory(),
-				this.getIrodsAccount(), dataTypeResolutionService);
+				getIrodsAccessObjectFactory(), getIrodsAccount());
+		return new DataProfileServiceImpl(getIrodsAccessObjectFactory(), getIrodsAccount(), dataTypeResolutionService);
 
 	}