Skip to content

Commit b35c9c5

Browse files
authored
null safe (#153)
1 parent 4cd238e commit b35c9c5

15 files changed

+19
-36
lines changed

build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ dependencies {
5454
// логирование
5555
implementation("org.slf4j", "slf4j-api", "2.0.16")
5656

57-
// stat analysis
58-
compileOnly("com.github.spotbugs", "spotbugs-annotations", "4.8.6")
57+
implementation("org.jspecify", "jspecify", "1.0.0")
5958

6059
// логирование
6160
testImplementation("org.slf4j", "slf4j-reload4j", "2.0.16")

src/main/java/com/github/_1c_syntax/bsl/support/package-info.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
/**
2323
* Пакет содержит вспомогательные структуры данных для режима поддержки
2424
*/
25-
@ParametersAreNonnullByDefault
26-
@ReturnValuesAreNonnullByDefault
25+
@NullMarked
2726
package com.github._1c_syntax.bsl.support;
2827

29-
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
30-
31-
import javax.annotation.ParametersAreNonnullByDefault;
28+
import org.jspecify.annotations.NullMarked;

src/main/java/com/github/_1c_syntax/bsl/types/MdoReference.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import lombok.EqualsAndHashCode;
2626
import lombok.ToString;
2727
import lombok.Value;
28+
import org.jspecify.annotations.Nullable;
2829

29-
import javax.annotation.Nullable;
3030
import java.util.Map;
3131
import java.util.Optional;
3232
import java.util.concurrent.ConcurrentSkipListMap;

src/main/java/com/github/_1c_syntax/bsl/types/ValueTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import com.github._1c_syntax.bsl.types.value.PrimitiveValueType;
2727
import com.github._1c_syntax.bsl.types.value.V8ValueType;
2828
import lombok.experimental.UtilityClass;
29+
import org.jspecify.annotations.Nullable;
2930

30-
import javax.annotation.Nullable;
3131
import java.util.List;
3232
import java.util.Locale;
3333
import java.util.Map;

src/main/java/com/github/_1c_syntax/bsl/types/package-info.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
/**
2323
* Пакет содержит общие типы данных
2424
*/
25-
@ParametersAreNonnullByDefault
26-
@ReturnValuesAreNonnullByDefault
25+
@NullMarked
2726
package com.github._1c_syntax.bsl.types;
2827

29-
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
30-
31-
import javax.annotation.ParametersAreNonnullByDefault;
28+
import org.jspecify.annotations.NullMarked;

src/main/java/com/github/_1c_syntax/bsl/types/qualifiers/BinaryDataQualifiers.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
import lombok.ToString;
2828
import lombok.Value;
2929
import lombok.experimental.Accessors;
30-
31-
import javax.annotation.Nullable;
30+
import org.jspecify.annotations.Nullable;
3231

3332
@Value
3433
@ToString(of = "description")

src/main/java/com/github/_1c_syntax/bsl/types/qualifiers/DateQualifiers.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
import lombok.ToString;
2828
import lombok.Value;
2929
import lombok.experimental.Accessors;
30-
31-
import javax.annotation.Nullable;
30+
import org.jspecify.annotations.Nullable;
3231

3332
@Value
3433
@ToString(of = "description")

src/main/java/com/github/_1c_syntax/bsl/types/qualifiers/NumberQualifiers.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
import lombok.ToString;
2727
import lombok.Value;
2828
import lombok.experimental.Accessors;
29-
30-
import javax.annotation.Nullable;
29+
import org.jspecify.annotations.Nullable;
3130

3231
@Value
3332
@ToString(of = "description")

src/main/java/com/github/_1c_syntax/bsl/types/qualifiers/StringQualifiers.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
import lombok.ToString;
2828
import lombok.Value;
2929
import lombok.experimental.Accessors;
30-
31-
import javax.annotation.Nullable;
30+
import org.jspecify.annotations.Nullable;
3231

3332
@Value
3433
@ToString(of = "description")

src/main/java/com/github/_1c_syntax/bsl/types/qualifiers/package-info.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
/**
2323
* Пакет содержит набор квалификаторов
2424
*/
25-
@ParametersAreNonnullByDefault
26-
@ReturnValuesAreNonnullByDefault
25+
@NullMarked
2726
package com.github._1c_syntax.bsl.types.qualifiers;
2827

29-
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
30-
31-
import javax.annotation.ParametersAreNonnullByDefault;
28+
import org.jspecify.annotations.NullMarked;

0 commit comments

Comments
 (0)