Fix cycle

Author: aeibner

src/main/java/com/indoqa/solr/utils/maintenance/handlers/AddFieldsHandler.java

@@ -22,7 +22,6 @@
 import java.util.*;
 
 import com.indoqa.solr.utils.InitializationFailedException;
-import com.indoqa.solr.utils.maintenance.SchemaUpdates;
 import com.indoqa.solr.utils.validation.SolrSchema;
 import com.indoqa.solr.utils.tests.validation.helper.ExtractedValidations;
 import com.indoqa.solr.utils.tests.validation.helper.Operation;

src/main/java/com/indoqa/solr/utils/maintenance/handlers/ModifyFieldsHandler.java

@@ -27,7 +27,6 @@
 import java.util.function.Predicate;
 
 import com.indoqa.solr.utils.InitializationFailedException;
-import com.indoqa.solr.utils.maintenance.SchemaUpdates;
 import com.indoqa.solr.utils.validation.SolrSchema;
 import com.indoqa.solr.utils.tests.validation.helper.ExtractedValidations;
 import com.indoqa.solr.utils.tests.validation.helper.Operation;

src/main/java/com/indoqa/solr/utils/maintenance/handlers/RemoveFieldsHandler.java

@@ -24,7 +24,6 @@
 import java.util.Optional;
 
 import com.indoqa.solr.utils.InitializationFailedException;
-import com.indoqa.solr.utils.maintenance.SchemaUpdates;
 import com.indoqa.solr.utils.validation.SolrSchema;
 import com.indoqa.solr.utils.tests.validation.helper.ExtractedValidations;
 import com.indoqa.solr.utils.tests.validation.helper.Operation;

src/main/java/com/indoqa/solr/utils/maintenance/handlers/SchemaUpdates.java

@@ -14,7 +14,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.indoqa.solr.utils.maintenance;
+package com.indoqa.solr.utils.maintenance.handlers;
 
 import static java.util.stream.Collectors.toList;
 

src/main/java/com/indoqa/solr/utils/validation/checks/SchemaValidation.java

@@ -16,8 +16,6 @@
  */
 package com.indoqa.solr.utils.validation.checks;
 
-import static java.text.MessageFormat.format;
-
 import java.io.IOException;
 
 import com.indoqa.solr.utils.validation.SchemaCheck;
@@ -42,8 +40,7 @@ default <T extends SolrResponse> T process(String collectionName, AbstractSchema
         try {
             return request.process(solrClient);
         } catch (SolrServerException | IOException e) {
-            String message = format("Could not check validity of Solr schema for core/collection {0}. ", collectionName);
-            throw new SolrSchemaException(message, e);
+            throw new SolrSchemaException("Could not check validity of Solr schema for core/collection '" + collectionName + "'.", e);
         }
     }
 

src/test/java/com/indoqa/solr/utils/tests/validation/AbstractSolrSchemaCheckerTest.java

@@ -19,6 +19,8 @@
 import static com.indoqa.solr.utils.tests.matchers.CompoundMatcher.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import java.io.PrintStream;
+
 import com.indoqa.solr.utils.tests.rules.SolrInfrastructureRule;
 import com.indoqa.solr.utils.validation.SchemaCheck;
 import com.indoqa.solr.utils.validation.SchemaCheckConfiguration;