Skip to content

Commit

Permalink
switch to error-prone annotations to replace LGPL dependency (#50)
Browse files Browse the repository at this point in the history 
declare annotations as provided & use requires static

Signed-off-by: Sebastian Hoß <[email protected]>
  • Loading branch information
@sebhoss
sebhoss authored Nov 8, 2023
1 parent 9107af5 commit ab35654
Show file tree
Hide file tree
Showing 25 changed files with 32 additions and 28 deletions.
8 changes: 6 additions & 2 deletions storage-units-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,18 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>2.23.0</version>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions storage-units-model/src/main/java/module-info.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
@org.jspecify.annotations.NullMarked
module wtf.metio.storageunits.model {

requires org.jetbrains.annotations;
requires com.github.spotbugs.annotations;
requires org.jspecify;
requires static org.jetbrains.annotations;
requires static com.google.errorprone.annotations;
requires static org.jspecify;

exports wtf.metio.storageunits.model;

Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Byte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Exabyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Exbibyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Gibibyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Gigabyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Kibibyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Kilobyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Mebibyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Megabyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Pebibyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Petabyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Qubibyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Quettabyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Robibyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Ronnabyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/StorageUnit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/StorageUnits.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.math.BigInteger;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Tebibyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Terabyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Yobibyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Yottabyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Zebibyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down
2 changes: 1 addition & 1 deletion storage-units-model/src/main/java/wtf/metio/storageunits/model/Zettabyte.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
package wtf.metio.storageunits.model;

import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
import org.jetbrains.annotations.NotNull;

import java.io.Serial;
Expand Down

0 comments on commit ab35654

Please sign in to comment.