Skip to content

Commit e75a4c8

Browse files
Update project to use JSpecify (#1356)
Signed-off-by: system24seven <[email protected]> Co-authored-by: Kevin Herron <[email protected]>
1 parent a6a92fd commit e75a4c8

File tree

413 files changed

+891
-957
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

413 files changed

+891
-957
lines changed

.github/workflows/google-java-format.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v4
16+
- name: Set up Java
17+
uses: actions/[email protected]
18+
with:
19+
distribution: "temurin"
20+
java-version: 17
1621
- uses: axel-op/[email protected]
1722
with:
1823
args: "--set-exit-if-changed"

milo-examples/client-examples/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@
5252
<artifactId>slf4j-simple</artifactId>
5353
<version>${slf4j.version}</version>
5454
</dependency>
55-
<dependency>
56-
<groupId>org.jetbrains</groupId>
57-
<artifactId>annotations</artifactId>
58-
<version>${jetbrains-annotations.version}</version>
59-
<scope>provided</scope>
60-
</dependency>
6155
</dependencies>
6256

6357

milo-examples/server-examples/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@
4747
<artifactId>slf4j-simple</artifactId>
4848
<version>${slf4j.version}</version>
4949
</dependency>
50-
<dependency>
51-
<groupId>org.jetbrains</groupId>
52-
<artifactId>annotations</artifactId>
53-
<version>${jetbrains-annotations.version}</version>
54-
<scope>provided</scope>
55-
</dependency>
5650
</dependencies>
5751

5852
<build>

milo-examples/server-examples/src/main/java/org/eclipse/milo/examples/server/types/CustomEnumType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.eclipse.milo.opcua.stack.core.encoding.UaEncoder;
1818
import org.eclipse.milo.opcua.stack.core.types.UaEnumeratedType;
1919
import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
20-
import org.jetbrains.annotations.Nullable;
20+
import org.jspecify.annotations.Nullable;
2121

2222
public enum CustomEnumType implements UaEnumeratedType {
2323
Field0(0),

opc-ua-sdk/codec-json/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@
3737
<artifactId>milo-encoding-json</artifactId>
3838
<version>${project.version}</version>
3939
</dependency>
40-
<dependency>
41-
<groupId>org.jetbrains</groupId>
42-
<artifactId>annotations</artifactId>
43-
<version>${jetbrains-annotations.version}</version>
44-
</dependency>
4540

4641
<dependency>
4742
<groupId>org.junit.jupiter</groupId>

opc-ua-sdk/codec-json/src/main/java/org/eclipse/milo/sdk/core/types/json/JsonCodecFactory.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,19 @@
1616
import org.eclipse.milo.opcua.stack.core.types.structured.DataTypeDefinition;
1717
import org.eclipse.milo.opcua.stack.core.types.structured.EnumDefinition;
1818
import org.eclipse.milo.opcua.stack.core.types.structured.StructureDefinition;
19+
import org.jspecify.annotations.NullMarked;
1920

21+
@NullMarked
2022
public class JsonCodecFactory {
2123

2224
public static DataTypeCodec create(DataType dataType, DataTypeTree dataTypeTree) {
2325
DataTypeDefinition definition = dataType.getDataTypeDefinition();
2426

2527
if (definition instanceof EnumDefinition) {
26-
// If we're asked to create a DataTypeCodec and the definition is an EnumDefinition,
27-
// that means it's an OptionSet subclass. True enumerations are encoded/decoded as
28-
// integers, so they don't have a corresponding codec.
28+
/* If we're asked to create a DataTypeCodec and the definition is an EnumDefinition,
29+
* that means it's an OptionSet subclass. True enumerations are encoded/decoded as
30+
* integers, so they don't have a corresponding codec.
31+
*/
2932
return new JsonOptionSetCodec(dataType);
3033
} else if (definition instanceof StructureDefinition) {
3134
return new JsonStructCodec(dataType, dataTypeTree);

opc-ua-sdk/codec-json/src/main/java/org/eclipse/milo/sdk/core/types/json/JsonConversions.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@
3838
import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.ULong;
3939
import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UShort;
4040
import org.eclipse.milo.opcua.stack.core.util.ArrayUtil;
41-
import org.jetbrains.annotations.Nullable;
41+
import org.jspecify.annotations.NullMarked;
42+
import org.jspecify.annotations.Nullable;
4243

44+
@NullMarked
4345
public class JsonConversions {
4446

4547
// region OPC UA to JSON Conversions

opc-ua-sdk/codec-json/src/main/java/org/eclipse/milo/sdk/core/types/json/JsonStructCodec.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@
5858
import org.eclipse.milo.opcua.stack.core.types.structured.StructureDefinition;
5959
import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
6060
import org.eclipse.milo.opcua.stack.core.util.Lazy;
61-
import org.jetbrains.annotations.Nullable;
61+
import org.jspecify.annotations.NullMarked;
62+
import org.jspecify.annotations.Nullable;
6263

64+
@NullMarked
6365
public class JsonStructCodec extends GenericDataTypeCodec<JsonStruct> {
6466

6567
private final Lazy<Map<StructureField, Object>> hints = new Lazy<>();

opc-ua-sdk/codec-json/src/test/java/org/eclipse/milo/opcua/test/types/AbstractTestType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
2424
import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
2525
import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
26-
import org.jetbrains.annotations.Nullable;
26+
import org.jspecify.annotations.Nullable;
2727

2828
public abstract class AbstractTestType extends Structure implements UaStructuredType {
2929
public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3003");

opc-ua-sdk/codec-json/src/test/java/org/eclipse/milo/opcua/test/types/ConcreteTestType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.eclipse.milo.opcua.stack.core.types.structured.StructureField;
2727
import org.eclipse.milo.opcua.stack.core.util.codegen.EqualsBuilder;
2828
import org.eclipse.milo.opcua.stack.core.util.codegen.HashCodeBuilder;
29-
import org.jetbrains.annotations.Nullable;
29+
import org.jspecify.annotations.Nullable;
3030

3131
public class ConcreteTestType extends AbstractTestType implements UaStructuredType {
3232
public static final ExpandedNodeId TYPE_ID = ExpandedNodeId.parse("ns=1;i=3006");

0 commit comments

Comments
 (0)