Fix compile errors in golang opcua driver.

Signed-off-by: Łukasz Dywicki <[email protected]>

plc4go/internal/opcua/Reader.go

@@ -93,10 +93,9 @@ func (m *Reader) readSync(ctx context.Context, readRequest apiModel.PlcReadReque
 		requestHeader,
 		0.0,
 		readWriteModel.TimestampsToReturn_timestampsToReturnNeither,
-		int32(len(readValueArray)),
 		readValueArray)
 
-	identifier, err := strconv.ParseUint(opcuaReadRequest.GetIdentifier(), 10, 16)
+	identifier, err := strconv.ParseUint(opcuaReadRequest.GetExtensionId(), 10, 16)
 	if err != nil {
 		result <- spiModel.NewDefaultPlcReadRequestResult(readRequest, nil, errors.Wrapf(err, "error parsing identifier"))
 		return

plc4go/internal/opcua/SecureChannel.go

@@ -364,7 +364,7 @@ func (s *SecureChannel) onConnectOpenSecureChannel(ctx context.Context, connecti
 			s.lifetime)
 	}
 
-	identifier, err := strconv.ParseUint(openSecureChannelRequest.GetIdentifier(), 10, 16)
+	identifier, err := strconv.ParseUint(openSecureChannelRequest.GetExtensionId(), 10, 16)
 	if err != nil {
 		s.log.Debug().Err(err).Msg("error parsing identifier")
 		connection.fireConnectionError(err, ch)
@@ -504,7 +504,6 @@ func (s *SecureChannel) onConnectCreateSessionRequest(ctx context.Context, conne
 		readWriteModel.NewPascalString("en"),
 		APPLICATION_TEXT)
 
-	noOfDiscoveryUrls := int32(-1)
 	var discoveryUrls []readWriteModel.PascalString
 
 	clientDescription := readWriteModel.NewApplicationDescription(APPLICATION_URI,
@@ -513,7 +512,6 @@ func (s *SecureChannel) onConnectCreateSessionRequest(ctx context.Context, conne
 		readWriteModel.ApplicationType_applicationTypeClient,
 		NULL_STRING,
 		NULL_STRING,
-		noOfDiscoveryUrls,
 		discoveryUrls)
 
 	createSessionRequest := readWriteModel.NewCreateSessionRequest(
@@ -528,7 +526,7 @@ func (s *SecureChannel) onConnectCreateSessionRequest(ctx context.Context, conne
 		0,
 	)
 
-	identifier, err := strconv.ParseUint(createSessionRequest.GetIdentifier(), 10, 16)
+	identifier, err := strconv.ParseUint(createSessionRequest.GetExtensionId(), 10, 16)
 	if err != nil {
 		s.log.Debug().Err(err).Msg("error parsing identifier")
 		connection.fireConnectionError(err, ch)
@@ -643,15 +641,13 @@ func (s *SecureChannel) onConnectActivateSessionRequest(ctx context.Context, con
 	activateSessionRequest := readWriteModel.NewActivateSessionRequest(
 		requestHeader,
 		clientSignature,
-		0,
 		nil,
-		0,
 		nil,
 		userIdentityToken,
 		clientSignature,
 	)
 
-	identifier, err := strconv.ParseUint(activateSessionRequest.GetIdentifier(), 10, 16)
+	identifier, err := strconv.ParseUint(activateSessionRequest.GetExtensionId(), 10, 16)
 	if err != nil {
 		s.log.Debug().Err(err).Msg("error parsing identifier")
 		connection.fireConnectionError(err, ch)
@@ -831,7 +827,7 @@ func (s *SecureChannel) onDisconnectCloseSecureChannel(ctx context.Context, conn
 
 	closeSecureChannelRequest := readWriteModel.NewCloseSecureChannelRequest(requestHeader)
 
-	identifier, err := strconv.ParseUint(closeSecureChannelRequest.GetIdentifier(), 10, 16)
+	identifier, err := strconv.ParseUint(closeSecureChannelRequest.GetExtensionId(), 10, 16)
 	if err != nil {
 		s.log.Debug().Err(err).Msg("error parsing identifier")
 		return
@@ -982,7 +978,7 @@ func (s *SecureChannel) onDiscoverOpenSecureChannel(ctx context.Context, codec *
 		s.lifetime,
 	)
 
-	identifier, err := strconv.ParseUint(openSecureChannelRequest.GetIdentifier(), 10, 16)
+	identifier, err := strconv.ParseUint(openSecureChannelRequest.GetExtensionId(), 10, 16)
 	if err != nil {
 		s.log.Debug().Err(err).Msg("error parsing identifier")
 		return
@@ -1110,12 +1106,10 @@ func (s *SecureChannel) onDiscoverGetEndpointsRequest(ctx context.Context, codec
 	endpointsRequest := readWriteModel.NewGetEndpointsRequest(
 		requestHeader,
 		s.endpoint,
-		0,
 		nil,
-		0,
 		nil)
 
-	identifier, err := strconv.ParseUint(endpointsRequest.GetIdentifier(), 10, 16)
+	identifier, err := strconv.ParseUint(endpointsRequest.GetExtensionId(), 10, 16)
 	if err != nil {
 		s.log.Debug().Err(err).Msg("error parsing identifier")
 		return
@@ -1239,7 +1233,7 @@ func (s *SecureChannel) onDiscoverCloseSecureChannel(ctx context.Context, codec
 
 	closeSecureChannelRequest := readWriteModel.NewCloseSecureChannelRequest(requestHeader)
 
-	identifier, err := strconv.ParseUint(closeSecureChannelRequest.GetIdentifier(), 10, 16)
+	identifier, err := strconv.ParseUint(closeSecureChannelRequest.GetExtensionId(), 10, 16)
 	if err != nil {
 		s.log.Debug().Err(err).Msg("error parsing identifier")
 		return
@@ -1361,7 +1355,7 @@ func (s *SecureChannel) keepAlive() {
 					NULL_BYTE_STRING,
 					uint32(s.lifetime))
 			}
-			identifier, err := strconv.ParseUint(openSecureChannelRequest.GetIdentifier(), 10, 16)
+			identifier, err := strconv.ParseUint(openSecureChannelRequest.GetExtensionId(), 10, 16)
 			if err != nil {
 				s.log.Error().Err(err).Msg("error parsing identifier")
 				return

plc4go/internal/opcua/Subscriber.go

@@ -143,7 +143,7 @@ func (s *Subscriber) onSubscribeCreateSubscription(ctx context.Context, cycleTim
 		0,
 	)
 
-	identifier, err := strconv.ParseUint(createSubscriptionRequest.GetIdentifier(), 10, 16)
+	identifier, err := strconv.ParseUint(createSubscriptionRequest.GetExtensionId(), 10, 16)
 	if err != nil {
 		return nil, errors.Wrapf(err, "error parsing identifier")
 	}

plc4go/internal/opcua/SubscriptionHandle.go

@@ -133,11 +133,10 @@ func (h *SubscriptionHandle) onSubscribeCreateMonitoredItemsRequest() (readWrite
 		requestHeader,
 		h.subscriptionId,
 		readWriteModel.TimestampsToReturn_timestampsToReturnBoth,
-		int32(len(requestList)),
 		requestList,
 	)
 
-	identifier, err := strconv.ParseUint(createMonitoredItemsRequest.GetIdentifier(), 10, 16)
+	identifier, err := strconv.ParseUint(createMonitoredItemsRequest.GetExtensionId(), 10, 16)
 	if err != nil {
 		return nil, errors.Wrapf(err, "error parsing identifier")
 	}
@@ -269,11 +268,10 @@ func (h *SubscriptionHandle) startSubscriber() {
 
 				publishRequest := readWriteModel.NewPublishRequest(
 					requestHeader,
-					int32(ackLength),
 					acks,
 				)
 
-				identifier, err := strconv.ParseUint(publishRequest.GetIdentifier(), 10, 16)
+				identifier, err := strconv.ParseUint(publishRequest.GetExtensionId(), 10, 16)
 				if err != nil {
 					h.log.Error().Err(err).Msg("error parsing identifier")
 					continue
@@ -384,11 +382,10 @@ func (h *SubscriptionHandle) stopSubscriber() {
 
 	subscriptions := []uint32{h.subscriptionId}
 	deleteSubscriptionrequest := readWriteModel.NewDeleteSubscriptionsRequest(requestHeader,
-		1,
 		subscriptions,
 	)
 
-	identifier, err := strconv.ParseUint(deleteSubscriptionrequest.GetIdentifier(), 10, 16)
+	identifier, err := strconv.ParseUint(deleteSubscriptionrequest.GetExtensionId(), 10, 16)
 	if err != nil {
 		h.log.Error().Err(err).Msg("error parsing identifier")
 		return

plc4go/internal/opcua/Writer.go

@@ -112,11 +112,10 @@ func (m *Writer) WriteSync(ctx context.Context, writeRequest apiModel.PlcWriteRe
 
 	opcuaWriteRequest := readWriteModel.NewWriteRequest(
 		requestHeader,
-		int32(len(writeValueArray)),
 		writeValueArray,
 	)
 
-	identifier, err := strconv.ParseUint(opcuaWriteRequest.GetIdentifier(), 10, 16)
+	identifier, err := strconv.ParseUint(opcuaWriteRequest.GetExtensionId(), 10, 16)
 	if err != nil {
 		result <- spiModel.NewDefaultPlcWriteRequestResult(writeRequest, nil, errors.Wrapf(err, "error parsing identifier"))
 		return