Skip to content

Commit 485826e

Browse files
mr-zepolmr-zepol
committed
Remove unused imports
Signed-off-by: Alex Alzate <[email protected]>
1 parent 9e74d3b commit 485826e

File tree

9 files changed

+1
-127
lines changed

9 files changed

+1
-127
lines changed

‎src/main/java/org/cyclonedx/generators/xml/BomXmlGenerator.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ public String toXmlString() throws GeneratorException {
140140
*
141141
* @return a String of the BoM
142142
* @since 1.1.0
143+
*
143144
*/
144145
@Override
145146
public String toString() {

‎src/main/java/org/cyclonedx/model/attestation/Attestation.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.List;
44
import java.util.Objects;
5-
import javax.xml.bind.annotation.XmlElement;
65

76
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
87
import com.fasterxml.jackson.annotation.JsonInclude;

‎src/main/java/org/cyclonedx/model/attestation/Claim.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.List;
44
import java.util.Objects;
5-
import javax.xml.bind.annotation.XmlElement;
65

76
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
87
import com.fasterxml.jackson.annotation.JsonInclude;

‎src/main/java/org/cyclonedx/model/attestation/affirmation/Affirmation.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import java.util.List;
44
import java.util.Objects;
5-
import javax.xml.bind.annotation.XmlElement;
65

76
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
87
import com.fasterxml.jackson.annotation.JsonInclude;
9-
import com.fasterxml.jackson.annotation.JsonProperty;
108
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
119
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
1210
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;

‎src/main/java/org/cyclonedx/model/attestation/affirmation/Signatory.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
@JsonIgnoreProperties(ignoreUnknown = true)
1717
@JsonInclude(JsonInclude.Include.NON_EMPTY)
18-
@JsonTypeName("signatory")
1918
@JsonPropertyOrder({"name", "role", "signature", "organization", "externalReference"})
2019
@JsonDeserialize(using = SignatoryDeserializer.class)
2120
public class Signatory extends ExtensibleElement

‎src/main/java/org/cyclonedx/model/formulation/common/AbstractType.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public void setResource(final ResourceReferenceChoice resource) {
4444
this.resource = resource;
4545
}
4646

47-
4847
@JacksonXmlElementWrapper(localName = "environmentVars")
4948
public EnvironmentVars getEnvironmentVars() {
5049
return environmentVars;

‎src/main/java/org/cyclonedx/util/deserializer/AbstractDataTypeDeserializer.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ protected void setSourceAndTarget(JsonNode node, AbstractType type) throws JsonP
7070
setReference(node, "target", type);
7171
}
7272

73-
7473
protected void setProperties(JsonNode node, T type)
7574
throws JsonProcessingException
7675
{

‎src/test/java/org/cyclonedx/BomJsonGeneratorTest.java‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -374,66 +374,6 @@ public void schema16_testFormulation() throws Exception {
374374
assertTrue(parser.isValid(loadedFile, version));
375375
}
376376

377-
@Test
378-
public void schema16_testExpressions() throws Exception {
379-
Version version = Version.VERSION_16;
380-
Bom bom = createCommonXmlBom("/1.6/valid-license-expression-1.6.xml");
381-
382-
BomJsonGenerator generator = BomGeneratorFactory.createJson(version, bom);
383-
File loadedFile = writeToFile(generator.toJsonString());
384-
385-
JsonParser parser = new JsonParser();
386-
assertTrue(parser.isValid(loadedFile, version));
387-
}
388-
389-
@Test
390-
public void schema16_testAttestations() throws Exception {
391-
Version version = Version.VERSION_16;
392-
Bom bom = createCommonXmlBom("/1.6/valid-attestation-1.6.xml");
393-
394-
BomJsonGenerator generator = BomGeneratorFactory.createJson(version, bom);
395-
File loadedFile = writeToFile(generator.toJsonString());
396-
397-
JsonParser parser = new JsonParser();
398-
assertTrue(parser.isValid(loadedFile, version));
399-
}
400-
401-
@Test
402-
public void schema16_testAttestations_json() throws Exception {
403-
Version version = Version.VERSION_16;
404-
Bom bom = createCommonJsonBom("/1.6/valid-attestation-1.6.json");
405-
406-
BomJsonGenerator generator = BomGeneratorFactory.createJson(version, bom);
407-
File loadedFile = writeToFile(generator.toJsonString());
408-
409-
JsonParser parser = new JsonParser();
410-
assertTrue(parser.isValid(loadedFile, version));
411-
}
412-
413-
@Test
414-
public void schema16_testCompositions() throws Exception {
415-
Version version = Version.VERSION_16;
416-
Bom bom = createCommonXmlBom("/1.6/valid-compositions-1.6.xml");
417-
418-
BomJsonGenerator generator = BomGeneratorFactory.createJson(version, bom);
419-
File loadedFile = writeToFile(generator.toJsonString());
420-
421-
JsonParser parser = new JsonParser();
422-
assertTrue(parser.isValid(loadedFile, version));
423-
}
424-
425-
@Test
426-
public void schema16_testVulnerabilities() throws Exception {
427-
Version version = Version.VERSION_16;
428-
Bom bom = createCommonXmlBom("/1.6/valid-vulnerability-1.6.xml");
429-
430-
BomJsonGenerator generator = BomGeneratorFactory.createJson(version, bom);
431-
File loadedFile = writeToFile(generator.toJsonString());
432-
433-
JsonParser parser = new JsonParser();
434-
assertTrue(parser.isValid(loadedFile, version));
435-
}
436-
437377
@Test
438378
public void schema16_testCrypto() throws Exception {
439379
Version version = Version.VERSION_16;

‎src/test/java/org/cyclonedx/BomXmlGeneratorTest.java‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -492,54 +492,6 @@ public void schema16_testFormulation() throws Exception {
492492
assertTrue(parser.isValid(loadedFile, version));
493493
}
494494

495-
@Test
496-
public void schema16_testExpressions() throws Exception {
497-
Version version = Version.VERSION_16;
498-
Bom bom = createCommonJsonBom("/1.6/valid-license-expression-1.6.json");
499-
500-
BomXmlGenerator generator = BomGeneratorFactory.createXml(version, bom);
501-
File loadedFile = writeToFile(generator.toXmlString());
502-
503-
XmlParser parser = new XmlParser();
504-
assertTrue(parser.isValid(loadedFile, version));
505-
}
506-
507-
@Test
508-
public void schema16_testAttestations() throws Exception {
509-
Version version = Version.VERSION_16;
510-
Bom bom = createCommonJsonBom("/1.6/valid-attestation-1.6.json");
511-
512-
BomXmlGenerator generator = BomGeneratorFactory.createXml(version, bom);
513-
File loadedFile = writeToFile(generator.toXmlString());
514-
515-
XmlParser parser = new XmlParser();
516-
assertTrue(parser.isValid(loadedFile, version));
517-
}
518-
519-
@Test
520-
public void schema16_testAttestations_xml() throws Exception {
521-
Version version = Version.VERSION_16;
522-
Bom bom = createCommonBomXml("/1.6/valid-attestation-1.6.xml");
523-
addSignature(bom);
524-
525-
BomXmlGenerator generator = BomGeneratorFactory.createXml(version, bom);
526-
File loadedFile = writeToFile(generator.toXmlString());
527-
528-
XmlParser parser = new XmlParser();
529-
assertTrue(parser.isValid(loadedFile, version));
530-
}
531-
532-
private void addSignature(Bom bom) {
533-
List<Attribute> attributes = new ArrayList<>();
534-
attributes.add(new Attribute("xmlns", "http://www.w3.org/2000/09/xmldsig#"));
535-
ExtensibleType signature = new ExtensibleType("ds", "Signature", attributes, "");
536-
bom.getDeclarations().getAffirmation().getSignatories().get(0).addExtensibleType(signature);
537-
/* <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
538-
<!-- XML signature here -->
539-
</ds:Signature>*/
540-
}
541-
542-
543495
@Test
544496
public void schema16_testCompositions() throws Exception {
545497
Version version = Version.VERSION_16;
@@ -552,18 +504,6 @@ public void schema16_testCompositions() throws Exception {
552504
assertTrue(parser.isValid(loadedFile, version));
553505
}
554506

555-
@Test
556-
public void schema16_testVulnerabilities() throws Exception {
557-
Version version = Version.VERSION_16;
558-
Bom bom = createCommonJsonBom("/1.6/valid-vulnerability-1.6.json");
559-
560-
BomXmlGenerator generator = BomGeneratorFactory.createXml(version, bom);
561-
File loadedFile = writeToFile(generator.toXmlString());
562-
563-
XmlParser parser = new XmlParser();
564-
assertTrue(parser.isValid(loadedFile, version));
565-
}
566-
567507
@Test
568508
public void schema16_testCrypto() throws Exception {
569509
Version version = Version.VERSION_16;

0 commit comments

Comments
 (0)