Skip to content

Commit

Permalink
refactor(plc4go): code QC
Browse files Browse the repository at this point in the history
  • Loading branch information
@sruehl
sruehl committed May 4, 2023
1 parent f605319 commit 61a7ff0
Show file tree
Hide file tree
Showing 22 changed files with 69 additions and 81 deletions.
2 changes: 1 addition & 1 deletion plc4go/internal/ads/Browser.go
View file
Expand Up @@ -108,7 +108,7 @@ func (m *Connection) filterDataTypes(parentName string, currentType driverModel.
if len(remainingAddressSegments) == 0 {
arrayInfo := []apiModel.ArrayInfo{}
for _, ai := range currentType.GetArrayInfo() {
arrayInfo = append(arrayInfo, internalModel.DefaultArrayInfo{
arrayInfo = append(arrayInfo, &internalModel.DefaultArrayInfo{
LowerBound: ai.GetLowerBound(),
UpperBound: ai.GetUpperBound(),
})
Expand Down
2 changes: 1 addition & 1 deletion plc4go/internal/ads/Connection.go
View file
Expand Up @@ -319,7 +319,7 @@ func (m *Connection) resolveSymbolicAddress(ctx context.Context, addressParts []
if len(addressParts) == 0 {
var arrayInfo []apiModel.ArrayInfo
for _, adsArrayInfo := range curDataType.GetArrayInfo() {
arrayInfo = append(arrayInfo, internalModel.DefaultArrayInfo{
arrayInfo = append(arrayInfo, &internalModel.DefaultArrayInfo{
LowerBound: adsArrayInfo.GetLowerBound(),
UpperBound: adsArrayInfo.GetUpperBound(),
})
Expand Down
2 changes: 1 addition & 1 deletion plc4go/internal/ads/DriverContext.go
View file
Expand Up @@ -163,7 +163,7 @@ func (m *DriverContext) getArrayInfoForDataTypeTableEntry(entry driverModel.AdsD
LowerBound: adsArrayInfo.GetLowerBound(),
UpperBound: adsArrayInfo.GetUpperBound(),
}
arrayInfos = append(arrayInfos, arrayInfo)
arrayInfos = append(arrayInfos, &arrayInfo)
}
return arrayInfos
}
Expand Down
18 changes: 9 additions & 9 deletions plc4go/internal/ads/TagHandler.go
View file
Expand Up @@ -140,7 +140,7 @@ func (m TagHandler) ParseTag(query string) (apiModel.PlcTag, error) {
if err != nil {
return nil, fmt.Errorf("error parsing array info: %s, got error: %v", currentSegment, err)
}
arrayInfo = append(arrayInfo, model2.DefaultArrayInfo{
arrayInfo = append(arrayInfo, &model2.DefaultArrayInfo{
LowerBound: startElement,
UpperBound: endElement,
})
Expand All @@ -153,7 +153,7 @@ func (m TagHandler) ParseTag(query string) (apiModel.PlcTag, error) {
if err != nil {
return nil, fmt.Errorf("error parsing array info: %s, got error: %v", currentSegment, err)
}
arrayInfo = append(arrayInfo, model2.DefaultArrayInfo{
arrayInfo = append(arrayInfo, &model2.DefaultArrayInfo{
LowerBound: startElement,
UpperBound: startElement + numElements,
})
Expand All @@ -162,7 +162,7 @@ func (m TagHandler) ParseTag(query string) (apiModel.PlcTag, error) {
if err != nil {
return nil, fmt.Errorf("error parsing array info: %s, got error: %v", currentSegment, err)
}
arrayInfo = append(arrayInfo, model2.DefaultArrayInfo{
arrayInfo = append(arrayInfo, &model2.DefaultArrayInfo{
LowerBound: 0,
UpperBound: numElements,
})
Expand Down Expand Up @@ -240,7 +240,7 @@ func (m TagHandler) ParseTag(query string) (apiModel.PlcTag, error) {
if err != nil {
return nil, fmt.Errorf("error parsing array info: %s, got error: %v", currentSegment, err)
}
arrayInfo = append(arrayInfo, model2.DefaultArrayInfo{
arrayInfo = append(arrayInfo, &model2.DefaultArrayInfo{
LowerBound: startElement,
UpperBound: endElement,
})
Expand All @@ -253,7 +253,7 @@ func (m TagHandler) ParseTag(query string) (apiModel.PlcTag, error) {
if err != nil {
return nil, fmt.Errorf("error parsing array info: %s, got error: %v", currentSegment, err)
}
arrayInfo = append(arrayInfo, model2.DefaultArrayInfo{
arrayInfo = append(arrayInfo, &model2.DefaultArrayInfo{
LowerBound: startElement,
UpperBound: startElement + numElements,
})
Expand All @@ -262,7 +262,7 @@ func (m TagHandler) ParseTag(query string) (apiModel.PlcTag, error) {
if err != nil {
return nil, fmt.Errorf("error parsing array info: %s, got error: %v", currentSegment, err)
}
arrayInfo = append(arrayInfo, model2.DefaultArrayInfo{
arrayInfo = append(arrayInfo, &model2.DefaultArrayInfo{
LowerBound: 0,
UpperBound: numElements,
})
Expand Down Expand Up @@ -295,7 +295,7 @@ func (m TagHandler) ParseTag(query string) (apiModel.PlcTag, error) {
if err != nil {
return nil, fmt.Errorf("error parsing array info: %s, got error: %v", currentSegment, err)
}
arrayInfo = append(arrayInfo, model2.DefaultArrayInfo{
arrayInfo = append(arrayInfo, &model2.DefaultArrayInfo{
LowerBound: startElement,
UpperBound: endElement,
})
Expand All @@ -308,7 +308,7 @@ func (m TagHandler) ParseTag(query string) (apiModel.PlcTag, error) {
if err != nil {
return nil, fmt.Errorf("error parsing array info: %s, got error: %v", currentSegment, err)
}
arrayInfo = append(arrayInfo, model2.DefaultArrayInfo{
arrayInfo = append(arrayInfo, &model2.DefaultArrayInfo{
LowerBound: startElement,
UpperBound: startElement + numElements,
})
Expand All @@ -317,7 +317,7 @@ func (m TagHandler) ParseTag(query string) (apiModel.PlcTag, error) {
if err != nil {
return nil, fmt.Errorf("error parsing array info: %s, got error: %v", currentSegment, err)
}
arrayInfo = append(arrayInfo, model2.DefaultArrayInfo{
arrayInfo = append(arrayInfo, &model2.DefaultArrayInfo{
LowerBound: 0,
UpperBound: numElements,
})
Expand Down
30 changes: 15 additions & 15 deletions plc4go/internal/ads/TagHandler_test.go
View file
Expand Up @@ -113,7 +113,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.DirectPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 0,
UpperBound: 42,
},
Expand All @@ -133,7 +133,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.DirectPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 0,
UpperBound: 42,
},
Expand All @@ -153,7 +153,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.DirectPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 0,
UpperBound: 42,
},
Expand All @@ -173,7 +173,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.DirectPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 0,
UpperBound: 42,
},
Expand All @@ -193,7 +193,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.SymbolicPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 0,
UpperBound: 42,
},
Expand All @@ -211,7 +211,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.DirectPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 23,
UpperBound: 42,
},
Expand All @@ -231,7 +231,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.DirectPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 23,
UpperBound: 42,
},
Expand All @@ -251,7 +251,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.DirectPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 23,
UpperBound: 42,
},
Expand All @@ -271,7 +271,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.DirectPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 23,
UpperBound: 42,
},
Expand All @@ -291,7 +291,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.SymbolicPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 23,
UpperBound: 42,
},
Expand All @@ -309,7 +309,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.DirectPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 23,
UpperBound: 65,
},
Expand All @@ -329,7 +329,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.DirectPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 23,
UpperBound: 65,
},
Expand All @@ -349,7 +349,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.DirectPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 23,
UpperBound: 65,
},
Expand All @@ -369,7 +369,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.DirectPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 23,
UpperBound: 65,
},
Expand All @@ -389,7 +389,7 @@ func TestTagHandler_ParseQuery(t *testing.T) {
want: model2.SymbolicPlcTag{
PlcTag: model2.PlcTag{
ArrayInfo: []model.ArrayInfo{
model3.DefaultArrayInfo{
&model3.DefaultArrayInfo{
LowerBound: 23,
UpperBound: 65,
},
Expand Down
2 changes: 1 addition & 1 deletion plc4go/internal/ads/Writer.go
View file
Expand Up @@ -320,7 +320,7 @@ func (m *Connection) serializePlcValue(dataType driverModel.AdsDataTypeTableEntr
}
var childArrayInfo []apiModel.ArrayInfo
for _, adsArrayInfo := range childDataType.GetArrayInfo() {
childArrayInfo = append(childArrayInfo, internalModel.DefaultArrayInfo{
childArrayInfo = append(childArrayInfo, &internalModel.DefaultArrayInfo{
LowerBound: adsArrayInfo.GetLowerBound(),
UpperBound: adsArrayInfo.GetUpperBound(),
})
Expand Down
2 changes: 1 addition & 1 deletion plc4go/internal/cbus/Query.go
View file
Expand Up @@ -76,7 +76,7 @@ func (u unitInfoQuery) GetArrayInfo() []apiModel.ArrayInfo {
return []apiModel.ArrayInfo{}
}
return []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{
&spiModel.DefaultArrayInfo{
LowerBound: 0,
UpperBound: uint32(u.numElements),
},
Expand Down
2 changes: 1 addition & 1 deletion plc4go/internal/cbus/Query_test.go
View file
Expand Up @@ -84,7 +84,7 @@ func Test_unitInfoQuery_GetArrayInfo(t *testing.T) {
numElements: 2,
},
want: []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{
&spiModel.DefaultArrayInfo{
LowerBound: 0,
UpperBound: 2,
},
Expand Down
14 changes: 7 additions & 7 deletions plc4go/internal/cbus/Tag.go
View file
Expand Up @@ -286,7 +286,7 @@ func (s statusTag) GetValueType() apiValues.PlcValueType {
func (s statusTag) GetArrayInfo() []apiModel.ArrayInfo {
if s.numElements != 1 {
return []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{
&spiModel.DefaultArrayInfo{
LowerBound: 0,
UpperBound: uint32(s.numElements),
},
Expand Down Expand Up @@ -427,7 +427,7 @@ func (c calRecallTag) GetValueType() apiValues.PlcValueType {
func (c calRecallTag) GetArrayInfo() []apiModel.ArrayInfo {
if c.count != 1 {
return []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{
&spiModel.DefaultArrayInfo{
LowerBound: 0,
UpperBound: uint32(c.count),
},
Expand Down Expand Up @@ -494,7 +494,7 @@ func (c calIdentifyTag) GetValueType() apiValues.PlcValueType {
func (c calIdentifyTag) GetArrayInfo() []apiModel.ArrayInfo {
if c.numElements != 1 {
return []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{
&spiModel.DefaultArrayInfo{
LowerBound: 0,
UpperBound: uint32(c.numElements),
},
Expand Down Expand Up @@ -561,7 +561,7 @@ func (c calGetStatusTag) GetValueType() apiValues.PlcValueType {
func (c calGetStatusTag) GetArrayInfo() []apiModel.ArrayInfo {
if c.count != 1 {
return []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{
&spiModel.DefaultArrayInfo{
LowerBound: 0,
UpperBound: uint32(c.count),
},
Expand Down Expand Up @@ -636,7 +636,7 @@ func (s salTag) GetValueType() apiValues.PlcValueType {
func (s salTag) GetArrayInfo() []apiModel.ArrayInfo {
if s.numElements != 1 {
return []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{
&spiModel.DefaultArrayInfo{
LowerBound: 0,
UpperBound: uint32(s.numElements),
},
Expand Down Expand Up @@ -717,7 +717,7 @@ func (s salMonitorTag) GetValueType() apiValues.PlcValueType {
func (s salMonitorTag) GetArrayInfo() []apiModel.ArrayInfo {
if s.numElements != 1 {
return []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{
&spiModel.DefaultArrayInfo{
LowerBound: 0,
UpperBound: uint32(s.numElements),
},
Expand Down Expand Up @@ -795,7 +795,7 @@ func (m mmiMonitorTag) GetValueType() apiValues.PlcValueType {
func (m mmiMonitorTag) GetArrayInfo() []apiModel.ArrayInfo {
if m.numElements != 1 {
return []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{
&spiModel.DefaultArrayInfo{
LowerBound: 0,
UpperBound: uint32(m.numElements),
},
Expand Down
14 changes: 7 additions & 7 deletions plc4go/internal/cbus/Tag_test.go
View file
Expand Up @@ -291,7 +291,7 @@ func Test_calGetStatusTag_GetArrayInfo(t *testing.T) {
{
name: "get array info",
want: []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{},
&spiModel.DefaultArrayInfo{},
},
},
{
Expand Down Expand Up @@ -607,7 +607,7 @@ func Test_calIdentifyTag_GetArrayInfo(t *testing.T) {
{
name: "get empty array info",
want: []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{},
&spiModel.DefaultArrayInfo{},
},
},
{
Expand Down Expand Up @@ -880,7 +880,7 @@ func Test_calRecallTag_GetArrayInfo(t *testing.T) {
{
name: "empty array info",
want: []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{},
&spiModel.DefaultArrayInfo{},
},
},
{
Expand Down Expand Up @@ -1388,7 +1388,7 @@ func Test_mmiMonitorTag_GetArrayInfo(t *testing.T) {
{
name: "mmi monitor tag",
want: []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{},
&spiModel.DefaultArrayInfo{},
},
},
{
Expand Down Expand Up @@ -1704,7 +1704,7 @@ func Test_salMonitorTag_GetArrayInfo(t *testing.T) {
{
name: "get empty array info",
want: []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{},
&spiModel.DefaultArrayInfo{},
},
},
{
Expand Down Expand Up @@ -2014,7 +2014,7 @@ func Test_salTag_GetArrayInfo(t *testing.T) {
{
name: "get empty array info",
want: []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{},
&spiModel.DefaultArrayInfo{},
},
},
{
Expand Down Expand Up @@ -2415,7 +2415,7 @@ func Test_statusTag_GetArrayInfo(t *testing.T) {
{
name: "get empty array info",
want: []apiModel.ArrayInfo{
spiModel.DefaultArrayInfo{},
&spiModel.DefaultArrayInfo{},
},
},
{
Expand Down

0 comments on commit 61a7ff0

Please sign in to comment.