From a6491a35c31a74224aef167ae75499886986974d Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 4 Jul 2017 07:18:55 +0100 Subject: [PATCH] refactor: remove unnecessary Copy() code --- render/detailed/metadata_test.go | 26 -------------------------- report/metadata_template.go | 12 +----------- report/metric_template.go | 7 +------ test/utils/prune.go | 2 +- 4 files changed, 3 insertions(+), 44 deletions(-) diff --git a/render/detailed/metadata_test.go b/render/detailed/metadata_test.go index ae7715cb3..180e1c39c 100644 --- a/render/detailed/metadata_test.go +++ b/render/detailed/metadata_test.go @@ -47,29 +47,3 @@ func TestNodeMetadata(t *testing.T) { } } } - -func TestMetadataRowCopy(t *testing.T) { - var ( - row = report.MetadataRow{ - ID: "id", - Value: "value", - Priority: 1, - Datatype: "datatype", - } - cp = row.Copy() - ) - - // copy should be identical - if !reflect.DeepEqual(row, cp) { - t.Error(test.Diff(row, cp)) - } - - // changing the copy should not change the original - cp.ID = "" - cp.Value = "" - cp.Priority = 2 - cp.Datatype = "" - if row.ID != "id" || row.Value != "value" || row.Priority != 1 || row.Datatype != "datatype" { - t.Errorf("Expected changing the copy not to modify the original") - } -} diff --git a/report/metadata_template.go b/report/metadata_template.go index 1775eb4a4..1bee5e642 100644 --- a/report/metadata_template.go +++ b/report/metadata_template.go @@ -28,11 +28,6 @@ type MetadataTemplate struct { From string `json:"from,omitempty"` // Defines how to get the value from a report node } -// Copy returns a value-copy of the template -func (t MetadataTemplate) Copy() MetadataTemplate { - return t -} - // MetadataRows returns the rows for a node func (t MetadataTemplate) MetadataRows(n Node) []MetadataRow { from := fromDefault @@ -90,11 +85,6 @@ type MetadataRow struct { Truncate int `json:"truncate,omitempty"` } -// Copy returns a value copy of a metadata row. -func (m MetadataRow) Copy() MetadataRow { - return m -} - // MetadataTemplates is a mergeable set of metadata templates type MetadataTemplates map[string]MetadataTemplate @@ -115,7 +105,7 @@ func (e MetadataTemplates) Copy() MetadataTemplates { } result := MetadataTemplates{} for k, v := range e { - result[k] = v.Copy() + result[k] = v } return result } diff --git a/report/metric_template.go b/report/metric_template.go index 2c093aac0..9e2d441f0 100644 --- a/report/metric_template.go +++ b/report/metric_template.go @@ -34,11 +34,6 @@ func (t MetricTemplate) MetricRows(n Node) []MetricRow { return []MetricRow{row} } -// Copy returns a value-copy of the metric template -func (t MetricTemplate) Copy() MetricTemplate { - return t -} - // MetricTemplates is a mergeable set of metric templates type MetricTemplates map[string]MetricTemplate @@ -59,7 +54,7 @@ func (e MetricTemplates) Copy() MetricTemplates { } result := MetricTemplates{} for k, v := range e { - result[k] = v.Copy() + result[k] = v } return result } diff --git a/test/utils/prune.go b/test/utils/prune.go index 8e158636a..42a8aa268 100644 --- a/test/utils/prune.go +++ b/test/utils/prune.go @@ -25,6 +25,6 @@ func PruneNode(node report.Node) report.Node { return report.MakeNode( node.ID). WithTopology(node.Topology). - WithAdjacent(node.Adjacency.Copy()...). + WithAdjacent(node.Adjacency...). WithChildren(prunedChildren) }