Update project to use JSpecify (#1356)

Signed-off-by: system24seven <david@system24seven.com> Co-authored-by: Kevin Herron <kevinherron@gmail.com>
eclipse-milo · Dec 31, 2024 · e75a4c8 · e75a4c8
1 parent a6a92fd
commit e75a4c8
Show file tree

Hide file tree

Showing 413 changed files with 891 additions and 957 deletions.
diff --git a/.github/workflows/google-java-format.yml b/.github/workflows/google-java-format.yml
@@ -13,6 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Set up Java
+        uses: actions/setup-java@v4.6.0
+        with:
+          distribution: "temurin"
+          java-version: 17
       - uses: axel-op/googlejavaformat-action@v3.6.0
         with:
           args: "--set-exit-if-changed"
diff --git a/milo-examples/client-examples/pom.xml b/milo-examples/client-examples/pom.xml
@@ -52,12 +52,6 @@
       <artifactId>slf4j-simple</artifactId>
       <version>${slf4j.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <version>${jetbrains-annotations.version}</version>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 
 

diff --git a/milo-examples/server-examples/pom.xml b/milo-examples/server-examples/pom.xml
@@ -47,12 +47,6 @@
       <artifactId>slf4j-simple</artifactId>
       <version>${slf4j.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <version>${jetbrains-annotations.version}</version>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/.../server-examples/src/main/java/org/eclipse/milo/examples/server/types/CustomEnumType.java b/.../server-examples/src/main/java/org/eclipse/milo/examples/server/types/CustomEnumType.java
@@ -17,7 +17,7 @@
 import org.eclipse.milo.opcua.stack.core.encoding.UaEncoder;
 import org.eclipse.milo.opcua.stack.core.types.UaEnumeratedType;
 import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public enum CustomEnumType implements UaEnumeratedType {
   Field0(0),

diff --git a/opc-ua-sdk/codec-json/pom.xml b/opc-ua-sdk/codec-json/pom.xml
@@ -37,11 +37,6 @@
       <artifactId>milo-encoding-json</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <version>${jetbrains-annotations.version}</version>
-    </dependency>
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>

diff --git a/...a-sdk/codec-json/src/main/java/org/eclipse/milo/sdk/core/types/json/JsonCodecFactory.java b/...a-sdk/codec-json/src/main/java/org/eclipse/milo/sdk/core/types/json/JsonCodecFactory.java
@@ -16,16 +16,19 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.DataTypeDefinition;
 import org.eclipse.milo.opcua.stack.core.types.structured.EnumDefinition;
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureDefinition;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 public class JsonCodecFactory {
 
   public static DataTypeCodec create(DataType dataType, DataTypeTree dataTypeTree) {
     DataTypeDefinition definition = dataType.getDataTypeDefinition();
 
     if (definition instanceof EnumDefinition) {
-      // If we're asked to create a DataTypeCodec and the definition is an EnumDefinition,
-      // that means it's an OptionSet subclass. True enumerations are encoded/decoded as
-      // integers, so they don't have a corresponding codec.
+      /* If we're asked to create a DataTypeCodec and the definition is an EnumDefinition,
+       * that means it's an OptionSet subclass. True enumerations are encoded/decoded as
+       * integers, so they don't have a corresponding codec.
+       */
       return new JsonOptionSetCodec(dataType);
     } else if (definition instanceof StructureDefinition) {
       return new JsonStructCodec(dataType, dataTypeTree);

diff --git a/...ua-sdk/codec-json/src/main/java/org/eclipse/milo/sdk/core/types/json/JsonConversions.java b/...ua-sdk/codec-json/src/main/java/org/eclipse/milo/sdk/core/types/json/JsonConversions.java
@@ -38,8 +38,10 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.ULong;
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UShort;
 import org.eclipse.milo.opcua.stack.core.util.ArrayUtil;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 public class JsonConversions {
 
   // region OPC UA to JSON Conversions

diff --git a/...ua-sdk/codec-json/src/main/java/org/eclipse/milo/sdk/core/types/json/JsonStructCodec.java b/...ua-sdk/codec-json/src/main/java/org/eclipse/milo/sdk/core/types/json/JsonStructCodec.java
@@ -58,8 +58,10 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureDefinition;
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.Lazy;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 public class JsonStructCodec extends GenericDataTypeCodec<JsonStruct> {
 
   private final Lazy<Map<StructureField, Object>> hints = new Lazy<>();

diff --git a/opc-ua-sdk/codec-json/src/test/java/org/eclipse/milo/opcua/test/types/AbstractTestType.java b/opc-ua-sdk/codec-json/src/test/java/org/eclipse/milo/opcua/test/types/AbstractTestType.java
@@ -23,7 +23,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public abstract class AbstractTestType extends Structure implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3003");

diff --git a/opc-ua-sdk/codec-json/src/test/java/org/eclipse/milo/opcua/test/types/ConcreteTestType.java b/opc-ua-sdk/codec-json/src/test/java/org/eclipse/milo/opcua/test/types/ConcreteTestType.java
@@ -26,7 +26,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class ConcreteTestType extends AbstractTestType implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3006");

diff --git a/...ua-sdk/codec-json/src/test/java/org/eclipse/milo/opcua/test/types/ConcreteTestTypeEx.java b/...ua-sdk/codec-json/src/test/java/org/eclipse/milo/opcua/test/types/ConcreteTestTypeEx.java
@@ -26,7 +26,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class ConcreteTestTypeEx extends ConcreteTestType implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3009");

diff --git a/...c-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithAbstractArrayFields.java b/...c-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithAbstractArrayFields.java
@@ -29,7 +29,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithAbstractArrayFields extends Structure implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3005");

diff --git a/...-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithAbstractMatrixFields.java b/...-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithAbstractMatrixFields.java
@@ -31,7 +31,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithAbstractMatrixFields extends Structure implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3022");

diff --git a/...ec-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinArrayFields.java b/...ec-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinArrayFields.java
@@ -38,7 +38,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithBuiltinArrayFields extends Structure implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3019");

diff --git a/...-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinArrayFieldsEx.java b/...-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinArrayFieldsEx.java
@@ -42,7 +42,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.XVType;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithBuiltinArrayFieldsEx extends StructWithBuiltinArrayFields
     implements UaStructuredType {

diff --git a/...c-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinMatrixFields.java b/...c-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinMatrixFields.java
@@ -29,7 +29,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithBuiltinMatrixFields extends Structure implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3010");

diff --git a/...json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinMatrixFieldsEx.java b/...json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinMatrixFieldsEx.java
@@ -35,7 +35,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.XVType;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithBuiltinMatrixFieldsEx extends StructWithBuiltinMatrixFields
     implements UaStructuredType {

diff --git a/...c-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinScalarFields.java b/...c-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinScalarFields.java
@@ -38,7 +38,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithBuiltinScalarFields extends Structure implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3004");

diff --git a/...json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinScalarFieldsEx.java b/...json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinScalarFieldsEx.java
@@ -42,7 +42,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.XVType;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithBuiltinScalarFieldsEx extends StructWithBuiltinScalarFields
     implements UaStructuredType {

diff --git a/...c-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithOptionalArrayFields.java b/...c-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithOptionalArrayFields.java
@@ -28,7 +28,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithOptionalArrayFields extends Structure implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3007");

diff --git a/...-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithOptionalMatrixFields.java b/...-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithOptionalMatrixFields.java
@@ -30,7 +30,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithOptionalMatrixFields extends Structure implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3035");

diff --git a/...-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithOptionalScalarFields.java b/...-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithOptionalScalarFields.java
@@ -28,7 +28,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithOptionalScalarFields extends Structure implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3016");

diff --git a/...-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithStructureArrayFields.java b/...-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithStructureArrayFields.java
@@ -28,7 +28,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithStructureArrayFields extends Structure implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3029");

diff --git a/...json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithStructureMatrixFields.java b/...json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithStructureMatrixFields.java
@@ -29,7 +29,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
 import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
 import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StructWithStructureMatrixFields extends Structure implements UaStructuredType {
   public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3032");

diff --git a/opc-ua-sdk/codec-json/src/test/java/org/eclipse/milo/opcua/test/types/TestEnumType.java b/opc-ua-sdk/codec-json/src/test/java/org/eclipse/milo/opcua/test/types/TestEnumType.java
@@ -15,7 +15,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
 import org.eclipse.milo.opcua.stack.core.types.structured.EnumDefinition;
 import org.eclipse.milo.opcua.stack.core.types.structured.EnumField;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public enum TestEnumType implements UaEnumeratedType {
   A(0),

diff --git a/.../codec-json/src/test/java/org/eclipse/milo/sdk/core/types/json/util/AbstractDataType.java b/.../codec-json/src/test/java/org/eclipse/milo/sdk/core/types/json/util/AbstractDataType.java
@@ -14,7 +14,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
 import org.eclipse.milo.opcua.stack.core.types.builtin.QualifiedName;
 import org.eclipse.milo.opcua.stack.core.types.structured.DataTypeDefinition;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public abstract class AbstractDataType implements DataType {
 

diff --git a/opc-ua-sdk/dtd-core/pom.xml b/opc-ua-sdk/dtd-core/pom.xml
@@ -47,19 +47,17 @@
       <artifactId>gson</artifactId>
       <version>${gson.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <version>${jetbrains-annotations.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jspecify</groupId>
+      <artifactId>jspecify</artifactId>
+      <version>1.0.0</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/opc-ua-sdk/dtd-core/src/main/java/org/eclipse/milo/opcua/sdk/core/dtd/AbstractBsdCodec.java b/opc-ua-sdk/dtd-core/src/main/java/org/eclipse/milo/opcua/sdk/core/dtd/AbstractBsdCodec.java
@@ -44,7 +44,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.ULong;
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UShort;
 import org.eclipse.milo.opcua.stack.core.util.Namespaces;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.opcfoundation.opcua.binaryschema.EnumeratedType;
 import org.opcfoundation.opcua.binaryschema.FieldType;
 import org.opcfoundation.opcua.binaryschema.StructuredType;
@@ -435,23 +435,17 @@ private boolean fieldIsAbsent(FieldType field, Map<String, MemberT> members) {
 
   private static boolean compareToSwitchValue(
       long controlValue, SwitchOperand switchOperand, long switchValue) {
-    switch (switchOperand) {
-      case EQUALS:
-        return controlValue == switchValue;
-      case NOT_EQUAL:
-        return controlValue != switchValue;
-      case GREATER_THAN:
-        return controlValue > switchValue;
-      case GREATER_THAN_OR_EQUAL:
-        return controlValue >= switchValue;
-      case LESS_THAN:
-        return controlValue < switchValue;
-      case LESS_THAN_OR_EQUAL:
-        return controlValue <= switchValue;
-      default:
-        throw new UaSerializationException(
-            StatusCodes.Bad_InternalError, "unknown SwitchOperand: " + switchOperand);
-    }
+    return switch (switchOperand) {
+      case EQUALS -> controlValue == switchValue;
+      case NOT_EQUAL -> controlValue != switchValue;
+      case GREATER_THAN -> controlValue > switchValue;
+      case GREATER_THAN_OR_EQUAL -> controlValue >= switchValue;
+      case LESS_THAN -> controlValue < switchValue;
+      case LESS_THAN_OR_EQUAL -> controlValue <= switchValue;
+      default ->
+          throw new UaSerializationException(
+              StatusCodes.Bad_InternalError, "unknown SwitchOperand: " + switchOperand);
+    };
   }
 
   private static boolean fieldIsScalar(FieldType field) {

diff --git a/.../dtd-core/src/main/java/org/eclipse/milo/opcua/sdk/core/dtd/BinaryDataTypeDictionary.java b/.../dtd-core/src/main/java/org/eclipse/milo/opcua/sdk/core/dtd/BinaryDataTypeDictionary.java
@@ -10,13 +10,13 @@
 
 package org.eclipse.milo.opcua.sdk.core.dtd;
 
-import com.sun.istack.Nullable;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.eclipse.milo.opcua.stack.core.encoding.DataTypeCodec;
 import org.eclipse.milo.opcua.stack.core.types.DataTypeDictionary;
 import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
+import org.jspecify.annotations.Nullable;
 import org.opcfoundation.opcua.binaryschema.TypeDescription;
 import org.opcfoundation.opcua.binaryschema.TypeDictionary;
 

diff --git a/opc-ua-sdk/dtd-core/src/main/java/org/eclipse/milo/opcua/sdk/core/dtd/generic/Struct.java b/opc-ua-sdk/dtd-core/src/main/java/org/eclipse/milo/opcua/sdk/core/dtd/generic/Struct.java
@@ -18,28 +18,28 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 public class Struct {
 
   private final String name;
   private final Map<String, Member> members;
 
-  public Struct(@NotNull String name, @NotNull Map<String, Member> members) {
+  public Struct(@NonNull String name, @NonNull Map<String, Member> members) {
     Preconditions.checkNotNull(name);
     Preconditions.checkNotNull(members);
 
     this.name = name;
     this.members = Map.copyOf(members);
   }
 
-  @NotNull
+  @NonNull
   public String getName() {
     return name;
   }
 
-  @NotNull
+  @NonNull
   public Map<String, Member> getMembers() {
     return members;
   }
@@ -49,7 +49,7 @@ public Member getMember(String name) {
     return members.get(name);
   }
 
-  @NotNull
+  @NonNull
   public Optional<Member> getMemberSafe(String name) {
     return Optional.ofNullable(members.get(name));
   }