#365 make cart unencrypted

jargon-data-utils/src/main/java/org/irods/jargon/datautils/datacache/DataCacheServiceFactory.java

@@ -11,13 +11,20 @@
  */
 public interface DataCacheServiceFactory {
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.irods.jargon.datautils.image.ImageServiceFactory#instanceThumbnailService
-	 * (org.irods.jargon.core.connection.IRODSAccount)
+	/**
+	 * Get the normal encrypting data cache service
+	 * 
+	 * @param irodsAccount {@link IRODSAccount}
+	 * @return {@link DataCacheService} implementation
 	 */
 	public abstract DataCacheService instanceDataCacheService(IRODSAccount irodsAccount);
 
+	/**
+	 * Get a data cache service that does not encrypt
+	 * 
+	 * @param irodsAccount {@link IRODSAccount}
+	 * @return {@link DataCacheService} implementation
+	 */
+	public DataCacheService instanceNoEncryptDataCacheService(IRODSAccount irodsAccount);
+
 }

jargon-data-utils/src/main/java/org/irods/jargon/datautils/datacache/DataCacheServiceFactoryImpl.java

@@ -33,4 +33,12 @@ public DataCacheService instanceDataCacheService(final IRODSAccount irodsAccount
 		return new DataCacheServiceImpl(irodsAccessObjectFactory, irodsAccount);
 	}
 
+	@Override
+	public DataCacheService instanceNoEncryptDataCacheService(final IRODSAccount irodsAccount) {
+		if (irodsAccount == null) {
+			throw new IllegalArgumentException("null irodsAccount");
+		}
+		return new NoEncryptDataCacheServiceImpl(irodsAccessObjectFactory, irodsAccount);
+	}
+
 }

jargon-data-utils/src/main/java/org/irods/jargon/datautils/datacache/DataCacheServiceImpl.java

@@ -42,10 +42,10 @@ public class DataCacheServiceImpl extends AbstractDataUtilsServiceImpl implement
 	/**
 	 * Constructor with required dependencies
 	 *
-	 * @param irodsAccessObjectFactory
-	 *            {@link IRODSAccessObjectFactory} that can create necessary objects
-	 * @param irodsAccount
-	 *            {@link IRODSAccount} that contains the login information
+	 * @param irodsAccessObjectFactory {@link IRODSAccessObjectFactory} that can
+	 *                                 create necessary objects
+	 * @param irodsAccount             {@link IRODSAccount} that contains the login
+	 *                                 information
 	 */
 	public DataCacheServiceImpl(final IRODSAccessObjectFactory irodsAccessObjectFactory,
 			final IRODSAccount irodsAccount) {
@@ -179,10 +179,6 @@ public String putSerializedEncryptedObjectIntoCache(final Object informationObje
 			throw new IllegalArgumentException("null informationObject");
 		}
 
-		if (key == null || key.isEmpty()) {
-			throw new IllegalArgumentException("null key");
-		}
-
 		checkContracts();
 		log.info("putInformationIntoCache()");
 
@@ -273,10 +269,8 @@ public Object retrieveObjectFromCache(final String userName, final String key) t
 	 * Based on the configuration, come up with an absolute path to the file name
 	 * for the cache file
 	 *
-	 * @param keyHash
-	 *            {@code int}
-	 * @param userName
-	 *            {@code String}
+	 * @param keyHash  {@code int}
+	 * @param userName {@code String}
 	 * @return {@code String}
 	 */
 	private String buildIRODSFileAbsolutePath(final int keyHash, final String userName) {
@@ -297,9 +291,8 @@ private String buildIRODSFileAbsolutePath(final int keyHash, final String userNa
 	 * parent directory based on the standard /zone/home/user/cacheDir as configured
 	 * in the CacheDirConfig
 	 *
-	 * @param userName
-	 *            {@code String} with the name of the user for whom the home cache
-	 *            directory will be computed
+	 * @param userName {@code String} with the name of the user for whom the home
+	 *                 cache directory will be computed
 	 * @return {@code StringBuilder} with computed part of the abs path
 	 */
 	private StringBuilder computeCacheDirPathFromHomeDirFromUserAndZone(final String userName) {