#300 code cleanup/format

Author: michael-conway

README.md

@@ -1,8 +1,8 @@
 
 # Project: Jargon-core API
-#### Date:  
-#### Release Version: 4.2.2.1-SNAPSHOT
-#### git tag: 4.2.2.1-SNAPSHOT
+#### Date: 05/24/2018
+#### Release Version: 4.2.2.1-RELEASE
+#### git tag: 4.2.2.1-RELEASE
 #### Developer: Mike Conway
 
 ## News

jargon-core/src/main/java/org/irods/jargon/core/checksum/ChecksumManagerImpl.java

@@ -30,8 +30,7 @@ public class ChecksumManagerImpl implements ChecksumManager {
 	private final IRODSAccount irodsAccount;
 	private final IRODSAccessObjectFactory irodsAccessObjectFactory;
 
-	public static final Logger log = LoggerFactory
-			.getLogger(ChecksumManagerImpl.class);
+	public static final Logger log = LoggerFactory.getLogger(ChecksumManagerImpl.class);
 
 	/**
 	 * @param irodsAccount
@@ -49,41 +48,36 @@ public ChecksumManagerImpl(final IRODSAccount irodsAccount,
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.irods.jargon.core.checksum.ChecksumManager#
 	 * determineChecksumEncodingForTargetServer()
 	 */
 	@Override
-	public ChecksumEncodingEnum determineChecksumEncodingForTargetServer()
-			throws JargonException {
+	public ChecksumEncodingEnum determineChecksumEncodingForTargetServer() throws JargonException {
 
 		log.info("determineChecksumEncodingForTargetServer()");
 
 		log.info("checking discovered cache to see if I have stored a checksum type...");
 
-		String checksumTypeRetrievedFromCache = irodsAccessObjectFactory
-				.getDiscoveredServerPropertiesCache().retrieveValue(
-						irodsAccount.getHost(), irodsAccount.getZone(),
+		String checksumTypeRetrievedFromCache = irodsAccessObjectFactory.getDiscoveredServerPropertiesCache()
+				.retrieveValue(irodsAccount.getHost(), irodsAccount.getZone(),
 						DiscoveredServerPropertiesCache.CHECKSUM_TYPE);
 
 		if (checksumTypeRetrievedFromCache != null) {
-			log.info("found cached checksum encoding:{}",
-					checksumTypeRetrievedFromCache);
-			return ChecksumEncodingEnum
-					.findTypeByString(checksumTypeRetrievedFromCache);
+			log.info("found cached checksum encoding:{}", checksumTypeRetrievedFromCache);
+			return ChecksumEncodingEnum.findTypeByString(checksumTypeRetrievedFromCache);
 		}
 
 		/*
-		 * No cache hit...If I've specified in the jargon.properties exactly,
-		 * use that encoding
+		 * No cache hit...If I've specified in the jargon.properties exactly, use that
+		 * encoding
 		 */
 
-		ChecksumEncodingEnum encodingFromProperties = irodsAccessObjectFactory
-				.getJargonProperties().getChecksumEncoding();
+		ChecksumEncodingEnum encodingFromProperties = irodsAccessObjectFactory.getJargonProperties()
+				.getChecksumEncoding();
 
 		if (encodingFromProperties == null) {
-			throw new JargonRuntimeException(
-					"jargon properties has null checksum encoding");
+			throw new JargonRuntimeException("jargon properties has null checksum encoding");
 		}
 
 		log.info("encoding from properties:{}", encodingFromProperties);
@@ -99,25 +93,23 @@ public ChecksumEncodingEnum determineChecksumEncodingForTargetServer()
 		}
 
 		/*
-		 * The jargon properties settings need some interpretation based on the
-		 * version and other discoverable qualities of the target server.
+		 * The jargon properties settings need some interpretation based on the version
+		 * and other discoverable qualities of the target server.
 		 */
 
-		EnvironmentalInfoAO environmentalInfoAO = irodsAccessObjectFactory
-				.getEnvironmentalInfoAO(irodsAccount);
+		EnvironmentalInfoAO environmentalInfoAO = irodsAccessObjectFactory.getEnvironmentalInfoAO(irodsAccount);
 
-		IRODSServerProperties serverProperties = environmentalInfoAO
-				.getIRODSServerProperties();
+		IRODSServerProperties serverProperties = environmentalInfoAO.getIRODSServerProperties();
 
 		boolean isConsortium = serverProperties.isAtLeastIrods410();
 
 		log.info("is this consortium? (post 3.3.1):{}", isConsortium);
 
 		/*
 		 * Negotiation:
-		 * 
+		 *
 		 * DEFAULT - use MD5 pre consortium and SHA256 post
-		 * 
+		 *
 		 * STRONG - use MD5 pre 3.3.1 and SHA256 after
 		 */
 
@@ -135,8 +127,7 @@ public ChecksumEncodingEnum determineChecksumEncodingForTargetServer()
 				log.error("unhandled checksum type:{}", encodingFromProperties);
 				throw new JargonException("unknown checksum type");
 			}
-		} else if (serverProperties
-				.isTheIrodsServerAtLeastAtTheGivenReleaseVersion("rods3.3.1")) {
+		} else if (serverProperties.isTheIrodsServerAtLeastAtTheGivenReleaseVersion("rods3.3.1")) {
 			log.info("is at least iRODS3.3.1");
 			if (encodingFromProperties == ChecksumEncodingEnum.DEFAULT) {
 				log.info("checksumEncoding set to MD5");
@@ -159,21 +150,18 @@ public ChecksumEncodingEnum determineChecksumEncodingForTargetServer()
 	}
 
 	private void cacheEncoding(final ChecksumEncodingEnum checksumEncoding) {
-		irodsAccessObjectFactory.getDiscoveredServerPropertiesCache()
-				.cacheAProperty(irodsAccount.getHost(), irodsAccount.getZone(),
-						DiscoveredServerPropertiesCache.CHECKSUM_TYPE,
-						checksumEncoding.toString());
+		irodsAccessObjectFactory.getDiscoveredServerPropertiesCache().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)
+	public ChecksumValue determineChecksumEncodingFromIrodsData(final String irodsChecksumValue)
 			throws ChecksumMethodUnavailableException {
 
 		log.info("determineChecksumEncodingFromIrodsData()");
@@ -197,8 +185,7 @@ public ChecksumValue determineChecksumEncodingFromIrodsData(
 				checksumEncodingEnum = ChecksumEncodingEnum.SHA256;
 			} else {
 				log.error("unknown checksum type:{}", beforeColon);
-				throw new ChecksumMethodUnavailableException(
-						"unknown checksum type:" + beforeColon);
+				throw new ChecksumMethodUnavailableException("unknown checksum type:" + beforeColon);
 			}
 		}
 

jargon-core/src/main/java/org/irods/jargon/core/checksum/ChecksumValue.java

@@ -19,8 +19,8 @@ public class ChecksumValue {
 	 */
 	private String checksumTransmissionFormat = "";
 	/**
-	 * Stringified representation of the checksum digest in the format expected
-	 * by the packing instruction
+	 * Stringified representation of the checksum digest in the format expected by
+	 * the packing instruction
 	 */
 	private String checksumStringValue = "";
 
@@ -76,8 +76,7 @@ public String getChecksumTransmissionFormat() {
 	 * @param checksumTransmissionFormat
 	 *            the checksumTransmissionFormat to set
 	 */
-	public void setChecksumTransmissionFormat(
-			final String checksumTransmissionFormat) {
+	public void setChecksumTransmissionFormat(final String checksumTransmissionFormat) {
 		this.checksumTransmissionFormat = checksumTransmissionFormat;
 	}
 
@@ -117,17 +116,9 @@ public String toString() {
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime
-				* result
-				+ ((checksumEncoding == null) ? 0 : checksumEncoding.hashCode());
-		result = prime
-				* result
-				+ ((checksumStringValue == null) ? 0 : checksumStringValue
-						.hashCode());
-		result = prime
-				* result
-				+ ((checksumTransmissionFormat == null) ? 0
-						: checksumTransmissionFormat.hashCode());
+		result = prime * result + ((checksumEncoding == null) ? 0 : checksumEncoding.hashCode());
+		result = prime * result + ((checksumStringValue == null) ? 0 : checksumStringValue.hashCode());
+		result = prime * result + ((checksumTransmissionFormat == null) ? 0 : checksumTransmissionFormat.hashCode());
 		return result;
 	}
 
@@ -162,8 +153,7 @@ public boolean equals(final Object obj) {
 			if (other.checksumTransmissionFormat != null) {
 				return false;
 			}
-		} else if (!checksumTransmissionFormat
-				.equals(other.checksumTransmissionFormat)) {
+		} else if (!checksumTransmissionFormat.equals(other.checksumTransmissionFormat)) {
 			return false;
 		}
 		return true;

jargon-core/src/main/java/org/irods/jargon/core/checksum/IrodsChecksumValue.java

@@ -33,8 +33,7 @@ public ChecksumEncodingEnum getChecksumEncodingEnum() {
 		return checksumEncodingEnum;
 	}
 
-	public void setChecksumEncodingEnum(
-			final ChecksumEncodingEnum checksumEncodingEnum) {
+	public void setChecksumEncodingEnum(final ChecksumEncodingEnum checksumEncodingEnum) {
 		this.checksumEncodingEnum = checksumEncodingEnum;
 	}
 
@@ -46,8 +45,7 @@ public String toString() {
 			builder.append("checksumValue=").append(checksumValue).append(", ");
 		}
 		if (checksumEncodingEnum != null) {
-			builder.append("checksumEncodingEnum=")
-			.append(checksumEncodingEnum);
+			builder.append("checksumEncodingEnum=").append(checksumEncodingEnum);
 		}
 		builder.append("]");
 		return builder.toString();

jargon-core/src/main/java/org/irods/jargon/core/checksum/LocalChecksumComputerFactory.java

@@ -18,13 +18,12 @@ public interface LocalChecksumComputerFactory {
 	 *
 	 * @param checksumEncodingEnum
 	 *            {@link ChecksumEncodingEnum} value of a specific type
-	 * @return {@link AbstractChecksumComputeStrategy} that implements that
-	 *         encoding algorithm
+	 * @return {@link AbstractChecksumComputeStrategy} that implements that encoding
+	 *         algorithm
 	 * @throws ChecksumMethodUnavailableException
 	 *             if the algorithm is unsupported
 	 */
-	public abstract AbstractChecksumComputeStrategy instance(
-			ChecksumEncodingEnum checksumEncodingEnum)
-					throws ChecksumMethodUnavailableException;
+	public abstract AbstractChecksumComputeStrategy instance(ChecksumEncodingEnum checksumEncodingEnum)
+			throws ChecksumMethodUnavailableException;
 
 }

jargon-core/src/main/java/org/irods/jargon/core/checksum/LocalChecksumComputerFactoryImpl.java

@@ -15,20 +15,17 @@
  * @author Mike Conway - DICE
  *
  */
-public class LocalChecksumComputerFactoryImpl implements
-LocalChecksumComputerFactory {
+public class LocalChecksumComputerFactoryImpl implements LocalChecksumComputerFactory {
 
 	/*
 	 * (non-Javadoc)
 	 *
-	 * @see
-	 * org.irods.jargon.core.checksum.LocalChecksumComputerFactory#instance(
+	 * @see org.irods.jargon.core.checksum.LocalChecksumComputerFactory#instance(
 	 * org.irods.jargon.core.protovalues.ChecksumEncodingEnum)
 	 */
 	@Override
-	public AbstractChecksumComputeStrategy instance(
-			final ChecksumEncodingEnum checksumEncodingEnum)
-					throws ChecksumMethodUnavailableException {
+	public AbstractChecksumComputeStrategy instance(final ChecksumEncodingEnum checksumEncodingEnum)
+			throws ChecksumMethodUnavailableException {
 
 		if (checksumEncodingEnum == null) {
 			throw new IllegalArgumentException("null checksumEncodingEnum");
@@ -40,8 +37,7 @@ public AbstractChecksumComputeStrategy instance(
 			return new SHA256LocalChecksumComputerStrategy();
 		} else {
 			throw new ChecksumMethodUnavailableException(
-					"unable to find a checksum encoding method for:"
-							+ checksumEncodingEnum);
+					"unable to find a checksum encoding method for:" + checksumEncodingEnum);
 		}
 
 	}

jargon-core/src/main/java/org/irods/jargon/core/checksum/MD5LocalChecksumComputerStrategy.java

@@ -16,11 +16,9 @@
  *
  * @author Mike Conway - DICE
  */
-public class MD5LocalChecksumComputerStrategy extends
-AbstractChecksumComputeStrategy {
+public class MD5LocalChecksumComputerStrategy extends AbstractChecksumComputeStrategy {
 
-	public static final Logger log = LoggerFactory
-			.getLogger(MD5LocalChecksumComputerStrategy.class);
+	public static final Logger log = LoggerFactory.getLogger(MD5LocalChecksumComputerStrategy.class);
 
 	/*
 	 * (non-Javadoc)
@@ -29,23 +27,19 @@ public class MD5LocalChecksumComputerStrategy extends
 	 * instanceChecksumForPackingInstruction(java.lang.String)
 	 */
 	@Override
-	public ChecksumValue computeChecksumValueForLocalFile(
-			final String localFileAbsolutePath) throws FileNotFoundException,
-			JargonException {
+	public ChecksumValue computeChecksumValueForLocalFile(final String localFileAbsolutePath)
+			throws FileNotFoundException, JargonException {
 
 		log.info("instanceChecksumForPackingInstruction()");
 
 		if (localFileAbsolutePath == null || localFileAbsolutePath.isEmpty()) {
-			throw new IllegalArgumentException(
-					"null or empty localFileAbsolutePath");
+			throw new IllegalArgumentException("null or empty localFileAbsolutePath");
 		}
 
-		byte[] digest = LocalFileUtils
-				.computeMD5FileCheckSumViaAbsolutePath(localFileAbsolutePath);
+		byte[] digest = LocalFileUtils.computeMD5FileCheckSumViaAbsolutePath(localFileAbsolutePath);
 		ChecksumValue value = new ChecksumValue();
 		value.setChecksumEncoding(ChecksumEncodingEnum.MD5);
-		value.setChecksumStringValue(LocalFileUtils
-				.digestByteArrayToString(digest));
+		value.setChecksumStringValue(LocalFileUtils.digestByteArrayToString(digest));
 		value.setChecksumTransmissionFormat(value.getChecksumStringValue());
 		return value;
 

jargon-core/src/main/java/org/irods/jargon/core/checksum/SHA256LocalChecksumComputerStrategy.java

@@ -17,11 +17,9 @@
  *
  * @author Mike Conway - DICE
  */
-public class SHA256LocalChecksumComputerStrategy extends
-AbstractChecksumComputeStrategy {
+public class SHA256LocalChecksumComputerStrategy extends AbstractChecksumComputeStrategy {
 
-	public static final Logger log = LoggerFactory
-			.getLogger(SHA256LocalChecksumComputerStrategy.class);
+	public static final Logger log = LoggerFactory.getLogger(SHA256LocalChecksumComputerStrategy.class);
 
 	/*
 	 * (non-Javadoc)
@@ -30,19 +28,16 @@ public class SHA256LocalChecksumComputerStrategy extends
 	 * instanceChecksumForPackingInstruction(java.lang.String)
 	 */
 	@Override
-	public ChecksumValue computeChecksumValueForLocalFile(
-			final String localFileAbsolutePath) throws FileNotFoundException,
-			JargonException {
+	public ChecksumValue computeChecksumValueForLocalFile(final String localFileAbsolutePath)
+			throws FileNotFoundException, JargonException {
 
 		log.info("instanceChecksumForPackingInstruction()");
 
 		if (localFileAbsolutePath == null || localFileAbsolutePath.isEmpty()) {
-			throw new IllegalArgumentException(
-					"null or empty localFileAbsolutePath");
+			throw new IllegalArgumentException("null or empty localFileAbsolutePath");
 		}
 
-		byte[] digest = LocalFileUtils
-				.computeSHA256FileCheckSumViaAbsolutePath(localFileAbsolutePath);
+		byte[] digest = LocalFileUtils.computeSHA256FileCheckSumViaAbsolutePath(localFileAbsolutePath);
 
 		ChecksumValue value = new ChecksumValue();
 		value.setChecksumEncoding(ChecksumEncodingEnum.SHA256);