Revert "more linting"

This reverts commit 09671b2

Author: rahmabPublic

pkg/utils/xml.go

@@ -9,32 +9,35 @@ type XMLAttribute []xml.Attr
 
 // StripDuplicateAttr removes the duplicate Attributes from a []Attribute
 func StripDuplicateAttr(attr []xml.Attr) []xml.Attr {
-	attributeMap := make(map[xml.Name]string)
+	attributemap := make(map[xml.Name]string)
 	for _, a := range attr {
-		attributeMap[xml.Name{Space: a.Name.Space, Local: a.Name.Local}] = a.Value
+		attributemap[xml.Name{Space: a.Name.Space, Local: a.Name.Local}] = a.Value
 	}
 
 	var strippedAttr []xml.Attr
-	for k, v := range attributeMap {
+	for k, v := range attributemap {
 		strippedAttr = append(strippedAttr, xml.Attr{Name: k, Value: v})
 	}
 	return strippedAttr
 }
 
 // UnmarshalXML func for the XMLAttr struct
 func (xmlattr *XMLAttribute) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-	var newAttributes XMLAttribute
+	var newattributes XMLAttribute
 	for _, attr := range start.Attr {
-		newAttributes = append(newAttributes, xml.Attr{Name: attr.Name, Value: attr.Value})
+		switch attr.Name.Local {
+		default:
+			newattributes = append(newattributes, xml.Attr{Name: attr.Name, Value: attr.Value})
+		}
 	}
-	*xmlattr = newAttributes
+	*xmlattr = newattributes
 
 	for {
 		// if it got this far the XML is 'valid' and the xmlattr are set
 		// so we ignore the err
 		token, _ := d.Token()
-
-		if el, ok := token.(xml.EndElement); ok {
+		switch el := token.(type) {
+		case xml.EndElement:
 			if el == start.End() {
 				return nil
 			}

pkg/wfs200/capabilities.go

@@ -2,7 +2,6 @@ package wfs200
 
 import (
 	"encoding/xml"
-
 	"github.com/pdok/ogc-specifications/pkg/wsc110"
 )
 
@@ -165,7 +164,7 @@ type MetadataHref struct {
 // FilterCapabilities struct for the WFS 2.0.0
 type FilterCapabilities struct {
 	Conformance         Conformance         `xml:"fes:Conformance" yaml:"conformance"`
-	IDCapabilities      IDCapabilities      `xml:"fes:Id_Capabilities" yaml:"idCapabilities"`
+	IDCapabilities      IdCapabilities      `xml:"fes:Id_Capabilities" yaml:"idCapabilities"`
 	ScalarCapabilities  ScalarCapabilities  `xml:"fes:Scalar_Capabilities" yaml:"scalarCapabilities"`
 	SpatialCapabilities SpatialCapabilities `xml:"fes:Spatial_Capabilities" yaml:"spatialCapabilities"`
 	// NO TemporalCapabilities!!!
@@ -177,8 +176,8 @@ type Conformance struct {
 	Constraint []ValueConstraint `xml:"fes:Constraint" yaml:"constraint"`
 }
 
-// IDCapabilities struct for the WFS 2.0.0
-type IDCapabilities struct {
+// IdCapabilities struct for the WFS 2.0.0
+type IdCapabilities struct {
 	ResourceIdentifier ResourceIdentifier `xml:"fes:ResourceIdentifier" yaml:"resourceIdentifier"`
 }
 

pkg/wfs200/crs_test.go

@@ -68,11 +68,13 @@ func TestMarshalYAMLCrs(t *testing.T) {
 	}
 	for k, test := range tests {
 		yamlCRS, err := yaml.Marshal(test.CRS)
-
 		if err != nil {
 			t.Errorf("test: %d, yaml.Marshal failed with '%s'\n", k, err)
-		} else if stringCRS := string(yamlCRS); stringCRS != test.expectedYAML {
-			t.Errorf("test: %d, expected: %v+,\n got: %v+", k, test.expectedYAML, stringCRS)
+		} else {
+			stringCRS := string(yamlCRS)
+			if stringCRS != test.expectedYAML {
+				t.Errorf("test: %d, expected: %v+,\n got: %v+", k, test.expectedYAML, stringCRS)
+			}
 		}
 	}
 }

pkg/wfs200/describefeaturetype_request_pv.go

@@ -7,10 +7,10 @@ import (
 	"github.com/pdok/ogc-specifications/pkg/wsc110"
 )
 
-//nolint:govet
 type describeFeatureTypeRequestParameterValue struct {
 	service string `yaml:"service" json:"service"`
 	baseParameterValueRequest
+
 	typeName     *string `yaml:"typeName" json:"typeName"`         // [0..*]
 	outputFormat *string `yaml:"outputFormat" json:"outputFormat"` // default: "text/xml; subtype=gml/3.2"
 }
@@ -45,12 +45,13 @@ func (dpv *describeFeatureTypeRequestParameterValue) parseQueryParameters(query
 	return nil
 }
 
-func (dpv *describeFeatureTypeRequestParameterValue) parseDescribeFeatureTypeRequest(dft DescribeFeatureTypeRequest) {
+func (dpv *describeFeatureTypeRequestParameterValue) parseDescribeFeatureTypeRequest(dft DescribeFeatureTypeRequest) []wsc110.Exception {
 	dpv.request = describefeaturetype
 	dpv.version = dft.Version
 	dpv.service = dft.Service
 	dpv.typeName = dft.TypeNames
 	dpv.outputFormat = dft.OutputFormat
+	return nil
 }
 
 func (dpv describeFeatureTypeRequestParameterValue) toQueryParameters() url.Values {

pkg/wfs200/describefeaturetype_test.go

@@ -15,7 +15,6 @@ func TestDescribeFeatureTypeType(t *testing.T) {
 	}
 }
 
-//nolint:nestif
 func TestDescribeFeatureTypeParseXML(t *testing.T) {
 	var tests = []struct {
 		body      []byte
@@ -101,7 +100,6 @@ func TestDescribeFeatureTypeParseXML(t *testing.T) {
 	}
 }
 
-//nolint:nestif
 func TestDescribeFeatureTypeParseQueryParameters(t *testing.T) {
 	var tests = []struct {
 		query     url.Values

pkg/wfs200/exception.go

@@ -2,7 +2,6 @@ package wfs200
 
 import (
 	"encoding/xml"
-
 	"github.com/pdok/ogc-specifications/pkg/wsc110"
 )
 

pkg/wfs200/getcapabilities_request.go

@@ -25,15 +25,15 @@ func (g GetCapabilitiesRequest) Validate(_ wsc110.Capabilities) []wsc110.Excepti
 
 // ParseXML builds a GetCapabilities object based on a XML document
 func (g *GetCapabilitiesRequest) ParseXML(doc []byte) []wsc110.Exception {
-	var xmlAttributes utils.XMLAttribute
-	if err := xml.Unmarshal(doc, &xmlAttributes); err != nil {
+	var xmlattributes utils.XMLAttribute
+	if err := xml.Unmarshal(doc, &xmlattributes); err != nil {
 		return []wsc110.Exception{wsc110.NoApplicableCode("Could not process XML, is it XML?")}
 	}
 	if err := xml.Unmarshal(doc, &g); err != nil {
-		return []wsc110.Exception{wsc110.OperationNotSupported(err.Error())} // TODO Should be OperationParsingFailed
+		return []wsc110.Exception{wsc110.OperationNotSupported(err.Error())} //TODO Should be OperationParsingFailed
 	}
 	var n []xml.Attr
-	for _, a := range xmlAttributes {
+	for _, a := range xmlattributes {
 		switch strings.ToUpper(a.Name.Local) {
 		case VERSION:
 		case SERVICE:
@@ -50,7 +50,7 @@ func (g *GetCapabilitiesRequest) ParseXML(doc []byte) []wsc110.Exception {
 func (g *GetCapabilitiesRequest) ParseQueryParameters(query url.Values) []wsc110.Exception {
 	if len(query) == 0 {
 		// When there are no query value we know that at least
-		// the mandatory SERVICE and REQUEST parameter is missing.
+		// the manadorty SERVICE and REQUEST parameter is missing.
 		exceptions := wsc110.MissingParameterValue(SERVICE).ToExceptions()
 		exceptions = append(exceptions, wsc110.MissingParameterValue(REQUEST))
 		return exceptions
@@ -61,15 +61,15 @@ func (g *GetCapabilitiesRequest) ParseQueryParameters(query url.Values) []wsc110
 		return exception
 	}
 
-	if exception := g.parseGetCapabilitiesRequestParameterValue(gpv); exception != nil {
+	if exception := g.parsegetCapabilitiesRequestParameterValue(gpv); exception != nil {
 		return exception
 	}
 
 	return nil
 }
 
-// parseGetCapabilitiesRequestParameterValue process the simple struct to a complex struct
-func (g *GetCapabilitiesRequest) parseGetCapabilitiesRequestParameterValue(gpv getCapabilitiesRequestParameterValue) []wsc110.Exception {
+// parsegetCapabilitiesRequestParameterValue process the simple struct to a complex struct
+func (g *GetCapabilitiesRequest) parsegetCapabilitiesRequestParameterValue(gpv getCapabilitiesRequestParameterValue) []wsc110.Exception {
 	g.XMLName.Local = gpv.request
 	g.Service = gpv.service
 	g.Version = gpv.version

pkg/wfs200/getcapabilities_response.go

@@ -47,15 +47,15 @@ type GetCapabilitiesResponse struct {
 
 // Namespaces struct containing the namespaces needed for the XML document
 type Namespaces struct {
-	XmlnsGML           string `xml:"xmlns:gml,attr" yaml:"gml"`                                          // http://www.opengis.net/gml/3.2
-	XmlnsWFS           string `xml:"xmlns,attr" yaml:"wfs"`                                              // http://www.opengis.net/wfs/2.0
-	XmlnsOWS           string `xml:"xmlns:ows,attr" yaml:"common"`                                       // http://www.opengis.net/ows/1.1
-	XmlnsXlink         string `xml:"xmlns:xlink,attr" yaml:"xlink"`                                      // http://www.w3.org/1999/xlink
-	XmlnsXSI           string `xml:"xmlns:xsi,attr" yaml:"xsi"`                                          // http://www.w3.org/2001/XMLSchema-instance
-	XmlnsFes           string `xml:"xmlns:fes,attr" yaml:"fes"`                                          // http://www.opengis.net/fes/2.0
-	XmlnsInspireCommon string `xml:"xmlns:inspire_common,attr,omitempty" yaml:"inspireCommon,omitempty"` // http://inspire.ec.europa.eu/schemas/common/1.0
-	XmlnsInspireDls    string `xml:"xmlns:inspire_dls,attr,omitempty" yaml:"inspireDls,omitempty"`       // http://inspire.ec.europa.eu/schemas/inspire_dls/1.0
-	XmlnsPrefix        string `xml:"xmlns:{{.Prefix}},attr" yaml:"prefix"`                               // namespace_uri placeholder
+	XmlnsGML           string `xml:"xmlns:gml,attr" yaml:"gml"`                                          //http://www.opengis.net/gml/3.2
+	XmlnsWFS           string `xml:"xmlns,attr" yaml:"wfs"`                                              //http://www.opengis.net/wfs/2.0
+	XmlnsOWS           string `xml:"xmlns:ows,attr" yaml:"common"`                                       //http://www.opengis.net/ows/1.1
+	XmlnsXlink         string `xml:"xmlns:xlink,attr" yaml:"xlink"`                                      //http://www.w3.org/1999/xlink
+	XmlnsXSI           string `xml:"xmlns:xsi,attr" yaml:"xsi"`                                          //http://www.w3.org/2001/XMLSchema-instance
+	XmlnsFes           string `xml:"xmlns:fes,attr" yaml:"fes"`                                          //http://www.opengis.net/fes/2.0
+	XmlnsInspireCommon string `xml:"xmlns:inspire_common,attr,omitempty" yaml:"inspireCommon,omitempty"` //http://inspire.ec.europa.eu/schemas/common/1.0
+	XmlnsInspireDls    string `xml:"xmlns:inspire_dls,attr,omitempty" yaml:"inspireDls,omitempty"`       //http://inspire.ec.europa.eu/schemas/inspire_dls/1.0
+	XmlnsPrefix        string `xml:"xmlns:{{.Prefix}},attr" yaml:"prefix"`                               //namespace_uri placeholder
 	Version            string `xml:"version,attr" yaml:"version"`
 	SchemaLocation     string `xml:"xsi:schemaLocation,attr" yaml:"schemaLocation"`
 }

pkg/wfs200/getcapabilities_test.go

@@ -15,7 +15,6 @@ func TestGetCapabilitiesType(t *testing.T) {
 	}
 }
 
-//nolint:nestif
 func TestGetCapabilitiesParseXML(t *testing.T) {
 	var tests = []struct {
 		body      []byte