#1 source code cleanup/format

DICE-UNC · Nov 9, 2015 · d5854b7 · d5854b7
1 parent f34bff5
commit d5854b7
Show file tree

Hide file tree

Showing 483 changed files with 7,432 additions and 7,382 deletions.
diff --git a/...on-core/src/main/java/org/irods/jargon/core/checksum/AbstractChecksumComputeStrategy.java b/...on-core/src/main/java/org/irods/jargon/core/checksum/AbstractChecksumComputeStrategy.java
@@ -10,14 +10,14 @@
 /**
  * Abstract base class for classes that compute and return a checksum based on
  * some algorithm, based on as Strategy pattern
- * 
+ *
  * @author Mike Conway - DICE
- * 
+ *
  */
 public abstract class AbstractChecksumComputeStrategy {
 
 	/**
-	 * 
+	 *
 	 * @param localFileAbsolutePath
 	 *            <code>String</code> with the absolute path to a local file
 	 * @return {@link ChecksumValue} with a checksum in digest (string) form.

diff --git a/jargon-core/src/main/java/org/irods/jargon/core/checksum/ChecksumManager.java b/jargon-core/src/main/java/org/irods/jargon/core/checksum/ChecksumManager.java
@@ -6,16 +6,16 @@
 /**
  * Interface representing code to handle negotiation and determination of
  * checksum type
- * 
+ *
  * @author Mike Conway - DICXE
- * 
+ *
  */
 public interface ChecksumManager {
 
 	/**
 	 * Using the values in the jargon properties, as well as info on the target
 	 * server, determine the type of checksum to use
-	 * 
+	 *
 	 * @return {@link ChecksumEncodingEnum} used for the server
 	 * @throws JargonException
 	 */
@@ -26,7 +26,7 @@ public abstract ChecksumEncodingEnum determineChecksumEncodingForTargetServer()
 	 * Using a value from iRODS describing a checksum on a file, determine the
 	 * type of encoding used. Note that if no checksum is present,
 	 * <code>null</code> will be returned
-	 * 
+	 *
 	 * @param irodsChecksumValue
 	 *            <code>String</code> with the checksum value from iRODS,
 	 *            potentially including a prefix
@@ -37,6 +37,6 @@ public abstract ChecksumEncodingEnum determineChecksumEncodingForTargetServer()
 	 */
 	public ChecksumValue determineChecksumEncodingFromIrodsData(
 			String irodsChecksumValue)
-			throws ChecksumMethodUnavailableException;
+					throws ChecksumMethodUnavailableException;
 
 }
diff --git a/jargon-core/src/main/java/org/irods/jargon/core/checksum/ChecksumManagerImpl.java b/jargon-core/src/main/java/org/irods/jargon/core/checksum/ChecksumManagerImpl.java
@@ -21,9 +21,9 @@
  * Note this implementation is very basic and will be expanded later.
  * {@link DataObjectAO} has other checksum support that will eventually migrate
  * here.
- * 
+ *
  * @author Mike Conway - DICE
- * 
+ *
  */
 public class ChecksumManagerImpl implements ChecksumManager {
 
@@ -49,7 +49,7 @@ public ChecksumManagerImpl(final IRODSAccount irodsAccount,
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.irods.jargon.core.checksum.ChecksumManager#
 	 * determineChecksumEncodingForTargetServer()
 	 */
@@ -111,9 +111,9 @@ public ChecksumEncodingEnum determineChecksumEncodingForTargetServer()
 
 		/*
 		 * Negotiation:
-		 * 
+		 *
 		 * DEFAULT - use MD5 pre consortium and SHA256 post
-		 * 
+		 *
 		 * STRONG - use MD5 pre 3.3.1 and SHA256 after
 		 */
 
@@ -156,21 +156,21 @@ public ChecksumEncodingEnum determineChecksumEncodingForTargetServer()
 
 	private void cacheEncoding(final ChecksumEncodingEnum checksumEncoding) {
 		irodsAccessObjectFactory.getDiscoveredServerPropertiesCache()
-				.cacheAProperty(irodsAccount.getHost(), irodsAccount.getZone(),
-						DiscoveredServerPropertiesCache.CHECKSUM_TYPE,
-						checksumEncoding.toString());
+		.cacheAProperty(irodsAccount.getHost(), irodsAccount.getZone(),
+				DiscoveredServerPropertiesCache.CHECKSUM_TYPE,
+				checksumEncoding.toString());
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.irods.jargon.core.checksum.ChecksumManager#
 	 * determineChecksumEncodingFromIrodsData(java.lang.String)
 	 */
 	@Override
 	public ChecksumValue determineChecksumEncodingFromIrodsData(
 			final String irodsChecksumValue)
-			throws ChecksumMethodUnavailableException {
+					throws ChecksumMethodUnavailableException {
 
 		log.info("determineChecksumEncodingFromIrodsData()");
 

diff --git a/...core/src/main/java/org/irods/jargon/core/checksum/ChecksumMethodUnavailableException.java b/...core/src/main/java/org/irods/jargon/core/checksum/ChecksumMethodUnavailableException.java
@@ -1,15 +1,15 @@
 /**
- * 
+ *
  */
 package org.irods.jargon.core.checksum;
 
 import org.irods.jargon.core.exception.JargonException;
 
 /**
  * Checksum computation method is not available.
- * 
+ *
  * @author Mike Conway - DICE
- * 
+ *
  */
 public class ChecksumMethodUnavailableException extends JargonException {
 

diff --git a/jargon-core/src/main/java/org/irods/jargon/core/checksum/ChecksumValue.java b/jargon-core/src/main/java/org/irods/jargon/core/checksum/ChecksumValue.java
@@ -7,9 +7,9 @@
 
 /**
  * Represents a checksum and the type of checksum
- * 
+ *
  * @author Mike Conway - DICE
- * 
+ *
  */
 public class ChecksumValue {
 
@@ -83,7 +83,7 @@ public void setChecksumTransmissionFormat(
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
@@ -110,7 +110,7 @@ public String toString() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#hashCode()
 	 */
 	@Override
@@ -133,7 +133,7 @@ public int hashCode() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
 	@Override

diff --git a/jargon-core/src/main/java/org/irods/jargon/core/checksum/IrodsChecksumValue.java b/jargon-core/src/main/java/org/irods/jargon/core/checksum/IrodsChecksumValue.java
@@ -7,9 +7,9 @@
 
 /**
  * Value of a checksum stored in iRODS
- * 
+ *
  * @author Mike Conway - DICE
- * 
+ *
  */
 public class IrodsChecksumValue {
 	/**
@@ -47,7 +47,7 @@ public String toString() {
 		}
 		if (checksumEncodingEnum != null) {
 			builder.append("checksumEncodingEnum=")
-					.append(checksumEncodingEnum);
+			.append(checksumEncodingEnum);
 		}
 		builder.append("]");
 		return builder.toString();

diff --git a/jargon-core/src/main/java/org/irods/jargon/core/checksum/LocalChecksumComputerFactory.java b/jargon-core/src/main/java/org/irods/jargon/core/checksum/LocalChecksumComputerFactory.java
@@ -8,14 +8,14 @@
  * type that can be derived from the {@link ChecksumManager}.
  * <p/>
  * This factory is available from the {@link IRODSSession}
- * 
+ *
  * @author Mike Conway - DICE
  */
 public interface LocalChecksumComputerFactory {
 
 	/**
 	 * Based on the checksum encoding type, find an instance of an encoder
-	 * 
+	 *
 	 * @param checksumEncodingEnum
 	 *            {@link ChecksumEncodingEnum} value of a specific type
 	 * @return {@link AbstractChecksumComputeStrategy} that implements that
@@ -25,6 +25,6 @@ public interface LocalChecksumComputerFactory {
 	 */
 	public abstract AbstractChecksumComputeStrategy instance(
 			ChecksumEncodingEnum checksumEncodingEnum)
-			throws ChecksumMethodUnavailableException;
+					throws ChecksumMethodUnavailableException;
 
 }
diff --git a/...n-core/src/main/java/org/irods/jargon/core/checksum/LocalChecksumComputerFactoryImpl.java b/...n-core/src/main/java/org/irods/jargon/core/checksum/LocalChecksumComputerFactoryImpl.java
@@ -11,24 +11,24 @@
  * be derived from the {@link ChecksumManager}. *
  * <p/>
  * This factory is available from the {@link IRODSSession}
- * 
+ *
  * @author Mike Conway - DICE
- * 
+ *
  */
 public class LocalChecksumComputerFactoryImpl implements
-		LocalChecksumComputerFactory {
+LocalChecksumComputerFactory {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.irods.jargon.core.checksum.LocalChecksumComputerFactory#instance(
 	 * org.irods.jargon.core.protovalues.ChecksumEncodingEnum)
 	 */
 	@Override
 	public AbstractChecksumComputeStrategy instance(
 			final ChecksumEncodingEnum checksumEncodingEnum)
-			throws ChecksumMethodUnavailableException {
+					throws ChecksumMethodUnavailableException {
 
 		if (checksumEncodingEnum == null) {
 			throw new IllegalArgumentException("null checksumEncodingEnum");

diff --git a/...n-core/src/main/java/org/irods/jargon/core/checksum/MD5LocalChecksumComputerStrategy.java b/...n-core/src/main/java/org/irods/jargon/core/checksum/MD5LocalChecksumComputerStrategy.java
@@ -13,18 +13,18 @@
 
 /**
  * Compute an MD5 checksum on a local file
- * 
+ *
  * @author Mike Conway - DICE
  */
 public class MD5LocalChecksumComputerStrategy extends
-		AbstractChecksumComputeStrategy {
+AbstractChecksumComputeStrategy {
 
 	public static final Logger log = LoggerFactory
 			.getLogger(MD5LocalChecksumComputerStrategy.class);
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.irods.jargon.core.checksum.AbstractChecksumComputer#
 	 * instanceChecksumForPackingInstruction(java.lang.String)
 	 */

diff --git a/...ore/src/main/java/org/irods/jargon/core/checksum/SHA256LocalChecksumComputerStrategy.java b/...ore/src/main/java/org/irods/jargon/core/checksum/SHA256LocalChecksumComputerStrategy.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.irods.jargon.core.checksum;
 
@@ -14,18 +14,18 @@
 
 /**
  * Compute an SHA256 checksum on a local file
- * 
+ *
  * @author Mike Conway - DICE
  */
 public class SHA256LocalChecksumComputerStrategy extends
-		AbstractChecksumComputeStrategy {
+AbstractChecksumComputeStrategy {
 
 	public static final Logger log = LoggerFactory
 			.getLogger(SHA256LocalChecksumComputerStrategy.class);
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.irods.jargon.core.checksum.AbstractChecksumComputer#
 	 * instanceChecksumForPackingInstruction(java.lang.String)
 	 */