Skip to content

Commit 2565fff

Browse files
goneallgoneall
committed
Add prefix to inflate API
Signed-off-by: Gary O'Neall <gary@sourceauditor.com>
1 parent 3f1e896 commit 2565fff

7 files changed

Lines changed: 34 additions & 32 deletions

File tree

‎src/main/java/org/spdx/spdxRdfStore/RdfSpdxModelManager.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
import org.spdx.core.TypedValue;
7575
import org.spdx.library.ListedLicenses;
7676
import org.spdx.library.model.v2.SpdxConstantsCompatV2;
77-
import org.spdx.library.model.v2.SpdxModelFactory;
77+
import org.spdx.library.model.v2.SpdxModelFactoryCompatV2;
7878
import org.spdx.library.model.v3.SpdxEnumFactory;
7979
import org.spdx.library.referencetype.ListedReferenceTypes;
8080
import org.spdx.storage.IModelStore.IdType;
@@ -1080,7 +1080,7 @@ private boolean isAssignableTo(String id, String propertyName, Class<?> clazz) t
10801080
idClass.getURI(), property.getURI());
10811081
if (!classUriRestrictions.isEmpty()) {
10821082
for (String classUriRestriction:classUriRestrictions) {
1083-
if (!clazz.isAssignableFrom(SpdxModelFactory.classUriToClass(classUriRestriction))) {
1083+
if (!clazz.isAssignableFrom(SpdxModelFactoryCompatV2.classUriToClass(classUriRestriction))) {
10841084
return false;
10851085
}
10861086
}
@@ -1152,7 +1152,7 @@ public boolean isCollectionMembersAssignableTo(String id, String propertyName, C
11521152
if (value.isPresent() && !clazz.isAssignableFrom(value.get().getClass())) {
11531153
if (value.get() instanceof TypedValue) {
11541154
try {
1155-
if (!clazz.isAssignableFrom(SpdxModelFactory.typeToClass(((TypedValue)value.get()).getType()))) {
1155+
if (!clazz.isAssignableFrom(SpdxModelFactoryCompatV2.typeToClass(((TypedValue)value.get()).getType()))) {
11561156
return false;
11571157
}
11581158
} catch (InvalidSPDXAnalysisException e) {
@@ -1216,7 +1216,7 @@ public boolean isPropertyValueAssignableTo(String id, String propertyName, Class
12161216
}
12171217
if (objectValue.get() instanceof TypedValue) {
12181218
try {
1219-
return clazz.isAssignableFrom(SpdxModelFactory.typeToClass(((TypedValue)objectValue.get()).getType()));
1219+
return clazz.isAssignableFrom(SpdxModelFactoryCompatV2.typeToClass(((TypedValue)objectValue.get()).getType()));
12201220
} catch (InvalidSPDXAnalysisException e) {
12211221
logger.error("Error converting typed value to class",e);
12221222
return false;
@@ -1342,11 +1342,11 @@ public Optional<TypedValue> getTypedValue(String id) throws InvalidSPDXAnalysisE
13421342
if (Objects.isNull(idClass)) {
13431343
return Optional.empty();
13441344
}
1345-
Class<?> clazz = SpdxModelFactory.classUriToClass(idClass.getURI());
1345+
Class<?> clazz = SpdxModelFactoryCompatV2.classUriToClass(idClass.getURI());
13461346
if (Objects.isNull(clazz)) {
13471347
return Optional.empty();
13481348
}
1349-
String type = SpdxModelFactory.SPDX_CLASS_TO_TYPE.get(clazz);
1349+
String type = SpdxModelFactoryCompatV2.SPDX_CLASS_TO_TYPE.get(clazz);
13501350
if (Objects.isNull(type)) {
13511351
return Optional.empty();
13521352
}

‎src/test/java/org/spdx/library/model/compat/v2/ExternalDocumentRefTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.spdx.library.model.v2.GenericModelObject;
3131
import org.spdx.library.model.v2.SpdxConstantsCompatV2;
3232
import org.spdx.library.model.v2.SpdxDocument;
33-
import org.spdx.library.model.v2.SpdxModelFactory;
33+
import org.spdx.library.model.v2.SpdxModelFactoryCompatV2;
3434
import org.spdx.library.model.v2.SpdxModelInfoV2_X;
3535
import org.spdx.library.model.v2.Version;
3636
import org.spdx.library.model.v2.enumerations.ChecksumAlgorithm;
@@ -177,7 +177,7 @@ public void testCompareTo() throws InvalidSPDXAnalysisException {
177177

178178
public void testGetExternalDocRefByDocNamespace() throws InvalidSPDXAnalysisException {
179179
// need a document to tie the external refs to
180-
SpdxModelFactory.createModelObjectV2(gmo.getModelStore(), gmo.getDocumentUri(),
180+
SpdxModelFactoryCompatV2.createModelObjectV2(gmo.getModelStore(), gmo.getDocumentUri(),
181181
SpdxConstantsCompatV2.SPDX_DOCUMENT_ID, SpdxConstantsCompatV2.CLASS_SPDX_DOCUMENT, gmo.getCopyManager());
182182
// test empty
183183
Optional<ExternalDocumentRef> result = ExternalDocumentRef.getExternalDocRefByDocNamespace(gmo.getModelStore(), gmo.getDocumentUri(),

‎src/test/java/org/spdx/library/model/compat/v2/RelationshipTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.spdx.library.model.v2.SpdxDocument;
4141
import org.spdx.library.model.v2.SpdxElement;
4242
import org.spdx.library.model.v2.SpdxFile;
43-
import org.spdx.library.model.v2.SpdxModelFactory;
43+
import org.spdx.library.model.v2.SpdxModelFactoryCompatV2;
4444
import org.spdx.library.model.v2.SpdxModelInfoV2_X;
4545
import org.spdx.library.model.v2.SpdxPackage;
4646
import org.spdx.library.model.v2.Version;
@@ -237,7 +237,7 @@ public void testDocumentDescribes() throws InvalidSPDXAnalysisException {
237237
String documentUri = "https://someuri";
238238
IModelCopyManager copyManager = new ModelCopyManager();
239239
IModelStore modelStore = new RdfStore(documentUri);
240-
SpdxDocument document = SpdxModelFactory.createSpdxDocumentV2(modelStore, documentUri, copyManager);
240+
SpdxDocument document = SpdxModelFactoryCompatV2.createSpdxDocumentV2(modelStore, documentUri, copyManager);
241241
document.setSpecVersion(Version.TWO_POINT_THREE_VERSION);
242242
document.setName("SPDX-tool-test");
243243
Checksum sha1Checksum = Checksum.create(modelStore, documentUri, ChecksumAlgorithm.SHA1, "d6a770ba38583ed4bb4525bd96e50461655d2758");

‎src/test/java/org/spdx/library/model/compat/v2/SpdxDocumentTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.spdx.library.model.v2.SpdxElement;
4040
import org.spdx.library.model.v2.SpdxFile;
4141
import org.spdx.library.model.v2.SpdxItem;
42-
import org.spdx.library.model.v2.SpdxModelFactory;
42+
import org.spdx.library.model.v2.SpdxModelFactoryCompatV2;
4343
import org.spdx.library.model.v2.SpdxModelInfoV2_X;
4444
import org.spdx.library.model.v2.SpdxPackage;
4545
import org.spdx.library.model.v2.Version;
@@ -256,13 +256,13 @@ private boolean collectionsSame(Collection<? extends Object> c1, Collection<? ex
256256
* Per 1309, if no creation info is available in the model, we'll assign a creation date, as one is mandatory.
257257
*/
258258
public void testDefaultCreationInfo() throws InvalidSPDXAnalysisException {
259-
SpdxDocument doc = SpdxModelFactory.createSpdxDocumentV2(gmo.getModelStore(), gmo.getDocumentUri(), gmo.getCopyManager());
259+
SpdxDocument doc = SpdxModelFactoryCompatV2.createSpdxDocumentV2(gmo.getModelStore(), gmo.getDocumentUri(), gmo.getCopyManager());
260260
assertNotNull(doc.getCreationInfo());
261261
assertTrue("Mandatory creation date missing from new SPDX Document.", !doc.getCreationInfo().getCreated().isEmpty());
262262
}
263263

264264
public void testEquivalent() throws InvalidSPDXAnalysisException {
265-
SpdxDocument doc = SpdxModelFactory.createSpdxDocumentV2(gmo.getModelStore(), gmo.getDocumentUri(), gmo.getCopyManager());
265+
SpdxDocument doc = SpdxModelFactoryCompatV2.createSpdxDocumentV2(gmo.getModelStore(), gmo.getDocumentUri(), gmo.getCopyManager());
266266
doc.setStrict(false);
267267
List<Annotation> annotations = Arrays.asList(new Annotation[] {
268268
ANNOTATION1, ANNOTATION2
@@ -306,7 +306,7 @@ public void testEquivalent() throws InvalidSPDXAnalysisException {
306306

307307
String doc2Uri = "http://spdx.org/spdx/2ndoc/2342";
308308
RdfStore store2 = new RdfStore(doc2Uri);
309-
SpdxDocument doc2 = SpdxModelFactory.createSpdxDocumentV2(store2, doc2Uri, gmo.getCopyManager());
309+
SpdxDocument doc2 = SpdxModelFactoryCompatV2.createSpdxDocumentV2(store2, doc2Uri, gmo.getCopyManager());
310310
doc2.setStrict(false);
311311
doc2.setAnnotations(annotations);
312312
doc2.setComment(DOC_COMMENT1);

‎src/test/java/org/spdx/library/model/compat/v2/SpdxModelFactoryTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.spdx.library.model.v2.ModelObjectV2;
1414
import org.spdx.library.model.v2.SpdxConstantsCompatV2;
1515
import org.spdx.library.model.v2.SpdxDocument;
16-
import org.spdx.library.model.v2.SpdxModelFactory;
16+
import org.spdx.library.model.v2.SpdxModelFactoryCompatV2;
1717
import org.spdx.library.model.v2.SpdxModelInfoV2_X;
1818
import org.spdx.library.model.v3.SpdxModelInfoV3_0;
1919
import org.spdx.spdxRdfStore.RdfStore;
@@ -45,28 +45,28 @@ protected void tearDown() throws Exception {
4545
}
4646

4747
public void testCreateSpdxDocumentV2() throws InvalidSPDXAnalysisException {
48-
SpdxDocument result = SpdxModelFactory.createSpdxDocumentV2(modelStore, DOCUMENT_URI, copyManager);
48+
SpdxDocument result = SpdxModelFactoryCompatV2.createSpdxDocumentV2(modelStore, DOCUMENT_URI, copyManager);
4949
assertEquals(SpdxConstantsCompatV2.SPDX_DOCUMENT_ID, result.getId());
5050
}
5151

5252
public void testCreateModelObjectV2() throws InvalidSPDXAnalysisException {
53-
ModelObjectV2 result = SpdxModelFactory.createModelObjectV2(modelStore, DOCUMENT_URI, ID1,
53+
ModelObjectV2 result = SpdxModelFactoryCompatV2.createModelObjectV2(modelStore, DOCUMENT_URI, ID1,
5454
SpdxConstantsCompatV2.CLASS_SPDX_CHECKSUM, copyManager);
5555
assertTrue(result instanceof Checksum);
5656
assertEquals(ID1, result.getId());
5757
}
5858

5959
public void testGetModelObjectIModelStoreStringStringStringModelCopyManagerBooleanV2() throws InvalidSPDXAnalysisException {
60-
ModelObjectV2 result = SpdxModelFactory.getModelObjectV2(modelStore, DOCUMENT_URI, ID1,
60+
ModelObjectV2 result = SpdxModelFactoryCompatV2.getModelObjectV2(modelStore, DOCUMENT_URI, ID1,
6161
SpdxConstantsCompatV2.CLASS_SPDX_CHECKSUM, copyManager, true);
6262
assertTrue(result instanceof Checksum);
6363
assertEquals(ID1, result.getId());
64-
ModelObjectV2 result2 = SpdxModelFactory.getModelObjectV2(modelStore, DOCUMENT_URI, ID1,
64+
ModelObjectV2 result2 = SpdxModelFactoryCompatV2.getModelObjectV2(modelStore, DOCUMENT_URI, ID1,
6565
SpdxConstantsCompatV2.CLASS_SPDX_CHECKSUM, copyManager, false);
6666
assertTrue(result2 instanceof Checksum);
6767
assertEquals(ID1, result2.getId());
6868
try {
69-
result = SpdxModelFactory.getModelObjectV2(modelStore, DOCUMENT_URI, ID2,
69+
result = SpdxModelFactoryCompatV2.getModelObjectV2(modelStore, DOCUMENT_URI, ID2,
7070
SpdxConstantsCompatV2.CLASS_SPDX_CHECKSUM, copyManager, false);
7171
fail("Expected objectUri not found exception");
7272
} catch(SpdxIdNotFoundException ex) {
@@ -75,15 +75,15 @@ public void testGetModelObjectIModelStoreStringStringStringModelCopyManagerBoole
7575
}
7676

7777
public void testGetModelObjectIModelStoreStringStringModelCopyManagerV2() throws InvalidSPDXAnalysisException {
78-
ModelObjectV2 result = SpdxModelFactory.getModelObjectV2(modelStore, DOCUMENT_URI, ID1,
78+
ModelObjectV2 result = SpdxModelFactoryCompatV2.getModelObjectV2(modelStore, DOCUMENT_URI, ID1,
7979
SpdxConstantsCompatV2.CLASS_SPDX_CHECKSUM, copyManager, true);
8080
assertTrue(result instanceof Checksum);
8181
assertEquals(ID1, result.getId());
82-
Optional<ModelObjectV2> result2 = SpdxModelFactory.getModelObjectV2(modelStore, DOCUMENT_URI, ID1, copyManager);
82+
Optional<ModelObjectV2> result2 = SpdxModelFactoryCompatV2.getModelObjectV2(modelStore, DOCUMENT_URI, ID1, copyManager);
8383
assertTrue(result2.isPresent());
8484
assertTrue(result2.get() instanceof Checksum);
8585
assertEquals(ID1, result2.get().getId());
86-
result2 = SpdxModelFactory.getModelObjectV2(modelStore, DOCUMENT_URI, ID2, copyManager);
86+
result2 = SpdxModelFactoryCompatV2.getModelObjectV2(modelStore, DOCUMENT_URI, ID2, copyManager);
8787
assertFalse(result2.isPresent());
8888
}
8989

‎src/test/java/org/spdx/library/model/compat/v2/SpdxModelInfoV2_XTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ public void testUriToIndividual() {
107107
@Test
108108
public void testCreateModelObject() throws InvalidSPDXAnalysisException {
109109
String objectUri = "http://defaultdocument#" + SpdxConstantsCompatV2.SPDX_ELEMENT_REF_PRENUM + "test";
110-
CoreModelObject result = modelInfo.createModelObject(modelStore, objectUri, SpdxConstantsCompatV2.CLASS_SPDX_PACKAGE, copyManager, Version.TWO_POINT_THREE_VERSION, true);
110+
CoreModelObject result = modelInfo.createModelObject(modelStore, objectUri,
111+
SpdxConstantsCompatV2.CLASS_SPDX_PACKAGE, copyManager, Version.TWO_POINT_THREE_VERSION,
112+
true, null);
111113
assertTrue(result instanceof SpdxPackage);
112114
assertEquals(objectUri, result.getObjectUri());
113115
}

‎src/test/java/org/spdx/spdxRdfStore/RdfStoreTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.spdx.library.model.v2.SpdxDocument;
2727
import org.spdx.library.model.v2.SpdxElement;
2828
import org.spdx.library.model.v2.SpdxFile;
29-
import org.spdx.library.model.v2.SpdxModelFactory;
29+
import org.spdx.library.model.v2.SpdxModelFactoryCompatV2;
3030
import org.spdx.library.model.v2.SpdxModelInfoV2_X;
3131
import org.spdx.library.model.v2.SpdxPackage;
3232
import org.spdx.library.model.v2.enumerations.RelationshipType;
@@ -93,10 +93,10 @@ public void testClose() throws Exception {
9393
*/
9494
public void testGetAllItems() throws InvalidSPDXAnalysisException {
9595
RdfStore rdfStore = new RdfStore(DOCUMENT_URI1);
96-
SpdxModelFactory.createModelObjectV2(rdfStore, DOCUMENT_URI1, SpdxConstantsCompatV2.SPDX_DOCUMENT_ID, SpdxConstantsCompatV2.CLASS_SPDX_DOCUMENT, null);
97-
SpdxModelFactory.createModelObjectV2(rdfStore, DOCUMENT_URI1, ID_2, SpdxConstantsCompatV2.CLASS_SPDX_FILE, null);
98-
SpdxModelFactory.createModelObjectV2(rdfStore, DOCUMENT_URI1, ID_3, SpdxConstantsCompatV2.CLASS_SPDX_FILE, null);
99-
SpdxModelFactory.createModelObjectV2(rdfStore, DOCUMENT_URI1, ID_4, SpdxConstantsCompatV2.CLASS_SPDX_FILE, null);
96+
SpdxModelFactoryCompatV2.createModelObjectV2(rdfStore, DOCUMENT_URI1, SpdxConstantsCompatV2.SPDX_DOCUMENT_ID, SpdxConstantsCompatV2.CLASS_SPDX_DOCUMENT, null);
97+
SpdxModelFactoryCompatV2.createModelObjectV2(rdfStore, DOCUMENT_URI1, ID_2, SpdxConstantsCompatV2.CLASS_SPDX_FILE, null);
98+
SpdxModelFactoryCompatV2.createModelObjectV2(rdfStore, DOCUMENT_URI1, ID_3, SpdxConstantsCompatV2.CLASS_SPDX_FILE, null);
99+
SpdxModelFactoryCompatV2.createModelObjectV2(rdfStore, DOCUMENT_URI1, ID_4, SpdxConstantsCompatV2.CLASS_SPDX_FILE, null);
100100
try (Stream<TypedValue> result = rdfStore.getAllItems(DOCUMENT_URI1, SpdxConstantsCompatV2.CLASS_SPDX_FILE)) {
101101
final ArrayList<TypedValue> resultList = new ArrayList<>();
102102
resultList.add(new TypedValue(DOCUMENT_URI1 + "#" + ID_2, SpdxConstantsCompatV2.CLASS_SPDX_FILE, CompatibleModelStoreWrapper.LATEST_SPDX_2X_VERSION));
@@ -127,7 +127,7 @@ public void testInconsistentLicenseUri() throws InvalidSPDXAnalysisException, IO
127127

128128
public void testDelete() throws InvalidSPDXAnalysisException {
129129
RdfStore rdfStore = new RdfStore(DOCUMENT_URI1);
130-
SpdxModelFactory.createModelObjectV2(rdfStore, DOCUMENT_URI1, SpdxConstantsCompatV2.SPDX_DOCUMENT_ID, SpdxConstantsCompatV2.CLASS_SPDX_DOCUMENT, null);
130+
SpdxModelFactoryCompatV2.createModelObjectV2(rdfStore, DOCUMENT_URI1, SpdxConstantsCompatV2.SPDX_DOCUMENT_ID, SpdxConstantsCompatV2.CLASS_SPDX_DOCUMENT, null);
131131
assertTrue(rdfStore.exists(DOCUMENT_URI1 + "#" + SpdxConstantsCompatV2.SPDX_DOCUMENT_ID));
132132
rdfStore.delete(DOCUMENT_URI1 + "#" + SpdxConstantsCompatV2.SPDX_DOCUMENT_ID);
133133
assertFalse(rdfStore.exists(DOCUMENT_URI1 + "#" + SpdxConstantsCompatV2.SPDX_DOCUMENT_ID));
@@ -193,7 +193,7 @@ public void testHandleHasFile() throws InvalidSPDXAnalysisException, IOException
193193
ResultSet result = qe.execSelect();
194194
assertFalse(result.hasNext());
195195
}
196-
SpdxPackage pkg = (SpdxPackage)SpdxModelFactory.getModelObjectV2(rdfStore, documentUri, "SPDXRef-Package", SpdxConstantsCompatV2.CLASS_SPDX_PACKAGE, null, false);
196+
SpdxPackage pkg = (SpdxPackage)SpdxModelFactoryCompatV2.getModelObjectV2(rdfStore, documentUri, "SPDXRef-Package", SpdxConstantsCompatV2.CLASS_SPDX_PACKAGE, null, false);
197197
boolean found = false;
198198
for (Relationship relationship:pkg.getRelationships()) {
199199
if (RelationshipType.CONTAINS.equals(relationship.getRelationshipType()) &&
@@ -215,7 +215,7 @@ public void testDuplicateHasFiles() throws InvalidSPDXAnalysisException, IOExcep
215215
ResultSet result = qe.execSelect();
216216
assertFalse(result.hasNext());
217217
}
218-
SpdxPackage pkg = (SpdxPackage)SpdxModelFactory.getModelObjectV2(rdfStore, documentUri, "SPDXRef-Package", SpdxConstantsCompatV2.CLASS_SPDX_PACKAGE, null, false);
218+
SpdxPackage pkg = (SpdxPackage)SpdxModelFactoryCompatV2.getModelObjectV2(rdfStore, documentUri, "SPDXRef-Package", SpdxConstantsCompatV2.CLASS_SPDX_PACKAGE, null, false);
219219
boolean found = false;
220220
for (Relationship relationship:pkg.getRelationships()) {
221221
if (RelationshipType.CONTAINS.equals(relationship.getRelationshipType()) &&

0 commit comments

Comments
 (0)