This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 23754b67dc fix: Fixed the tests in the OPC-UA subscription section.
23754b67dc is described below
commit 23754b67dc61f4ce573b705447b3cbe8713738cf
Author: Christofer Dutz <[email protected]>
AuthorDate: Tue Feb 24 11:51:24 2026 +0100
fix: Fixed the tests in the OPC-UA subscription section.
---
plc4go/protocols/opcua/readwrite/model/Variant.go | 24 +++++++++++-----------
.../opcua/readwrite/model/VariantBoolean.go | 2 +-
.../protocols/opcua/readwrite/model/VariantByte.go | 2 +-
.../opcua/readwrite/model/VariantByteString.go | 2 +-
.../opcua/readwrite/model/VariantDataValue.go | 2 +-
.../opcua/readwrite/model/VariantDateTime.go | 2 +-
.../opcua/readwrite/model/VariantDiagnosticInfo.go | 2 +-
.../opcua/readwrite/model/VariantDouble.go | 2 +-
.../opcua/readwrite/model/VariantExpandedNodeId.go | 2 +-
.../readwrite/model/VariantExtensionObject.go | 2 +-
.../opcua/readwrite/model/VariantFloat.go | 2 +-
.../protocols/opcua/readwrite/model/VariantGuid.go | 2 +-
.../opcua/readwrite/model/VariantInt16.go | 2 +-
.../opcua/readwrite/model/VariantInt32.go | 2 +-
.../opcua/readwrite/model/VariantInt64.go | 2 +-
.../opcua/readwrite/model/VariantLocalizedText.go | 2 +-
.../opcua/readwrite/model/VariantNodeId.go | 2 +-
.../protocols/opcua/readwrite/model/VariantNull.go | 2 +-
.../opcua/readwrite/model/VariantQualifiedName.go | 2 +-
.../opcua/readwrite/model/VariantSByte.go | 2 +-
.../opcua/readwrite/model/VariantStatusCode.go | 2 +-
.../opcua/readwrite/model/VariantString.go | 2 +-
.../opcua/readwrite/model/VariantUInt16.go | 2 +-
.../opcua/readwrite/model/VariantUInt32.go | 2 +-
.../opcua/readwrite/model/VariantUInt64.go | 2 +-
.../opcua/readwrite/model/VariantVariant.go | 2 +-
.../opcua/readwrite/model/VariantXmlElement.go | 2 +-
.../protocol/OpcuaSubscriptionHandleTest.java | 8 +++-----
28 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/plc4go/protocols/opcua/readwrite/model/Variant.go
b/plc4go/protocols/opcua/readwrite/model/Variant.go
index db2fe1c290..5ac0a28ab4 100644
--- a/plc4go/protocols/opcua/readwrite/model/Variant.go
+++ b/plc4go/protocols/opcua/readwrite/model/Variant.go
@@ -57,7 +57,7 @@ type VariantContract interface {
// GetNoOfArrayDimensions returns NoOfArrayDimensions (property field)
GetNoOfArrayDimensions() *int32
// GetArrayDimensions returns ArrayDimensions (property field)
- GetArrayDimensions() []bool
+ GetArrayDimensions() []int32
// IsVariant is a marker method to prevent unintentional type checks
(interfaces of same signature)
IsVariant()
// CreateBuilder creates a VariantBuilder
@@ -83,13 +83,13 @@ type _Variant struct {
ArrayLengthSpecified bool
ArrayDimensionsSpecified bool
NoOfArrayDimensions *int32
- ArrayDimensions []bool
+ ArrayDimensions []int32
}
var _ VariantContract = (*_Variant)(nil)
// NewVariant factory function for _Variant
-func NewVariant(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []bool) *_Variant {
+func NewVariant(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []int32) *_Variant {
return &_Variant{ArrayLengthSpecified: arrayLengthSpecified,
ArrayDimensionsSpecified: arrayDimensionsSpecified, NoOfArrayDimensions:
noOfArrayDimensions, ArrayDimensions: arrayDimensions}
}
@@ -102,7 +102,7 @@ func NewVariant(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, noOfAr
type VariantBuilder interface {
utils.Copyable
// WithMandatoryFields adds all mandatory fields (convenience for using
multiple builder calls)
- WithMandatoryFields(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, arrayDimensions []bool) VariantBuilder
+ WithMandatoryFields(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, arrayDimensions []int32) VariantBuilder
// WithArrayLengthSpecified adds ArrayLengthSpecified (property field)
WithArrayLengthSpecified(bool) VariantBuilder
// WithArrayDimensionsSpecified adds ArrayDimensionsSpecified (property
field)
@@ -110,7 +110,7 @@ type VariantBuilder interface {
// WithNoOfArrayDimensions adds NoOfArrayDimensions (property field)
WithOptionalNoOfArrayDimensions(int32) VariantBuilder
// WithArrayDimensions adds ArrayDimensions (property field)
- WithArrayDimensions(...bool) VariantBuilder
+ WithArrayDimensions(...int32) VariantBuilder
// AsVariantNull converts this build to a subType of Variant. It is
always possible to return to current builder using Done()
AsVariantNull() VariantNullBuilder
// AsVariantBoolean converts this build to a subType of Variant. It is
always possible to return to current builder using Done()
@@ -194,7 +194,7 @@ type _VariantBuilder struct {
var _ (VariantBuilder) = (*_VariantBuilder)(nil)
-func (b *_VariantBuilder) WithMandatoryFields(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, arrayDimensions []bool) VariantBuilder {
+func (b *_VariantBuilder) WithMandatoryFields(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, arrayDimensions []int32) VariantBuilder {
return
b.WithArrayLengthSpecified(arrayLengthSpecified).WithArrayDimensionsSpecified(arrayDimensionsSpecified).WithArrayDimensions(arrayDimensions...)
}
@@ -213,7 +213,7 @@ func (b *_VariantBuilder)
WithOptionalNoOfArrayDimensions(noOfArrayDimensions in
return b
}
-func (b *_VariantBuilder) WithArrayDimensions(arrayDimensions ...bool)
VariantBuilder {
+func (b *_VariantBuilder) WithArrayDimensions(arrayDimensions ...int32)
VariantBuilder {
b.ArrayDimensions = arrayDimensions
return b
}
@@ -553,7 +553,7 @@ func (m *_Variant) GetNoOfArrayDimensions() *int32 {
return m.NoOfArrayDimensions
}
-func (m *_Variant) GetArrayDimensions() []bool {
+func (m *_Variant) GetArrayDimensions() []int32 {
return m.ArrayDimensions
}
@@ -595,7 +595,7 @@ func (m *_Variant) getLengthInBits(ctx context.Context)
uint16 {
// Array field
if len(m.ArrayDimensions) > 0 {
- lengthInBits += 1 * uint16(len(m.ArrayDimensions))
+ lengthInBits += 32 * uint16(len(m.ArrayDimensions))
}
return lengthInBits
@@ -782,7 +782,7 @@ func (m *_Variant) parse(ctx context.Context, readBuffer
utils.ReadBuffer) (__va
}
m.NoOfArrayDimensions = noOfArrayDimensions
- arrayDimensions, err := ReadCountArrayField[bool](ctx,
"arrayDimensions", ReadBoolean(readBuffer),
uint64(utils.InlineIf(bool((noOfArrayDimensions) == (nil)), func() any { return
int32(int32(0)) }, func() any { return int32((*noOfArrayDimensions))
}).(int32)))
+ arrayDimensions, err := ReadCountArrayField[int32](ctx,
"arrayDimensions", ReadSignedInt(readBuffer, uint8(32)),
uint64(utils.InlineIf(bool((noOfArrayDimensions) == (nil)), func() any { return
int32(int32(0)) }, func() any { return int32((*noOfArrayDimensions))
}).(int32)))
if err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing
'arrayDimensions' field"))
}
@@ -828,7 +828,7 @@ func (pm *_Variant) serializeParent(ctx context.Context,
writeBuffer utils.Write
return errors.Wrap(err, "Error serializing
'noOfArrayDimensions' field")
}
- if err := WriteSimpleTypeArrayField(ctx, "arrayDimensions",
m.GetArrayDimensions(), WriteBoolean(writeBuffer)); err != nil {
+ if err := WriteSimpleTypeArrayField(ctx, "arrayDimensions",
m.GetArrayDimensions(), WriteSignedInt(writeBuffer, 32)); err != nil {
return errors.Wrap(err, "Error serializing 'arrayDimensions'
field")
}
@@ -853,7 +853,7 @@ func (m *_Variant) deepCopy() *_Variant {
m.ArrayLengthSpecified,
m.ArrayDimensionsSpecified,
utils.CopyPtr[int32](m.NoOfArrayDimensions),
- utils.DeepCopySlice[bool, bool](m.ArrayDimensions),
+ utils.DeepCopySlice[int32, int32](m.ArrayDimensions),
}
return _VariantCopy
}
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantBoolean.go
b/plc4go/protocols/opcua/readwrite/model/VariantBoolean.go
index f77baafc4a..1da52f14f8 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantBoolean.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantBoolean.go
@@ -62,7 +62,7 @@ var _ VariantBoolean = (*_VariantBoolean)(nil)
var _ VariantRequirements = (*_VariantBoolean)(nil)
// NewVariantBoolean factory function for _VariantBoolean
-func NewVariantBoolean(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []byte) *_VariantBoolean {
+func NewVariantBoolean(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []byte) *_VariantBoolean {
_result := &_VariantBoolean{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantByte.go
b/plc4go/protocols/opcua/readwrite/model/VariantByte.go
index 63b2272837..8dc16181ad 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantByte.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantByte.go
@@ -62,7 +62,7 @@ var _ VariantByte = (*_VariantByte)(nil)
var _ VariantRequirements = (*_VariantByte)(nil)
// NewVariantByte factory function for _VariantByte
-func NewVariantByte(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32, value
[]uint8) *_VariantByte {
+func NewVariantByte(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32, value
[]uint8) *_VariantByte {
_result := &_VariantByte{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantByteString.go
b/plc4go/protocols/opcua/readwrite/model/VariantByteString.go
index b867ed6e81..817f5c2010 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantByteString.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantByteString.go
@@ -62,7 +62,7 @@ var _ VariantByteString = (*_VariantByteString)(nil)
var _ VariantRequirements = (*_VariantByteString)(nil)
// NewVariantByteString factory function for _VariantByteString
-func NewVariantByteString(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []ByteStringArray) *_VariantByteString {
+func NewVariantByteString(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []ByteStringArray) *_VariantByteString {
_result := &_VariantByteString{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantDataValue.go
b/plc4go/protocols/opcua/readwrite/model/VariantDataValue.go
index 4c3d9dfdd8..432daab5e4 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantDataValue.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantDataValue.go
@@ -62,7 +62,7 @@ var _ VariantDataValue = (*_VariantDataValue)(nil)
var _ VariantRequirements = (*_VariantDataValue)(nil)
// NewVariantDataValue factory function for _VariantDataValue
-func NewVariantDataValue(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []DataValue) *_VariantDataValue {
+func NewVariantDataValue(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []DataValue) *_VariantDataValue {
_result := &_VariantDataValue{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantDateTime.go
b/plc4go/protocols/opcua/readwrite/model/VariantDateTime.go
index 1ed021d3fb..d6e1bc1dd1 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantDateTime.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantDateTime.go
@@ -62,7 +62,7 @@ var _ VariantDateTime = (*_VariantDateTime)(nil)
var _ VariantRequirements = (*_VariantDateTime)(nil)
// NewVariantDateTime factory function for _VariantDateTime
-func NewVariantDateTime(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []int64) *_VariantDateTime {
+func NewVariantDateTime(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []int64) *_VariantDateTime {
_result := &_VariantDateTime{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantDiagnosticInfo.go
b/plc4go/protocols/opcua/readwrite/model/VariantDiagnosticInfo.go
index bf71c6479d..675fc6be3e 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantDiagnosticInfo.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantDiagnosticInfo.go
@@ -62,7 +62,7 @@ var _ VariantDiagnosticInfo = (*_VariantDiagnosticInfo)(nil)
var _ VariantRequirements = (*_VariantDiagnosticInfo)(nil)
// NewVariantDiagnosticInfo factory function for _VariantDiagnosticInfo
-func NewVariantDiagnosticInfo(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, noOfArrayDimensions *int32, arrayDimensions
[]bool, arrayLength *int32, value []DiagnosticInfo) *_VariantDiagnosticInfo {
+func NewVariantDiagnosticInfo(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, noOfArrayDimensions *int32, arrayDimensions
[]int32, arrayLength *int32, value []DiagnosticInfo) *_VariantDiagnosticInfo {
_result := &_VariantDiagnosticInfo{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantDouble.go
b/plc4go/protocols/opcua/readwrite/model/VariantDouble.go
index d579496c74..fabe6f14f9 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantDouble.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantDouble.go
@@ -62,7 +62,7 @@ var _ VariantDouble = (*_VariantDouble)(nil)
var _ VariantRequirements = (*_VariantDouble)(nil)
// NewVariantDouble factory function for _VariantDouble
-func NewVariantDouble(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []float64) *_VariantDouble {
+func NewVariantDouble(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []float64) *_VariantDouble {
_result := &_VariantDouble{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantExpandedNodeId.go
b/plc4go/protocols/opcua/readwrite/model/VariantExpandedNodeId.go
index 3d899742a6..2d6ac6698f 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantExpandedNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantExpandedNodeId.go
@@ -62,7 +62,7 @@ var _ VariantExpandedNodeId = (*_VariantExpandedNodeId)(nil)
var _ VariantRequirements = (*_VariantExpandedNodeId)(nil)
// NewVariantExpandedNodeId factory function for _VariantExpandedNodeId
-func NewVariantExpandedNodeId(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, noOfArrayDimensions *int32, arrayDimensions
[]bool, arrayLength *int32, value []ExpandedNodeId) *_VariantExpandedNodeId {
+func NewVariantExpandedNodeId(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, noOfArrayDimensions *int32, arrayDimensions
[]int32, arrayLength *int32, value []ExpandedNodeId) *_VariantExpandedNodeId {
_result := &_VariantExpandedNodeId{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantExtensionObject.go
b/plc4go/protocols/opcua/readwrite/model/VariantExtensionObject.go
index d5058b5f69..7368af1177 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantExtensionObject.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantExtensionObject.go
@@ -62,7 +62,7 @@ var _ VariantExtensionObject = (*_VariantExtensionObject)(nil)
var _ VariantRequirements = (*_VariantExtensionObject)(nil)
// NewVariantExtensionObject factory function for _VariantExtensionObject
-func NewVariantExtensionObject(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, noOfArrayDimensions *int32, arrayDimensions
[]bool, arrayLength *int32, value []ExtensionObject) *_VariantExtensionObject {
+func NewVariantExtensionObject(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, noOfArrayDimensions *int32, arrayDimensions
[]int32, arrayLength *int32, value []ExtensionObject) *_VariantExtensionObject {
_result := &_VariantExtensionObject{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantFloat.go
b/plc4go/protocols/opcua/readwrite/model/VariantFloat.go
index 21a907aa59..131e784bb0 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantFloat.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantFloat.go
@@ -62,7 +62,7 @@ var _ VariantFloat = (*_VariantFloat)(nil)
var _ VariantRequirements = (*_VariantFloat)(nil)
// NewVariantFloat factory function for _VariantFloat
-func NewVariantFloat(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32, value
[]float32) *_VariantFloat {
+func NewVariantFloat(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32, value
[]float32) *_VariantFloat {
_result := &_VariantFloat{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantGuid.go
b/plc4go/protocols/opcua/readwrite/model/VariantGuid.go
index c273771c4f..ef0f77980a 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantGuid.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantGuid.go
@@ -62,7 +62,7 @@ var _ VariantGuid = (*_VariantGuid)(nil)
var _ VariantRequirements = (*_VariantGuid)(nil)
// NewVariantGuid factory function for _VariantGuid
-func NewVariantGuid(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32, value
[]GuidValue) *_VariantGuid {
+func NewVariantGuid(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32, value
[]GuidValue) *_VariantGuid {
_result := &_VariantGuid{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantInt16.go
b/plc4go/protocols/opcua/readwrite/model/VariantInt16.go
index ffe9634b9d..e911ee9bea 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantInt16.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantInt16.go
@@ -62,7 +62,7 @@ var _ VariantInt16 = (*_VariantInt16)(nil)
var _ VariantRequirements = (*_VariantInt16)(nil)
// NewVariantInt16 factory function for _VariantInt16
-func NewVariantInt16(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32, value
[]int16) *_VariantInt16 {
+func NewVariantInt16(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32, value
[]int16) *_VariantInt16 {
_result := &_VariantInt16{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantInt32.go
b/plc4go/protocols/opcua/readwrite/model/VariantInt32.go
index 92a7d1b96d..f96401f221 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantInt32.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantInt32.go
@@ -62,7 +62,7 @@ var _ VariantInt32 = (*_VariantInt32)(nil)
var _ VariantRequirements = (*_VariantInt32)(nil)
// NewVariantInt32 factory function for _VariantInt32
-func NewVariantInt32(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32, value
[]int32) *_VariantInt32 {
+func NewVariantInt32(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32, value
[]int32) *_VariantInt32 {
_result := &_VariantInt32{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantInt64.go
b/plc4go/protocols/opcua/readwrite/model/VariantInt64.go
index a822f52b0a..6e2e996601 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantInt64.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantInt64.go
@@ -62,7 +62,7 @@ var _ VariantInt64 = (*_VariantInt64)(nil)
var _ VariantRequirements = (*_VariantInt64)(nil)
// NewVariantInt64 factory function for _VariantInt64
-func NewVariantInt64(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32, value
[]int64) *_VariantInt64 {
+func NewVariantInt64(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32, value
[]int64) *_VariantInt64 {
_result := &_VariantInt64{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantLocalizedText.go
b/plc4go/protocols/opcua/readwrite/model/VariantLocalizedText.go
index 1b73832623..16f475b72d 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantLocalizedText.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantLocalizedText.go
@@ -62,7 +62,7 @@ var _ VariantLocalizedText = (*_VariantLocalizedText)(nil)
var _ VariantRequirements = (*_VariantLocalizedText)(nil)
// NewVariantLocalizedText factory function for _VariantLocalizedText
-func NewVariantLocalizedText(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, noOfArrayDimensions *int32, arrayDimensions
[]bool, arrayLength *int32, value []LocalizedText) *_VariantLocalizedText {
+func NewVariantLocalizedText(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, noOfArrayDimensions *int32, arrayDimensions
[]int32, arrayLength *int32, value []LocalizedText) *_VariantLocalizedText {
_result := &_VariantLocalizedText{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantNodeId.go
b/plc4go/protocols/opcua/readwrite/model/VariantNodeId.go
index 57b1fa974c..f1d21d0777 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantNodeId.go
@@ -62,7 +62,7 @@ var _ VariantNodeId = (*_VariantNodeId)(nil)
var _ VariantRequirements = (*_VariantNodeId)(nil)
// NewVariantNodeId factory function for _VariantNodeId
-func NewVariantNodeId(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []NodeId) *_VariantNodeId {
+func NewVariantNodeId(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []NodeId) *_VariantNodeId {
_result := &_VariantNodeId{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantNull.go
b/plc4go/protocols/opcua/readwrite/model/VariantNull.go
index 2dce5f41f3..305b6d6414 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantNull.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantNull.go
@@ -54,7 +54,7 @@ var _ VariantNull = (*_VariantNull)(nil)
var _ VariantRequirements = (*_VariantNull)(nil)
// NewVariantNull factory function for _VariantNull
-func NewVariantNull(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []bool) *_VariantNull {
+func NewVariantNull(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []int32) *_VariantNull {
_result := &_VariantNull{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
}
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantQualifiedName.go
b/plc4go/protocols/opcua/readwrite/model/VariantQualifiedName.go
index 50848cfb7d..379a32d9ba 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantQualifiedName.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantQualifiedName.go
@@ -62,7 +62,7 @@ var _ VariantQualifiedName = (*_VariantQualifiedName)(nil)
var _ VariantRequirements = (*_VariantQualifiedName)(nil)
// NewVariantQualifiedName factory function for _VariantQualifiedName
-func NewVariantQualifiedName(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, noOfArrayDimensions *int32, arrayDimensions
[]bool, arrayLength *int32, value []QualifiedName) *_VariantQualifiedName {
+func NewVariantQualifiedName(arrayLengthSpecified bool,
arrayDimensionsSpecified bool, noOfArrayDimensions *int32, arrayDimensions
[]int32, arrayLength *int32, value []QualifiedName) *_VariantQualifiedName {
_result := &_VariantQualifiedName{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantSByte.go
b/plc4go/protocols/opcua/readwrite/model/VariantSByte.go
index e23b44175e..d975226b8f 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantSByte.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantSByte.go
@@ -62,7 +62,7 @@ var _ VariantSByte = (*_VariantSByte)(nil)
var _ VariantRequirements = (*_VariantSByte)(nil)
// NewVariantSByte factory function for _VariantSByte
-func NewVariantSByte(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32, value
[]byte) *_VariantSByte {
+func NewVariantSByte(arrayLengthSpecified bool, arrayDimensionsSpecified bool,
noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32, value
[]byte) *_VariantSByte {
_result := &_VariantSByte{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantStatusCode.go
b/plc4go/protocols/opcua/readwrite/model/VariantStatusCode.go
index a5ab063897..a00a418c3f 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantStatusCode.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantStatusCode.go
@@ -62,7 +62,7 @@ var _ VariantStatusCode = (*_VariantStatusCode)(nil)
var _ VariantRequirements = (*_VariantStatusCode)(nil)
// NewVariantStatusCode factory function for _VariantStatusCode
-func NewVariantStatusCode(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []StatusCode) *_VariantStatusCode {
+func NewVariantStatusCode(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []StatusCode) *_VariantStatusCode {
_result := &_VariantStatusCode{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantString.go
b/plc4go/protocols/opcua/readwrite/model/VariantString.go
index f1d13ac09f..57eafd66ca 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantString.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantString.go
@@ -62,7 +62,7 @@ var _ VariantString = (*_VariantString)(nil)
var _ VariantRequirements = (*_VariantString)(nil)
// NewVariantString factory function for _VariantString
-func NewVariantString(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []PascalString) *_VariantString {
+func NewVariantString(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []PascalString) *_VariantString {
_result := &_VariantString{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantUInt16.go
b/plc4go/protocols/opcua/readwrite/model/VariantUInt16.go
index 212a5c69c3..4515613675 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantUInt16.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantUInt16.go
@@ -62,7 +62,7 @@ var _ VariantUInt16 = (*_VariantUInt16)(nil)
var _ VariantRequirements = (*_VariantUInt16)(nil)
// NewVariantUInt16 factory function for _VariantUInt16
-func NewVariantUInt16(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []uint16) *_VariantUInt16 {
+func NewVariantUInt16(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []uint16) *_VariantUInt16 {
_result := &_VariantUInt16{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantUInt32.go
b/plc4go/protocols/opcua/readwrite/model/VariantUInt32.go
index aae7430193..90fa8c0788 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantUInt32.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantUInt32.go
@@ -62,7 +62,7 @@ var _ VariantUInt32 = (*_VariantUInt32)(nil)
var _ VariantRequirements = (*_VariantUInt32)(nil)
// NewVariantUInt32 factory function for _VariantUInt32
-func NewVariantUInt32(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []uint32) *_VariantUInt32 {
+func NewVariantUInt32(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []uint32) *_VariantUInt32 {
_result := &_VariantUInt32{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantUInt64.go
b/plc4go/protocols/opcua/readwrite/model/VariantUInt64.go
index b0bb51d115..4b858661bd 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantUInt64.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantUInt64.go
@@ -62,7 +62,7 @@ var _ VariantUInt64 = (*_VariantUInt64)(nil)
var _ VariantRequirements = (*_VariantUInt64)(nil)
// NewVariantUInt64 factory function for _VariantUInt64
-func NewVariantUInt64(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []uint64) *_VariantUInt64 {
+func NewVariantUInt64(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []uint64) *_VariantUInt64 {
_result := &_VariantUInt64{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantVariant.go
b/plc4go/protocols/opcua/readwrite/model/VariantVariant.go
index 5b4805b9c4..99f647f0ee 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantVariant.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantVariant.go
@@ -62,7 +62,7 @@ var _ VariantVariant = (*_VariantVariant)(nil)
var _ VariantRequirements = (*_VariantVariant)(nil)
// NewVariantVariant factory function for _VariantVariant
-func NewVariantVariant(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []Variant) *_VariantVariant {
+func NewVariantVariant(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []Variant) *_VariantVariant {
_result := &_VariantVariant{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantXmlElement.go
b/plc4go/protocols/opcua/readwrite/model/VariantXmlElement.go
index a131447211..f0c29de626 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantXmlElement.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantXmlElement.go
@@ -62,7 +62,7 @@ var _ VariantXmlElement = (*_VariantXmlElement)(nil)
var _ VariantRequirements = (*_VariantXmlElement)(nil)
// NewVariantXmlElement factory function for _VariantXmlElement
-func NewVariantXmlElement(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []bool, arrayLength *int32,
value []PascalString) *_VariantXmlElement {
+func NewVariantXmlElement(arrayLengthSpecified bool, arrayDimensionsSpecified
bool, noOfArrayDimensions *int32, arrayDimensions []int32, arrayLength *int32,
value []PascalString) *_VariantXmlElement {
_result := &_VariantXmlElement{
VariantContract: NewVariant(arrayLengthSpecified,
arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions),
ArrayLength: arrayLength,
diff --git
a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java
b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java
index 1339394a72..a71a0e91a8 100644
---
a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java
+++
b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.plc4x.java.opcua.protocol;
-import java.io.ByteArrayOutputStream;
+import java.math.BigInteger;
import java.util.concurrent.CountDownLatch;
import java.util.stream.Stream;
import org.apache.plc4x.java.DefaultPlcDriverManager;
@@ -28,7 +28,6 @@ import
org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
import org.apache.plc4x.java.api.types.PlcResponseCode;
import org.apache.plc4x.java.opcua.MiloTestContainer;
import org.apache.plc4x.java.opcua.OpcuaPlcDriverTest;
-import org.apache.plc4x.java.opcua.KeystoreGenerator;
import org.junit.jupiter.api.*;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -38,7 +37,6 @@ import org.slf4j.LoggerFactory;
import java.util.concurrent.TimeUnit;
import org.testcontainers.containers.output.Slf4jLogConsumer;
-import org.testcontainers.images.builder.Transferable;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -259,11 +257,11 @@ public class OpcuaSubscriptionHandleTest {
Arguments.of(INT32_IDENTIFIER_READ_WRITE, Integer.class),
Arguments.of(INT64_IDENTIFIER_READ_WRITE, Long.class),
Arguments.of(INTEGER_IDENTIFIER_READ_WRITE, Integer.class),
- Arguments.of(SBYTE_IDENTIFIER_READ_WRITE, byte[].class),
+ Arguments.of(SBYTE_IDENTIFIER_READ_WRITE, Byte.class),
Arguments.of(STRING_IDENTIFIER_READ_WRITE, String.class),
Arguments.of(UINT16_IDENTIFIER_READ_WRITE, Integer.class),
Arguments.of(UINT32_IDENTIFIER_READ_WRITE, Long.class),
- Arguments.of(UINT64_IDENTIFIER_READ_WRITE, Long.class),
+ Arguments.of(UINT64_IDENTIFIER_READ_WRITE, BigInteger.class),
Arguments.of(UINTEGER_IDENTIFIER_READ_WRITE, Long.class)
);
}
