Fix JSON definitions

Signed-off-by: Andy Lo-A-Foe <andy.loafoe@gmail.com>

Author: loafoe

dicom/config_service_remote_nodes.go

@@ -10,19 +10,15 @@ import (
 
 // NetworkConnection
 type NetworkConnection struct {
-	Port             int    `json:"port,omitempty"`
-	HostName         string `json:"hostName,omitempty"`
-	IPAddress        string `json:"ipAddress,omitempty"`
-	DisableIPv6      bool   `json:"disableIpv6,omitempty"`
-	AdvancedSettings struct {
-		PDULength              int `json:"pduLength,omitempty"`
-		ArtimTimeOut           int `json:"artimTimeOut,omitempty"`
-		AssociationIdleTimeOut int `json:"associationIdleTimeOut,omitempty"`
-	} `json:"advancedSettings,omitempty"`
-	CertificateInfo               CertificateInfo `json:"certificateInfo,omitempty"`
-	AuthenticateClientCertificate bool            `json:"authenticateClientCertificate,omitempty"`
-	NetworkTimeout                int             `json:"networkTimeout,omitempty"`
-	IsSecure                      bool            `json:"isSecure"`
+	Port                          int               `json:"port,omitempty"`
+	HostName                      string            `json:"hostName,omitempty"`
+	IPAddress                     string            `json:"ipAddress,omitempty"`
+	DisableIPv6                   bool              `json:"disableIpv6,omitempty"`
+	AdvancedSettings              *AdvancedSettings `json:"advancedSettings,omitempty"`
+	CertificateInfo               *CertificateInfo  `json:"certificateInfo,omitempty"`
+	AuthenticateClientCertificate bool              `json:"authenticateClientCertificate,omitempty"`
+	NetworkTimeout                int               `json:"networkTimeout,omitempty"`
+	IsSecure                      bool              `json:"isSecure"`
 }
 
 type CertificateInfo struct {

dicom/config_service_store_service.go

@@ -8,17 +8,17 @@ import (
 
 // AdvancedSettings
 type AdvancedSettings struct {
-	PDULength              int `json:"pduLength"`
-	ArtimTimeout           int `json:"artimTimeout"`
-	AssociationIdleTimeout int `json:"associationIdleTimeout"`
+	PDULength              int `json:"pduLength,omitempty"`
+	ArtimTimeout           int `json:"artimTimeout,omitempty"`
+	AssociationIdleTimeout int `json:"associationIdleTimeout,omitempty"`
 }
 
 // ApplicationEntity
 type ApplicationEntity struct {
-	AllowAny           bool               `json:"allowAny"`
-	AeTitle            string             `json:"aeTitle"`
-	OrganizationID     string             `json:"organizationId"`
-	AdditionalSettings AdditionalSettings `json:"additionalSettings"`
+	AllowAny           bool                `json:"allowAny"`
+	AeTitle            string              `json:"aeTitle"`
+	OrganizationID     string              `json:"organizationId"`
+	AdditionalSettings *AdditionalSettings `json:"additionalSettings"`
 }
 
 type AdditionalSettings struct {
@@ -30,8 +30,8 @@ type SCPConfig struct {
 	ID                        string              `json:"id,omitempty"`
 	Title                     string              `json:"title"`
 	Description               string              `json:"description,omitempty"`
-	UnSecureNetworkConnection NetworkConnection   `json:"unSecureNetworkConnection,omitempty"`
-	SecureNetworkConnection   NetworkConnection   `json:"secureNetworkConnection,omitempty"`
+	UnSecureNetworkConnection *NetworkConnection  `json:"unSecureNetworkConnection,omitempty"`
+	SecureNetworkConnection   *NetworkConnection  `json:"secureNetworkConnection,omitempty"`
 	ApplicationEntities       []ApplicationEntity `json:"applicationEntities,omitempty"`
 	// TODO: TransferCapability
 }