Code formatting

src/test/java/org/genesys/test/catalog/api/v0/DescriptorControllerTest.java

@@ -18,7 +18,6 @@ package org.genesys.test.catalog.api.v0;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;
-import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;

src/test/java/org/genesys/test/catalog/services/AbstractDatasetServiceTest.java

@@ -35,7 +35,6 @@ import org.genesys2.server.model.impl.FaoInstitute;
 import org.genesys2.server.persistence.AccessionRepository;
 import org.genesys2.server.persistence.FaoInstituteRepository;
 import org.genesys2.server.service.InstituteService;
-import org.genesys2.server.service.TaxonomyService;
 import org.genesys2.server.service.worker.AccessionUploader;
 import org.junit.After;
 import org.junit.Before;
@@ -77,8 +76,6 @@ public abstract class AbstractDatasetServiceTest extends CatalogServiceTest {
 	@Autowired
 	private InstituteService instituteService;
 	@Autowired
-	private TaxonomyService taxonomyService;
-	@Autowired
 	private AccessionUploader accessionUploader;
 
 	public AbstractDatasetServiceTest() {

src/test/java/org/genesys/test/catalog/services/DescriptorListServiceTest.java

@@ -31,7 +31,6 @@ import org.genesys.catalog.model.filters.DescriptorListFilter;
 import org.genesys.catalog.model.traits.Descriptor;
 import org.genesys.catalog.model.traits.Descriptor.Category;
 import org.genesys.catalog.model.traits.DescriptorList;
-import org.genesys.catalog.persistence.vocab.ControlledVocabularyRepository;
 import org.genesys.catalog.service.DescriptorListService;
 import org.genesys.catalog.service.impl.DescriptorListServiceImpl;
 import org.genesys2.server.model.PublishState;
@@ -39,14 +38,14 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.ConcurrencyFailureException;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
 /**
  * Test for {@link DescriptorListServiceImpl}
  *
@@ -72,12 +71,6 @@ public class DescriptorListServiceTest extends CatalogServiceTest {
 	@Autowired
 	private DescriptorListService descriptorListService;
 
-	private static final String DESCRIPTOR_TITLE_OF_CSV = "Accession name";
-	private static final Descriptor.DataType DESCRIPTOR_DATATYPE_OF_CSV = Descriptor.DataType.TEXT;
-
-	@Autowired
-	private ControlledVocabularyRepository controlledVocabularyRepository;
-
 	protected Partner partnerSecond;
 
 	{

src/test/java/org/genesys/test/server/api/v0/PermissionControllerTest.java

@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 

src/test/java/org/genesys/test/server/api/v1/AsciiDocControllerTest.java

@@ -33,7 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 

src/test/java/org/genesys/test/server/api/v1/RequestControllerTest.java

@@ -7,7 +7,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
 
@@ -17,7 +16,11 @@ import org.genesys2.server.api.v1.RequestsController;
 import org.genesys2.server.model.genesys.Accession;
 import org.genesys2.server.model.impl.FaoInstitute;
 import org.genesys2.server.model.impl.VerificationToken;
-import org.genesys2.server.persistence.*;
+import org.genesys2.server.persistence.AccessionRepository;
+import org.genesys2.server.persistence.ArticleRepository;
+import org.genesys2.server.persistence.MaterialRequestRepository;
+import org.genesys2.server.persistence.MaterialSubRequestRepository;
+import org.genesys2.server.persistence.VerificationTokenRepository;
 import org.genesys2.server.service.ContentService;
 import org.genesys2.server.service.InstituteService;
 import org.genesys2.server.service.RequestService;

src/test/java/org/genesys/test/server/services/ClassPKTest.java

@@ -17,7 +17,6 @@ package org.genesys.test.server.services;
 
 import org.genesys.blocks.model.ClassPK;
 import org.genesys2.server.service.ContentService;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;

src/test/java/org/genesys/test/simpletest/AccessionFilterTest.java

 package org.genesys.test.simpletest;
 
-import static com.google.common.collect.Sets.*;
+import static com.google.common.collect.Sets.newHashSet;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
 
 import java.io.IOException;
 import java.text.ParseException;