From 2aa16c1219cd07568546f99a070181a1ce7030a4 Mon Sep 17 00:00:00 2001
From: Andrei Rebegea <andrei.rebegea@ness.com>
Date: Mon, 6 Jun 2016 13:06:22 +0000
Subject: [PATCH] Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)    127895 gjames: Minor
 cleanup and removed some imports

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/solr/client/SOLRAPIClient.java   |  3 +-
 .../solr/client/SOLRAPIClientTest.java        | 46 +++++--------------
 2 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/client/SOLRAPIClient.java b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/client/SOLRAPIClient.java
index b07b7b86c..fed813ebc 100644
--- a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/client/SOLRAPIClient.java
+++ b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/client/SOLRAPIClient.java
@@ -1236,8 +1236,7 @@ public class SOLRAPIClient
                 {
                     try
                     {
-                        Date date = ISO8601DateFormat.parse(source);
-                        return date;
+                        return ISO8601DateFormat.parse(source);
                     }
                     catch (Exception e)
                     {
diff --git a/search-services/alfresco-solrclient-lib/source/test-java/org/alfresco/solr/client/SOLRAPIClientTest.java b/search-services/alfresco-solrclient-lib/source/test-java/org/alfresco/solr/client/SOLRAPIClientTest.java
index a75664b33..526229d6b 100644
--- a/search-services/alfresco-solrclient-lib/source/test-java/org/alfresco/solr/client/SOLRAPIClientTest.java
+++ b/search-services/alfresco-solrclient-lib/source/test-java/org/alfresco/solr/client/SOLRAPIClientTest.java
@@ -25,30 +25,7 @@
  */
 package org.alfresco.solr.client;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.AlgorithmParameters;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
 import junit.framework.TestCase;
-
 import org.alfresco.encryption.DefaultEncryptionUtils;
 import org.alfresco.encryption.KeyProvider;
 import org.alfresco.encryption.KeyResourceLoader;
@@ -60,20 +37,12 @@ import org.alfresco.httpclient.AlfrescoHttpClient;
 import org.alfresco.httpclient.AuthenticationException;
 import org.alfresco.httpclient.HttpClientFactory;
 import org.alfresco.httpclient.HttpClientFactory.SecureCommsType;
-import org.alfresco.httpclient.MD5EncryptionParameters;
 import org.alfresco.opencmis.dictionary.CMISDictionaryRegistry;
 import org.alfresco.opencmis.dictionary.CMISStrictDictionaryService;
 import org.alfresco.opencmis.mapping.CMISMapping;
 import org.alfresco.opencmis.mapping.RuntimePropertyLuceneBuilderMapping;
 import org.alfresco.repo.cache.MemoryCache;
-import org.alfresco.repo.dictionary.DictionaryComponent;
-import org.alfresco.repo.dictionary.DictionaryDAOImpl;
-import org.alfresco.repo.dictionary.CompiledModelsCache;
-import org.alfresco.repo.dictionary.DictionaryNamespaceComponent;
-import org.alfresco.repo.dictionary.DictionaryRegistry;
-import org.alfresco.repo.dictionary.M2Model;
-import org.alfresco.repo.dictionary.M2Namespace;
-import org.alfresco.repo.dictionary.NamespaceDAO;
+import org.alfresco.repo.dictionary.*;
 import org.alfresco.repo.i18n.StaticMessageLookup;
 import org.alfresco.repo.tenant.SingleTServiceImpl;
 import org.alfresco.repo.tenant.TenantService;
@@ -90,6 +59,16 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONException;
 
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.AlgorithmParameters;
+import java.util.*;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
 /**
  * Tests {@link SOLRAPIClient} Note: need to make sure that source/solr/instance is on the run classpath. Note: doesn't
  * currently work, need to change to use SSL.
@@ -290,8 +269,7 @@ public class SOLRAPIClientTest extends TestCase
                 8443, 40, 40, 0);
         // TODO need to make port configurable depending on secure comms, or just make redirects
         // work
-        AlfrescoHttpClient repoClient = httpClientFactory.getRepoClient("localhost", 8443);
-        return repoClient;
+        return httpClientFactory.getRepoClient("localhost", 8443);
     }
 
     public ClassLoader getResourceClassLoader()