From 16f883ee96b76ef87ce27f283f9ab5f2ba515ecf Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Thu, 17 Sep 2020 12:27:46 -0700 Subject: [PATCH] Fix compile warnings Signed-off-by: Gary O'Neall --- .../java/org/spdx/library/model/ModelObject.java | 4 ++-- .../model/ModelStorageClassConverterTest.java | 4 ++-- .../model/license/SpdxListedLicenseTest.java | 1 + .../storage/listedlicense/LicenseJsonTest.java | 3 --- .../SpdxListedLicenseWebStoreTest.java | 9 +++++---- .../spdx/storage/simple/InMemSpdxStoreTest.java | 2 ++ .../spdx/utility/compare/SpdxComparerTest.java | 16 ++++++++-------- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/spdx/library/model/ModelObject.java b/src/main/java/org/spdx/library/model/ModelObject.java index 9a59c83ca..878edb647 100644 --- a/src/main/java/org/spdx/library/model/ModelObject.java +++ b/src/main/java/org/spdx/library/model/ModelObject.java @@ -406,9 +406,9 @@ protected Optional getBooleanPropertyValue(String propertyName) throws // try to convert String sResult = ((String)result.get()).toLowerCase(); if ("true".equals(sResult)) { - return Optional.of(new Boolean(true)); + return Optional.of(Boolean.valueOf(true)); } else if ("false".equals(sResult)) { - return Optional.of(new Boolean(false)); + return Optional.of(Boolean.valueOf(false)); } else { throw new SpdxInvalidTypeException("Property "+propertyName+" is not of type Boolean"); } diff --git a/src/test/java/org/spdx/library/model/ModelStorageClassConverterTest.java b/src/test/java/org/spdx/library/model/ModelStorageClassConverterTest.java index 03537bb4a..d419efa6b 100644 --- a/src/test/java/org/spdx/library/model/ModelStorageClassConverterTest.java +++ b/src/test/java/org/spdx/library/model/ModelStorageClassConverterTest.java @@ -49,7 +49,7 @@ public void testStoredObjectToModelObject() throws InvalidSPDXAnalysisException new SpdxDocument(gmo.getModelStore(), gmo.getDocumentUri(), gmo.getCopyManager(), true); String externalDocUri = "http://externalDoc"; Checksum checksum = gmo.createChecksum(ChecksumAlgorithm.SHA1, "A94A8FE5CCB19BA61C4C0873D391E987982FBBD3"); - ExternalDocumentRef ref = gmo.createExternalDocumentRef(gmo.getModelStore().getNextId(IdType.DocumentRef, gmo.getDocumentUri()), + gmo.createExternalDocumentRef(gmo.getModelStore().getNextId(IdType.DocumentRef, gmo.getDocumentUri()), externalDocUri, checksum); String externalDocElementId = SpdxConstants.SPDX_ELEMENT_REF_PRENUM + "11"; String externalRefUri = externalDocUri + "#" + externalDocElementId; @@ -97,7 +97,7 @@ public void testOptionalStoredObjectToModelObject() throws InvalidSPDXAnalysisEx new SpdxDocument(gmo.getModelStore(), gmo.getDocumentUri(), gmo.getCopyManager(), true); String externalDocUri = "http://externalDoc"; Checksum checksum = gmo.createChecksum(ChecksumAlgorithm.SHA1, "A94A8FE5CCB19BA61C4C0873D391E987982FBBD3"); - ExternalDocumentRef ref = gmo.createExternalDocumentRef(gmo.getModelStore().getNextId(IdType.DocumentRef, gmo.getDocumentUri()), + gmo.createExternalDocumentRef(gmo.getModelStore().getNextId(IdType.DocumentRef, gmo.getDocumentUri()), externalDocUri, checksum); String externalDocElementId = SpdxConstants.SPDX_ELEMENT_REF_PRENUM + "11"; String externalRefUri = externalDocUri + "#" + externalDocElementId; diff --git a/src/test/java/org/spdx/library/model/license/SpdxListedLicenseTest.java b/src/test/java/org/spdx/library/model/license/SpdxListedLicenseTest.java index 1fc7f06a8..acd342682 100644 --- a/src/test/java/org/spdx/library/model/license/SpdxListedLicenseTest.java +++ b/src/test/java/org/spdx/library/model/license/SpdxListedLicenseTest.java @@ -344,6 +344,7 @@ public void testSetHeaderTemplateHtml() throws InvalidSPDXAnalysisException, Inv SpdxListedLicense stdl = new SpdxListedLicense(name, id, text, sourceUrls, notes, standardLicenseHeader, template, false, true, textHtml, false, null); + stdl.setStandardLicenseHeaderTemplate(standardLicenseHeaderTemplate); stdl.setLicenseHeaderHtml(standardLicenseHeaderHtml); assertEquals(textHtml, stdl.getLicenseTextHtml()); assertEquals(standardLicenseHeaderHtml, stdl.getLicenseHeaderHtml()); diff --git a/src/test/java/org/spdx/storage/listedlicense/LicenseJsonTest.java b/src/test/java/org/spdx/storage/listedlicense/LicenseJsonTest.java index 0193fc9a9..7ad119a4e 100644 --- a/src/test/java/org/spdx/storage/listedlicense/LicenseJsonTest.java +++ b/src/test/java/org/spdx/storage/listedlicense/LicenseJsonTest.java @@ -137,7 +137,6 @@ public void testGetSetPrimativeValue() throws InvalidSpdxPropertyException { * Test method for {@link org.spdx.storage.listedlicense.LicenseJson#clearPropertyValueList(java.lang.String)}. * @throws InvalidSpdxPropertyException */ - @SuppressWarnings("unchecked") public void testAddClearGetPropertyValueList() throws InvalidSpdxPropertyException { String licenseId = "SpdxLicenseId1"; LicenseJson lj = new LicenseJson(licenseId); @@ -195,7 +194,6 @@ public void testJson() throws Exception { for (String valueName:BOOLEAN_PROPERTY_VALUE_NAMES) { assertEquals(booleanValues.get(valueName), lj.getValue(valueName)); } - @SuppressWarnings("unchecked") List seeAlsoResult = (List)lj.getValueList("seeAlso"); assertEquals(seeAlsoValues.size(), seeAlsoResult.size()); for (String seeAlsoValue:seeAlsoValues) { @@ -246,7 +244,6 @@ public void testLegacyJson() throws Exception { for (String valueName:BOOLEAN_PROPERTY_VALUE_NAMES) { assertEquals(booleanValues.get(valueName), lj.getValue(valueName)); } - @SuppressWarnings("unchecked") List seeAlsoResult = (List)lj.getValueList("seeAlso"); assertEquals(seeAlsoValues.size(), seeAlsoResult.size()); for (String seeAlsoValue:seeAlsoValues) { diff --git a/src/test/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStoreTest.java b/src/test/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStoreTest.java index 37d9a64c2..f03a0870d 100644 --- a/src/test/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStoreTest.java +++ b/src/test/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStoreTest.java @@ -183,7 +183,7 @@ public void testCreateLicense() throws InvalidSPDXAnalysisException, InvalidLice String licenseText = result.getLicenseText(); assertTrue(licenseText.length() > 100); assertTrue(result.getComment().length() > 5); - String sResult = result.getDeprecatedVersion(); + result.getDeprecatedVersion(); assertEquals(LICENSE_LIST_URI, result.getDocumentUri()); assertTrue(result.getFsfLibre()); assertFalse(result.isDeprecated()); @@ -200,16 +200,17 @@ public void testCreateLicense() throws InvalidSPDXAnalysisException, InvalidLice assertEquals(SpdxConstants.CLASS_SPDX_LISTED_LICENSE, (result.getType())); } + @SuppressWarnings("deprecation") public void testCreateException() throws InvalidSPDXAnalysisException, InvalidLicenseTemplateException { SpdxListedLicenseWebStore sllw = new SpdxListedLicenseWebStore(); LicenseException result = (LicenseException)SpdxModelFactory.createModelObject(sllw, LICENSE_LIST_URI, ECOS_EXCEPTION_ID, SpdxConstants.CLASS_SPDX_LICENSE_EXCEPTION, null); assertEquals(ECOS_EXCEPTION_ID, result.getLicenseExceptionId()); assertEquals(ECOS_EXCEPTION_ID, result.getId()); assertTrue(result.getComment().length() > 5); - String sResult = result.getDeprecatedVersion(); + result.getDeprecatedVersion(); assertEquals(LICENSE_LIST_URI, result.getDocumentUri()); - sResult = result.getExample(); - sResult = result.getLicenseExceptionTemplate(); + result.getExample(); + result.getLicenseExceptionTemplate(); assertTrue(result.getLicenseExceptionText().length() > 100); assertEquals(ECOS_LICENSE_NAME, result.getName()); List lResult = new ArrayList(result.getSeeAlso()); diff --git a/src/test/java/org/spdx/storage/simple/InMemSpdxStoreTest.java b/src/test/java/org/spdx/storage/simple/InMemSpdxStoreTest.java index f757c77ed..73eea3b1f 100644 --- a/src/test/java/org/spdx/storage/simple/InMemSpdxStoreTest.java +++ b/src/test/java/org/spdx/storage/simple/InMemSpdxStoreTest.java @@ -395,6 +395,7 @@ public void testLock() throws InvalidSPDXAnalysisException, IOException, Interru * step4: thread2 completes the write transaction, both threads verify value updated */ final Waiter waiter = new Waiter(); + @SuppressWarnings("unused") final Thread thread1 = new Thread(null, null, "Thread1") { @Override public void run() { @@ -439,6 +440,7 @@ public void run() { } }; + @SuppressWarnings("unused") final Thread thread2 = new Thread(null ,null, "thread2") { @Override public void run() { diff --git a/src/test/java/org/spdx/utility/compare/SpdxComparerTest.java b/src/test/java/org/spdx/utility/compare/SpdxComparerTest.java index 594f922a3..8b9bc1049 100644 --- a/src/test/java/org/spdx/utility/compare/SpdxComparerTest.java +++ b/src/test/java/org/spdx/utility/compare/SpdxComparerTest.java @@ -131,21 +131,21 @@ public class SpdxComparerTest extends TestCase { LICENSE_XLATION_MAP.put("LicenseRef-3", "LicenseRef-6"); } - Integer OFFSET1_1 = new Integer(2342); + Integer OFFSET1_1 = Integer.valueOf(2342); ByteOffsetPointer BOP_POINTER1_1; - Integer LINE1_1 = new Integer(113); + Integer LINE1_1 = Integer.valueOf(113); LineCharPointer LCP_POINTER1_1; - Integer OFFSET2_1 = new Integer(444); + Integer OFFSET2_1 = Integer.valueOf(444); ByteOffsetPointer BOP_POINTER2_1; - Integer LINE2_1 = new Integer(23422); + Integer LINE2_1 = Integer.valueOf(23422); LineCharPointer LCP_POINTER2_1; - Integer OFFSET1_2 = new Integer(3542); + Integer OFFSET1_2 = Integer.valueOf(3542); ByteOffsetPointer BOP_POINTER1_2; - Integer LINE1_2 = new Integer(555); + Integer LINE1_2 = Integer.valueOf(555); LineCharPointer LCP_POINTER1_2; - Integer OFFSET2_2 = new Integer(2444); + Integer OFFSET2_2 = Integer.valueOf(2444); ByteOffsetPointer BOP_POINTER2_2; - Integer LINE2_2 = new Integer(23428); + Integer LINE2_2 = Integer.valueOf(23428); private ExtractedLicenseInfo LICENSEA1; private ExtractedLicenseInfo LICENSEA2;