Merge pull request #255 from CycloneDX/improve_code

Improve Code

Author: stevespringett

README.md

@@ -32,14 +32,14 @@ as well as the output format options. Use the latest possible version of this li
 the CycloneDX version supported by the target system.
 
 | Version | Schema Version | Format(s) |
-| ------- | ----------------- | --------- |
-| 7.x | CycloneDX v1.4 | XML/JSON |
-| 6.x | CycloneDX v1.4 | XML/JSON |
-| 5.x | CycloneDX v1.3 | XML/JSON |
-| 4.x | CycloneDX v1.2 | XML/JSON |
-| 3.x | CycloneDX v1.2 | XML/JSON |
-| 2.x | CycloneDX v1.1 | XML |
-| 1.x | CycloneDX v1.0 | XML |
+|---------|----------------|-----------|
+| 7.x     | CycloneDX v1.4 | XML/JSON  |
+| 6.x     | CycloneDX v1.4 | XML/JSON  |
+| 5.x     | CycloneDX v1.3 | XML/JSON  |
+| 4.x     | CycloneDX v1.2 | XML/JSON  |
+| 3.x     | CycloneDX v1.2 | XML/JSON  |
+| 2.x     | CycloneDX v1.1 | XML       |
+| 1.x     | CycloneDX v1.0 | XML       |
 
 ## Library API Documentation
 

src/main/java/org/cyclonedx/BomParserFactory.java

@@ -24,17 +24,17 @@
 import org.cyclonedx.parsers.Parser;
 import org.cyclonedx.parsers.XmlParser;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 
 public class BomParserFactory {
 
     private BomParserFactory() {}
 
     public static Parser createParser(final File file) throws ParseException {
-        try (final InputStream fis = new FileInputStream(file)) {
+        try (final InputStream fis = Files.newInputStream(file.toPath())) {
             final byte[] bytes = IOUtils.toByteArray(fis, 1);
             return createParser(bytes);
         } catch (IOException e) {

src/main/java/org/cyclonedx/generators/json/AbstractBomJsonGenerator.java

@@ -50,9 +50,9 @@ public AbstractBomJsonGenerator() {
         setupPrettyPrinter(this.prettyPrinter);
     }
 
-	public ObjectMapper getMapper() {
-		return mapper;
-	}
+    public ObjectMapper getMapper() {
+        return mapper;
+    }
 
     private void setupPrettyPrinter(final DefaultPrettyPrinter prettyPrinter) {
         prettyPrinter.indentArraysWith(DefaultIndenter.SYSTEM_LINEFEED_INSTANCE);

src/main/java/org/cyclonedx/generators/xml/AbstractBomXmlGenerator.java

@@ -129,7 +129,7 @@ String toXML(final Bom bom, final boolean prettyPrint) throws GeneratorException
     /**
      * Creates a text representation of a CycloneDX BoM Document. This method
      * calls {@link #toXmlString()} and will return an empty string if {@link #toXmlString()}
-     * throws an exception. Its preferred to call {@link #toXmlString()} directly
+     * throws an exception. It's preferred to call {@link #toXmlString()} directly
      * so that exceptions can be caught.
      * @return a String of the BoM
      * @since 1.1.0

src/main/java/org/cyclonedx/parsers/XmlParser.java

@@ -40,11 +40,11 @@
 import javax.xml.xpath.XPathFactory;
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.lang.reflect.Field;
+import java.nio.file.Files;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -68,7 +68,7 @@ public XmlParser() {
     public Bom parse(final File file) throws ParseException {
         try {
             final String schemaVersion = identifySchemaVersion(
-                    extractAllNamespaceDeclarations(new InputSource(new FileInputStream(file))));
+                extractAllNamespaceDeclarations(new InputSource(Files.newInputStream(file.toPath()))));
 
             return injectSchemaVersion(mapper.readValue(file, Bom.class), schemaVersion);
         } catch (IOException | XPathExpressionException e) {

src/test/java/org/cyclonedx/parse/JsonParseTest.java

@@ -29,22 +29,21 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class JsonParseTest extends BaseParseTest {
-
     @TestFactory
-    public Collection<DynamicTest> dynamicTestsWithCollection() throws Exception {
+    public Collection<DynamicTest> dynamicTestsWithCollection() {
         final List<File> files = getAllResources();
         final List<DynamicTest> dynamicTests = new ArrayList<>();
-        for (final File file: files) {
+        for (final File file : files) {
             if (file.getName().endsWith(".json")) {
                 if (file.getName().startsWith("valid")) {
                     //dynamicTests.add(DynamicTest.dynamicTest(file.getName(), () -> assertNotNull(parseBom(file))));
                     dynamicTests.add(DynamicTest.dynamicTest(file.getName(), () -> {
                         final Bom bom = parseBom(file);
                         assertNotNull(bom);
                         super.generateBomJson(file.getName(), bom);
-
                     }));
-                } else if (file.getName().startsWith("invalid")) {
+                }
+                else if (file.getName().startsWith("invalid")) {
 
                 }
             }

src/test/java/org/cyclonedx/parse/XmlParseTest.java

@@ -29,27 +29,25 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class XmlParseTest extends BaseParseTest {
-
     @TestFactory
-    public Collection<DynamicTest> dynamicTestsWithCollection() throws Exception {
+    public Collection<DynamicTest> dynamicTestsWithCollection() {
         final List<File> files = getAllResources();
         final List<DynamicTest> dynamicTests = new ArrayList<>();
-        for (final File file: files) {
+        for (final File file : files) {
             if (file.getName().endsWith(".xml")) {
                 if (file.getName().startsWith("valid")) {
                     //dynamicTests.add(DynamicTest.dynamicTest(file.getName(), () -> assertNotNull(parseBom(file))));
                     dynamicTests.add(DynamicTest.dynamicTest(file.getName(), () -> {
                         final Bom bom = parseBom(file);
                         assertNotNull(bom);
                         super.generateBomXml(file.getName(), bom);
-
                     }));
-                } else if (file.getName().startsWith("invalid")) {
+                }
+                else if (file.getName().startsWith("invalid")) {
 
                 }
             }
         }
         return dynamicTests;
     }
-
 }