Clean up imports

Author: Grahame Grieve

src/main/java/org/fhir/ucum/UcumEssenceService.java

@@ -40,7 +40,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 import java.util.List;
 import java.util.Set;
 
-import org.fhir.ucum.definitions.DefinitionsProvider;
 import org.fhir.ucum.definitions.DefinitionsProviderFactory;
 import org.fhir.ucum.definitions.XmlDefinitionsParser;
 import org.fhir.ucum.special.Registry;

src/main/java/org/fhir/ucum/definitions/DefinitionsProvider.java

@@ -1,16 +1,9 @@
 package org.fhir.ucum.definitions;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
-import java.text.ParseException;
-
-import javax.xml.parsers.ParserConfigurationException;
 
 import org.fhir.ucum.UcumException;
 import org.fhir.ucum.UcumModel;
-import org.xml.sax.SAXException;
 
 public interface DefinitionsProvider {
   public UcumModel parse(String filename) throws UcumException;

src/test/java/org/fhir/ucum/UcumCommonUnitsTest.java

@@ -2,13 +2,20 @@
 
 
 
-import org.junit.jupiter.api.Test;
-
-import java.util.*;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
 public class UcumCommonUnitsTest extends UcumServiceTest
 {
     static class CommonUnit

src/test/java/org/fhir/ucum/UcumDecimalTests.java

@@ -2,10 +2,10 @@
 
 
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 public class UcumDecimalTests {
 
   @Test

src/test/java/org/fhir/ucum/UcumFunctionalTests.java

@@ -33,6 +33,16 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
 package org.fhir.ucum;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.fhir.ucum.utils.XmlUtils;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.TestInstance;
@@ -43,15 +53,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.fail;
-
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class UcumFunctionalTests extends UcumServiceTest {

src/test/java/org/fhir/ucum/UcumIssue13Tests.java

@@ -1,10 +1,10 @@
 package org.fhir.ucum;
 
+import java.io.IOException;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-
 
 
 

src/test/java/org/fhir/ucum/UcumIssue21Tests.java

@@ -1,10 +1,10 @@
 package org.fhir.ucum;
 
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 
 public class UcumIssue21Tests extends UcumServiceTest{

src/test/java/org/fhir/ucum/UcumIssue22Tests.java

@@ -1,10 +1,10 @@
 package org.fhir.ucum;
 
+import java.io.IOException;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.io.*;
-
 
 public class UcumIssue22Tests extends UcumServiceTest{
 

src/test/java/org/fhir/ucum/UcumIssue23Tests.java

@@ -1,10 +1,10 @@
 package org.fhir.ucum;
 
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 
 public class UcumIssue23Tests extends UcumServiceTest{

src/test/java/org/fhir/ucum/UcumIssue6_7Tests.java

@@ -2,12 +2,12 @@
 
 
 
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import java.io.IOException;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.Test;
 
 
 public class UcumIssue6_7Tests extends UcumServiceTest{

src/test/java/org/fhir/ucum/UcumServiceTest.java

@@ -1,12 +1,13 @@
 package org.fhir.ucum;
 
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.TestInstance;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
+import java.net.URL;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class UcumServiceTest {
@@ -17,10 +18,10 @@ public void beforeAll() throws FileNotFoundException, UcumException {
         ucumService = getUcumEssenceService();
     }
     private UcumService getUcumEssenceService() throws FileNotFoundException, UcumException {
-        ;
         String fileName = "ucum-essence.xml";
         ClassLoader classLoader = getClass().getClassLoader();
-        File file = new File(classLoader.getResource(fileName).getFile());
+        URL fn = classLoader.getResource(fileName);
+        File file = new File(fn.getFile());
         InputStream inputStream = new FileInputStream(file);
         UcumService ucumService = new UcumEssenceService(inputStream);
         return ucumService;