Fix tuple compilation errors

xDec0de · Oct 7, 2024 · 917d240 · 917d240
1 parent ca12bbc
commit 917d240
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/shared/src/main/java/net/codersky/mcutils/java/tuple/pair/ImmutablePair.java b/shared/src/main/java/net/codersky/mcutils/java/tuple/pair/ImmutablePair.java
@@ -1,6 +1,6 @@
 package net.codersky.mcutils.java.tuple.pair;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * An implementation of {@link Pair} that doesn't allow the modification

diff --git a/shared/src/main/java/net/codersky/mcutils/java/tuple/pair/MutablePair.java b/shared/src/main/java/net/codersky/mcutils/java/tuple/pair/MutablePair.java
@@ -1,7 +1,7 @@
 package net.codersky.mcutils.java.tuple.pair;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * An implementation of {@link Pair} that allows changing the
@@ -36,7 +36,7 @@ public MutablePair(@Nullable F first, @Nullable S second) {
 		this.second = second;
 	}
 
-	@Nonnull
+	@NotNull
 	@Override
 	public F getFirst() {
 		return first;
@@ -57,7 +57,7 @@ public F setFirst(@Nullable F first) {
 		return (this.first = first);
 	}
 
-	@Nonnull
+	@NotNull
 	@Override
 	public S getSecond() {
 		return second;

diff --git a/shared/src/main/java/net/codersky/mcutils/java/tuple/pair/Pair.java b/shared/src/main/java/net/codersky/mcutils/java/tuple/pair/Pair.java
@@ -1,7 +1,7 @@
 package net.codersky.mcutils.java.tuple.pair;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A class capable of storing two instance of generic
@@ -62,7 +62,7 @@ public interface Pair<F, S> {
 	 * 
 	 * @see #getFirst()
 	 */
-	default boolean isFirstEqual(@Nonnull Pair<F, ?> other) {
+	default boolean isFirstEqual(@NotNull Pair<F, ?> other) {
 		return getFirst() == null ? other.getFirst() == null : getFirst().equals(other.getFirst());
 	}
 
@@ -82,7 +82,7 @@ default boolean isFirstEqual(@Nonnull Pair<F, ?> other) {
 	 * 
 	 * @see #getSecond()
 	 */
-	default boolean isSecondEqual(@Nonnull Pair<?, S> other) {
+	default boolean isSecondEqual(@NotNull Pair<?, S> other) {
 		return getSecond() == null ? other.getSecond() == null : getSecond().equals(other.getSecond());
 	}
 }
diff --git a/shared/src/main/java/net/codersky/mcutils/java/tuple/pair/SafeImmutablePair.java b/shared/src/main/java/net/codersky/mcutils/java/tuple/pair/SafeImmutablePair.java
@@ -1,6 +1,6 @@
 package net.codersky.mcutils.java.tuple.pair;
 
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;
 
@@ -32,7 +32,7 @@ public class SafeImmutablePair<F, S> extends ImmutablePair<F, S> implements Safe
 	 *
 	 * @since MCUtils 1.0.0
 	 */
-	public SafeImmutablePair(@Nonnull F first, @Nonnull S second) {
+	public SafeImmutablePair(@NotNull F first, @NotNull S second) {
 		super(Objects.requireNonNull(first), Objects.requireNonNull(second));
 	}
 
@@ -47,7 +47,7 @@ public SafeImmutablePair(@Nonnull F first, @Nonnull S second) {
 	 *
 	 * @since MCUtils 1.0.0
 	 */
-	@Nonnull
+	@NotNull
 	@Override
 	@SuppressWarnings("DataFlowIssue")
 	public F getFirst() {
@@ -63,7 +63,7 @@ public F getFirst() {
 	 *
 	 * @since MCUtils 1.0.0
 	 */
-	@Nonnull
+	@NotNull
 	@Override
 	@SuppressWarnings("DataFlowIssue")
 	public S getSecond() {

diff --git a/shared/src/main/java/net/codersky/mcutils/java/tuple/pair/SafeMutablePair.java b/shared/src/main/java/net/codersky/mcutils/java/tuple/pair/SafeMutablePair.java
@@ -1,7 +1,7 @@
 package net.codersky.mcutils.java.tuple.pair;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 
@@ -33,7 +33,7 @@ public class SafeMutablePair<F, S> extends MutablePair<F, S> implements SafePair
 	 *
 	 * @since MCUtils 1.0.0
 	 */
-	public SafeMutablePair(@Nonnull F first, @Nonnull S second) {
+	public SafeMutablePair(@NotNull F first, @NotNull S second) {
 		super(Objects.requireNonNull(first), Objects.requireNonNull(second));
 	}
 
@@ -48,7 +48,7 @@ public SafeMutablePair(@Nonnull F first, @Nonnull S second) {
 	 *
 	 * @since MCUtils 1.0.0
 	 */
-	@Nonnull
+	@NotNull
 	@Override
 	@SuppressWarnings("DataFlowIssue")
 	public F getFirst() {
@@ -68,7 +68,7 @@ public F getFirst() {
 	 * @since MCUtils 1.0.0
 	 */
 	@Nullable
-	public F setFirst(@Nonnull F first) {
+	public F setFirst(@NotNull F first) {
 		return super.setFirst(Objects.requireNonNull(first));
 	}
 
@@ -81,7 +81,7 @@ public F setFirst(@Nonnull F first) {
 	 *
 	 * @since MCUtils 1.0.0
 	 */
-	@Nonnull
+	@NotNull
 	@Override
 	@SuppressWarnings("DataFlowIssue")
 	public S getSecond() {

diff --git a/shared/src/main/java/net/codersky/mcutils/java/tuple/pair/SafePair.java b/shared/src/main/java/net/codersky/mcutils/java/tuple/pair/SafePair.java
@@ -1,6 +1,6 @@
 package net.codersky.mcutils.java.tuple.pair;
 
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * An extension of the {@link Pair} interface that requires
@@ -28,7 +28,7 @@ public interface SafePair<F, S> extends Pair<F, S> {
 	 * 
 	 * @since MCUtils 1.0.0
 	 */
-	@Nonnull
+	@NotNull
 	F getFirst();
 
 	/**
@@ -40,6 +40,6 @@ public interface SafePair<F, S> extends Pair<F, S> {
 	 * 
 	 * @since MCUtils 1.0.0
 	 */
-	@Nonnull
+	@NotNull
 	S getSecond();
 }