1965862236

Build # 1965862236

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/softlayer/softlayer-go/commit/<a class=hub.com/softlayer/softlayer-go/commit/<a class="double-link" href="https://git"><a class=hub.com/softlayer/softlayer-go/commit/<a class="double-link" href="https://git"><a class=hub.com/softlayer/softlayer-go/commit/<a class="double-link" href="https://git"><a class=hub.com/softlayer/softlayer-go/commit/<a class="double-link" href="https://git"><a class=hub.com/softlayer/softlayer-go/commit/026f464b9e1fbce7f34121943879128e8a8a5b35">026f464b9">&lt;a href=&quot;https://github.com/softlayer/softlayer-go/commit/</a><a class="double-link" href="https://github.com/softlayer/softlayer-go/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/softlayer/softlayer-go/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/softlayer/softlayer-go/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/softlayer/softlayer-go/commit/026f464b9e1fbce7f34121943879128e8a8a5b35">026f464b9</a><a href="https://github.com/softlayer/softlayer-go/commit/026f464b9e1fbce7f34121943879128e8a8a5b35">&lt;a href=&quot;https://github.com/softlayer/softlayer-go/commit/026f464b9e1fbce7f34121943879128e8a8a5b35&quot;&gt;&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/softlayer/softlayer-go/commit/&amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/softlayer/softlayer-go/commit/&amp;amp;lt;a class=&amp;amp;quot;double-link&amp;amp;quot; href=&amp;amp;quot;https://git&amp;quot;&amp;gt;&amp;amp;lt;a class=&amp;lt;/a&amp;gt;hub.com/softlayer/softlayer-go/commit/026f464b9e1fbce7f34121943879128e8a8a5b35&amp;quot;&amp;gt;026f464b9&amp;lt;/a&amp;gt;&amp;lt;a href=&amp;quot;https://github.com/softlayer/softlayer-go/commit/026f464b9e1fbce7f34121943879128e8a8a5b35&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/softlayer/softlayer-go/commit/026f464b9e1fbce7f34121943879128e&amp;lt;/a&amp;gt;8a8a5b35&amp;q</a>uot;&gt;&amp;quot;&amp;gt;Merge &amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/softlayer/softlayer-go/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/softlayer/softlayer-go/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/sof... (continued)

Pull Request Pull Request #166: nmashalJson for Container_Search_Result

Run Details

54 of 54 new or added lines in 2 files covered. (100.0%)

488 of 1303 relevant lines covered (37.45%)

3.09 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

38.46

/datatypes/softlayer.go

/**
 * Copyright 2016 IBM Corp.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *    http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package datatypes

import (
        "encoding/json"
        "errors"
        "fmt"
        "reflect"
        "strconv"
        "strings"
        "time"
)

// Void is a dummy type for identifying void return values from methods
type Void int

// Time type overrides the default json marshaler with the SoftLayer custom format
type Time struct {
        time.Time
}

func (r Time) String() string {
        return r.Time.Format(time.RFC3339)
}

// MarshalJSON returns the json encoding of the datatypes.Time receiver.  This
// override is necessary to ensure datetimes are formatted in the way SoftLayer
// expects - that is, using the RFC3339 format, without nanoseconds.
func (r Time) MarshalJSON() ([]byte, error) {
        return []byte(`"` + r.String() + `"`), nil
}

// MarshalText returns a text encoding of the datatypes.Time receiver.  This
// is mainly provided to complete what might be expected of a type that
// implements the Marshaler interface.
func (r Time) MarshalText() ([]byte, error) {
        return []byte(r.String()), nil
}

// FIXME: Need to have special unmarshaling of some values defined as float type
// in the metadata that actually come down as strings in the api.
// e.g. SoftLayer_Product_Item.capacity
// Float64 is a float type that deals with some of the oddities when
// unmarshalling from the SLAPI
//
// Code borrowed from https://github.com/sudorandom/softlayer-go/blob/master/slapi/types/float.go
type Float64 float64

// UnmarshalJSON statisied the json.Unmarshaler interface
func (f *Float64) UnmarshalJSON(data []byte) error {

        // Attempt parsing the float normally
        v, err := strconv.ParseFloat(string(data), 64)

        // Attempt parsing the float as a string
        if err != nil {
                if len(data) < 2 || data[0] != '"' || data[len(data)-1] != '"' {
                        return fmt.Errorf("malformed data")
                }

                v, err = strconv.ParseFloat(string(data[1:len(data)-1]), 64)
                if err != nil {
                        return err
                }
        }
        *f = Float64(v)
        return nil
}

// Used to set the appropriate complexType field in the passed product order.
// Employs reflection to determine the type of the passed value and use it
// to derive the complexType to send to SoftLayer.
func SetComplexType(v interface{}) error {
        orderDataPtr := reflect.ValueOf(v)
        if orderDataPtr.Type().Name() != "" {
                return errors.New("Did not pass a pointer to a product order.")
        }

        orderDataValue := reflect.Indirect(reflect.ValueOf(v))
        orderDataType := orderDataValue.Type().Name()
        if !strings.HasPrefix(orderDataType, "Container_Product_Order") {
                return fmt.Errorf("Did not pass a pointer to a product order: %s", orderDataType)
        }

        complexTypeField := orderDataValue.FieldByName("ComplexType")
        complexType := "SoftLayer_" + orderDataType
        complexTypeField.Set(reflect.ValueOf(&complexType))

        return nil
}

// Used for detecting the search result before the real unmarshalling can begin
type Result_Detector struct {
        // An array of terms that were matched in the resource object.
        MatchedTerms []string `json:"matchedTerms,omitempty" xmlrpc:"matchedTerms,omitempty"`
        // The score ratio of the result for relevance to the search criteria.
        RelevanceScore *Float64 `json:"relevanceScore,omitempty" xmlrpc:"relevanceScore,omitempty"`
        // A search results resource object that matched search criteria.
        Resource interface{} `json:"resource,omitempty" xmlrpc:"resource,omitempty"`
        // The type of the resource object that matched search criteria.
        ResourceType *string `json:"resourceType,omitempty" xmlrpc:"resourceType,omitempty"`
}

func (result *Container_Search_Result) UnmarshalJSON(data []byte) error {
        var detector Result_Detector
        err := json.Unmarshal(data, &detector)
        if err != nil {
                return err
        }
        if !strings.HasPrefix(*detector.ResourceType, "SoftLayer_") {
                return fmt.Errorf("Resource is not a SoftLayer_ Type, but instead is %v", *detector.ResourceType)
        }

        var theType interface{}
        switch *detector.ResourceType {
        case "SoftLayer_Virtual_Guest":
                theType = new(Virtual_Guest)
                // theType = reflect.New(reflect.TypeOf(Virtual_Guest{})).Interface().(*Virtual_Guest)
        case "SoftLayer_Event_Log":
                theType = new(Event_Log)
        case "SoftLayer_Virtual_DedicatedHost":
                theType = new(Virtual_DedicatedHost)
        case "SoftLayer_Hardware":
                theType = new(Hardware)
        case "SoftLayer_Network_Application_Delivery_Controller":
                theType = new(Network_Application_Delivery_Controller)
        case "SoftLayer_Network_Subnet_IpAddress":
                theType = new(Network_Subnet_IpAddress)
        case "SoftLayer_Network_Vlan":
                theType = new(Network_Vlan)
        case "SoftLayer_Network_Vlan_Firewall":
                theType = new(Network_Vlan_Firewall)
        case "SoftLayer_Ticket":
                theType = new(Ticket)
        }
        detector.Resource = theType
        err = json.Unmarshal(data, &detector)

        result.MatchedTerms = detector.MatchedTerms
        result.RelevanceScore = detector.RelevanceScore
        result.Resource = detector.Resource
        result.ResourceType = detector.ResourceType

        return nil
}

1	/**
2	* Copyright 2016 IBM Corp.
3	*
4	* Licensed under the Apache License, Version 2.0 (the "License");
5	* you may not use this file except in compliance with the License.
6	* You may obtain a copy of the License at
7	*
8	* http://www.apache.org/licenses/LICENSE-2.0
9	*
10	* Unless required by applicable law or agreed to in writing, software
11	* distributed under the License is distributed on an "AS IS" BASIS,
12	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13	* See the License for the specific language governing permissions and
14	* limitations under the License.
15	*/
16
17	package datatypes
18
19	import (
20	"encoding/json"
21	"errors"
22	"fmt"
23	"reflect"
24	"strconv"
25	"strings"
26	"time"
27	)
28
29	// Void is a dummy type for identifying void return values from methods
30	type Void int
31
32	// Time type overrides the default json marshaler with the SoftLayer custom format
33	type Time struct {
34	time.Time
35	}
36
37	func (r Time) String() string {	×
38	return r.Time.Format(time.RFC3339)	×
39	}	×
40
41	// MarshalJSON returns the json encoding of the datatypes.Time receiver. This
42	// override is necessary to ensure datetimes are formatted in the way SoftLayer
43	// expects - that is, using the RFC3339 format, without nanoseconds.
44	func (r Time) MarshalJSON() ([]byte, error) {	×
45	return []byte(`"` + r.String() + `"`), nil	×
46	}	×
47
48	// MarshalText returns a text encoding of the datatypes.Time receiver. This
49	// is mainly provided to complete what might be expected of a type that
50	// implements the Marshaler interface.
51	func (r Time) MarshalText() ([]byte, error) {	×
52	return []byte(r.String()), nil	×
53	}	×
54
55	// FIXME: Need to have special unmarshaling of some values defined as float type
56	// in the metadata that actually come down as strings in the api.
57	// e.g. SoftLayer_Product_Item.capacity
58	// Float64 is a float type that deals with some of the oddities when
59	// unmarshalling from the SLAPI
60	//
61	// Code borrowed from https://github.com/sudorandom/softlayer-go/blob/master/slapi/types/float.go
62	type Float64 float64
63
64	// UnmarshalJSON statisied the json.Unmarshaler interface
65	func (f *Float64) UnmarshalJSON(data []byte) error {	2✔
66		2✔
67	// Attempt parsing the float normally	2✔
68	v, err := strconv.ParseFloat(string(data), 64)	2✔
69		2✔
70	// Attempt parsing the float as a string	2✔
71	if err != nil {	4✔
72	if len(data) < 2 \|\| data[0] != '"' \|\| data[len(data)-1] != '"' {	2✔
73	return fmt.Errorf("malformed data")	×
74	}	×
75
76	v, err = strconv.ParseFloat(string(data[1:len(data)-1]), 64)	2✔
77	if err != nil {	2✔
78	return err	×
79	}	×
80	}
81	*f = Float64(v)	2✔
82	return nil	2✔
83	}
84
85	// Used to set the appropriate complexType field in the passed product order.
86	// Employs reflection to determine the type of the passed value and use it
87	// to derive the complexType to send to SoftLayer.
88	func SetComplexType(v interface{}) error {	×
89	orderDataPtr := reflect.ValueOf(v)	×
90	if orderDataPtr.Type().Name() != "" {	×
91	return errors.New("Did not pass a pointer to a product order.")	×
92	}	×
93
94	orderDataValue := reflect.Indirect(reflect.ValueOf(v))	×
95	orderDataType := orderDataValue.Type().Name()	×
96	if !strings.HasPrefix(orderDataType, "Container_Product_Order") {	×
97	return fmt.Errorf("Did not pass a pointer to a product order: %s", orderDataType)	×
98	}	×
99
100	complexTypeField := orderDataValue.FieldByName("ComplexType")	×
101	complexType := "SoftLayer_" + orderDataType	×
102	complexTypeField.Set(reflect.ValueOf(&complexType))	×
103		×
104	return nil	×
105	}
106
107	// Used for detecting the search result before the real unmarshalling can begin
108	type Result_Detector struct {
109	// An array of terms that were matched in the resource object.
110	MatchedTerms []string `json:"matchedTerms,omitempty" xmlrpc:"matchedTerms,omitempty"`
111	// The score ratio of the result for relevance to the search criteria.
112	RelevanceScore *Float64 `json:"relevanceScore,omitempty" xmlrpc:"relevanceScore,omitempty"`
113	// A search results resource object that matched search criteria.
114	Resource interface{} `json:"resource,omitempty" xmlrpc:"resource,omitempty"`
115	// The type of the resource object that matched search criteria.
116	ResourceType *string `json:"resourceType,omitempty" xmlrpc:"resourceType,omitempty"`
117	}
118
119	func (result *Container_Search_Result) UnmarshalJSON(data []byte) error {	1✔
120	var detector Result_Detector	1✔
121	err := json.Unmarshal(data, &detector)	1✔
122	if err != nil {	1✔
123	return err	×
124	}	×
125	if !strings.HasPrefix(*detector.ResourceType, "SoftLayer_") {	1✔
126	return fmt.Errorf("Resource is not a SoftLayer_ Type, but instead is %v", *detector.ResourceType)	×
127	}	×
128
129	var theType interface{}	1✔
130	switch *detector.ResourceType {	1✔
131	case "SoftLayer_Virtual_Guest":	1✔
132	theType = new(Virtual_Guest)	1✔
133	// theType = reflect.New(reflect.TypeOf(Virtual_Guest{})).Interface().(*Virtual_Guest)
134	case "SoftLayer_Event_Log":	×
135	theType = new(Event_Log)	×
136	case "SoftLayer_Virtual_DedicatedHost":	×
137	theType = new(Virtual_DedicatedHost)	×
138	case "SoftLayer_Hardware":	×
139	theType = new(Hardware)	×
140	case "SoftLayer_Network_Application_Delivery_Controller":	×
141	theType = new(Network_Application_Delivery_Controller)	×
142	case "SoftLayer_Network_Subnet_IpAddress":	×
143	theType = new(Network_Subnet_IpAddress)	×
144	case "SoftLayer_Network_Vlan":	×
145	theType = new(Network_Vlan)	×
146	case "SoftLayer_Network_Vlan_Firewall":	×
147	theType = new(Network_Vlan_Firewall)	×
148	case "SoftLayer_Ticket":	×
149	theType = new(Ticket)	×
150	}
151	detector.Resource = theType	1✔
152	err = json.Unmarshal(data, &detector)	1✔
153		1✔
154	result.MatchedTerms = detector.MatchedTerms	1✔
155	result.RelevanceScore = detector.RelevanceScore	1✔
156	result.Resource = detector.Resource	1✔
157	result.ResourceType = detector.ResourceType	1✔
158		1✔
159	return nil	1✔
160	}

softlayer / softlayer-go / 1965862236

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous