Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,6 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>doclint-java8-disable</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<properties>
<javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
</profile>
<profile>
<id>release</id>
<build>
Expand Down Expand Up @@ -206,14 +197,11 @@
<configuration>
<quiet>true</quiet>
<notimestamp>true</notimestamp>
<additionalOptions>-Xdoclint:none</additionalOptions>
<doclint>all,-missing</doclint>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<goals>
<goal>jar</goal>
</goals>
Expand Down Expand Up @@ -313,4 +301,4 @@
<system>Github Actions</system>
<url>https://github.com/spdx/spdx-java-model-2_X/actions</url>
</ciManagement>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public String toString() {

/**
* @return the text
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public abstract String getExtractedText() throws InvalidSPDXAnalysisException;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public String toString() {
* the members of these "sub-conjunctive license sets" could be direct members and have the same
* meaning.
* @return all members "flattening out" conjunctive license sets which are members of this set
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public List<AnyLicenseInfo> getFlattenedMembers() throws InvalidSPDXAnalysisException {
HashSet<AnyLicenseInfo> retval = new HashSet<>(); // Use a set since any duplicated elements would be still considered equal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public boolean equals(Object o) {
* the members of these "sub-disjunctive license sets" could be direct members and have the same
* meaning.
* @return all members "flattening out" disjunctive license sets which are members of this set
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
protected List<AnyLicenseInfo> getFlattenedMembers() throws InvalidSPDXAnalysisException {
HashSet<AnyLicenseInfo> retval = new HashSet<>(); // Use a set since any duplicated elements would be still considered equal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public String getType() {

/**
* @return the text
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public String getExtractedText() throws InvalidSPDXAnalysisException {
Optional<String> o = getStringPropertyValue(SpdxConstantsCompatV2.PROP_EXTRACTED_TEXT);
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/org/spdx/library/model/v2/license/License.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public License(String id) throws InvalidSPDXAnalysisException {

/**
* @return the text of the license
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public String getLicenseText() throws InvalidSPDXAnalysisException {
Optional<String> o = getStringPropertyValue(SpdxConstantsCompatV2.PROP_LICENSE_TEXT);
Expand All @@ -97,7 +97,7 @@ public void setLicenseText(String text) throws InvalidSPDXAnalysisException {

/**
* @return the standardLicenseHeader
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public String getStandardLicenseHeader() throws InvalidSPDXAnalysisException {
Optional<String> standardLicenseHeader = getStringPropertyValue(SpdxConstantsCompatV2.PROP_STD_LICENSE_NOTICE);
Expand All @@ -110,7 +110,7 @@ public String getStandardLicenseHeader() throws InvalidSPDXAnalysisException {

/**
* @return standard license header template
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public String getStandardLicenseHeaderTemplate() throws InvalidSPDXAnalysisException {
Optional<String> standardLicenseHeaderTemplate = getStringPropertyValue(SpdxConstantsCompatV2.PROP_STD_LICENSE_HEADER_TEMPLATE);
Expand Down Expand Up @@ -138,7 +138,7 @@ public void setStandardLicenseHeader(String standardLicenseHeader) throws Invali
}
/**
* @return the template
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public String getStandardLicenseTemplate() throws InvalidSPDXAnalysisException {
Optional<String> o = getStringPropertyValue(SpdxConstantsCompatV2.PROP_STD_LICENSE_TEMPLATE);
Expand Down Expand Up @@ -234,7 +234,7 @@ protected List<String> _verify(Set<String> verifiedIds, String specVersion) {

/**
* @return true if FSF describes the license as free / libre, false if FSF describes the license as not free / libre or if FSF does not reference the license
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
* @throws InvalidSPDXAnalysisException
*/
public boolean isFsfLibre() throws InvalidSPDXAnalysisException {
Expand All @@ -247,7 +247,7 @@ public boolean isFsfLibre() throws InvalidSPDXAnalysisException {

/**
* @return true if FSF specified this license as not free/libre, false if it has been specified by the FSF as free / libre or if it has not been specified
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public boolean isNotFsfLibre() throws InvalidSPDXAnalysisException {
Optional<Boolean> fsfLibre = getBooleanPropertyValue(SpdxConstantsCompatV2.PROP_STD_LICENSE_FSF_LIBRE);
Expand All @@ -256,7 +256,7 @@ public boolean isNotFsfLibre() throws InvalidSPDXAnalysisException {

/**
* @return true if FSF describes the license as free / libre, false if FSF describes the license as not free / libre, null if FSF does not reference the license
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public Boolean getFsfLibre() throws InvalidSPDXAnalysisException {
Optional<Boolean> libre = getBooleanPropertyValue(SpdxConstantsCompatV2.PROP_STD_LICENSE_FSF_LIBRE);
Expand All @@ -270,7 +270,7 @@ public Boolean getFsfLibre() throws InvalidSPDXAnalysisException {

/**
* @return true if the license is listed as an approved license on the OSI website
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public boolean isOsiApproved() throws InvalidSPDXAnalysisException {
Optional<Boolean> osiApproved = getBooleanPropertyValue(SpdxConstantsCompatV2.PROP_STD_LICENSE_OSI_APPROVED);
Expand All @@ -279,7 +279,7 @@ public boolean isOsiApproved() throws InvalidSPDXAnalysisException {

/**
* @return true if this license is marked as being deprecated
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public boolean isDeprecated() throws InvalidSPDXAnalysisException {
Optional<Boolean> deprecated = getBooleanPropertyValue(SpdxConstantsCompatV2.PROP_LIC_ID_DEPRECATED);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public void setLicenseExceptionText(String text) throws InvalidSPDXAnalysisExcep

/**
* @return the name
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public String getName() throws InvalidSPDXAnalysisException {
Optional<String> o = getStringPropertyValue(SpdxConstantsCompatV2.PROP_STD_LICENSE_NAME);
Expand All @@ -204,7 +204,7 @@ public void setName(String name) throws InvalidSPDXAnalysisException {

/**
* @return the urls which reference the same license information
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public Collection<String> getSeeAlso() throws InvalidSPDXAnalysisException {
return getStringCollection(SpdxConstantsCompatV2.RDFS_PROP_SEE_ALSO);
Expand All @@ -223,7 +223,7 @@ public void setSeeAlso(Collection<String> seeAlso) throws InvalidSPDXAnalysisExc

/**
* @return true if this license is marked as being deprecated
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public boolean isDeprecated() throws InvalidSPDXAnalysisException {
Optional<Boolean> deprecated = getBooleanPropertyValue(SpdxConstantsCompatV2.PROP_LIC_ID_DEPRECATED);
Expand All @@ -240,7 +240,7 @@ public void setDeprecated(Boolean deprecated) throws InvalidSPDXAnalysisExceptio

/**
* @return the deprecatedVersion
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public String getDeprecatedVersion() throws InvalidSPDXAnalysisException {
Optional<String> o = getStringPropertyValue(SpdxConstantsCompatV2.PROP_LIC_DEPRECATED_VERSION);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public void setMembers(Collection<AnyLicenseInfo> licenseInfos) throws InvalidSP

/**
* @return Members of the license set
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public Collection<AnyLicenseInfo> getMembers() throws InvalidSPDXAnalysisException {
return members;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public String getLicenseId() {

/**
* @return the name
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public String getName() throws InvalidSPDXAnalysisException {
Optional<String> o = getStringPropertyValue(SpdxConstantsCompatV2.PROP_STD_LICENSE_NAME);
Expand All @@ -98,7 +98,7 @@ public void setName(String name) throws InvalidSPDXAnalysisException {

/**
* @return the comments
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public String getComment() throws InvalidSPDXAnalysisException {
Optional<String> o = getStringPropertyValue(SpdxConstantsCompatV2.RDFS_PROP_COMMENT);
Expand All @@ -119,7 +119,7 @@ public void setComment(String comment) throws InvalidSPDXAnalysisException {

/**
* @return the urls which reference the same license information
* @throws SpdxInvalidTypeException
* @throws InvalidSPDXAnalysisException
*/
public Collection<String> getSeeAlso() throws InvalidSPDXAnalysisException {
return getStringCollection(SpdxConstantsCompatV2.RDFS_PROP_SEE_ALSO);
Expand Down
Loading