Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions any.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,6 @@ func NewEnvAnyVariable(name string) EnvAny {
}
}

// UnmarshalJSON implements json.Unmarshaler.
func (ev *EnvAny) UnmarshalJSON(b []byte) error {
type Plain EnvAny

var rawValue Plain

err := json.Unmarshal(b, &rawValue)
if err != nil {
return err
}

*ev = EnvAny(rawValue)

return nil
}

// IsZero checks if the instance is empty.
func (ev EnvAny) IsZero() bool {
return (ev.Variable == nil || *ev.Variable == "") &&
Expand Down
85 changes: 0 additions & 85 deletions environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
package goenvconf

import (
"encoding/json"
"errors"
"os"
"strconv"
Expand Down Expand Up @@ -39,27 +38,6 @@ func NewEnvStringVariable(name string) EnvString {
}
}

// UnmarshalJSON implements json.Unmarshaler.
func (ev *EnvString) UnmarshalJSON(b []byte) error {
type Plain EnvString

var rawValue Plain

err := json.Unmarshal(b, &rawValue)
if err != nil {
return err
}

value := EnvString(rawValue)
if value.IsZero() {
return ErrEnvironmentValueRequired
}

*ev = value

return nil
}

// IsZero checks if the instance is empty.
func (ev EnvString) IsZero() bool {
return (ev.Variable == nil || *ev.Variable == "") &&
Expand Down Expand Up @@ -185,27 +163,6 @@ func (ev EnvInt) Equal(target EnvInt) bool {
(ev.Variable != nil && target.Variable != nil && *ev.Variable == *target.Variable)
}

// UnmarshalJSON implements json.Unmarshaler.
func (ev *EnvInt) UnmarshalJSON(b []byte) error {
type Plain EnvInt

var rawValue Plain

err := json.Unmarshal(b, &rawValue)
if err != nil {
return err
}

value := EnvInt(rawValue)
if value.IsZero() {
return ErrEnvironmentValueRequired
}

*ev = value

return nil
}

// Get gets literal value or from system environment.
func (ev EnvInt) Get() (int64, error) {
if ev.IsZero() {
Expand Down Expand Up @@ -310,27 +267,6 @@ func (ev EnvBool) Equal(target EnvBool) bool {
(ev.Variable != nil && target.Variable != nil && *ev.Variable == *target.Variable)
}

// UnmarshalJSON implements json.Unmarshaler.
func (ev *EnvBool) UnmarshalJSON(b []byte) error {
type Plain EnvBool

var rawValue Plain

err := json.Unmarshal(b, &rawValue)
if err != nil {
return err
}

value := EnvBool(rawValue)
if value.IsZero() {
return ErrEnvironmentValueRequired
}

*ev = value

return nil
}

// Get gets literal value or from system environment.
func (ev EnvBool) Get() (bool, error) {
if ev.IsZero() {
Expand Down Expand Up @@ -435,27 +371,6 @@ func (ev EnvFloat) Equal(target EnvFloat) bool {
(ev.Variable != nil && target.Variable != nil && *ev.Variable == *target.Variable)
}

// UnmarshalJSON implements json.Unmarshaler.
func (ev *EnvFloat) UnmarshalJSON(b []byte) error {
type Plain EnvFloat

var rawValue Plain

err := json.Unmarshal(b, &rawValue)
if err != nil {
return err
}

value := EnvFloat(rawValue)
if value.IsZero() {
return ErrEnvironmentValueRequired
}

*ev = value

return nil
}

// Get gets literal value or from system environment.
func (ev EnvFloat) Get() (float64, error) {
if ev.IsZero() {
Expand Down
65 changes: 0 additions & 65 deletions map.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package goenvconf

import (
"encoding/json"
"maps"
"os"
)
Expand Down Expand Up @@ -52,22 +51,6 @@ func (ev EnvMapString) Equal(target EnvMapString) bool {
(ev.Value != nil && target.Value != nil && maps.Equal(ev.Value, target.Value))
}

// UnmarshalJSON implements json.Unmarshaler.
func (ev *EnvMapString) UnmarshalJSON(b []byte) error {
type Plain EnvMapString

var rawValue Plain

err := json.Unmarshal(b, &rawValue)
if err != nil {
return err
}

*ev = EnvMapString(rawValue)

return nil
}

// Get gets literal value or from system environment.
func (ev EnvMapString) Get() (map[string]string, error) {
if ev.Variable != nil && *ev.Variable != "" {
Expand Down Expand Up @@ -142,22 +125,6 @@ func (ev EnvMapInt) Equal(target EnvMapInt) bool {
(ev.Value != nil && target.Value != nil && maps.Equal(ev.Value, target.Value))
}

// UnmarshalJSON implements json.Unmarshaler.
func (ev *EnvMapInt) UnmarshalJSON(b []byte) error {
type Plain EnvMapInt

var rawValue Plain

err := json.Unmarshal(b, &rawValue)
if err != nil {
return err
}

*ev = EnvMapInt(rawValue)

return nil
}

// Get gets literal value or from system environment.
func (ev EnvMapInt) Get() (map[string]int64, error) {
if ev.Variable != nil && *ev.Variable != "" {
Expand Down Expand Up @@ -232,22 +199,6 @@ func (ev EnvMapFloat) Equal(target EnvMapFloat) bool {
(ev.Value != nil && target.Value != nil && maps.Equal(ev.Value, target.Value))
}

// UnmarshalJSON implements json.Unmarshaler.
func (ev *EnvMapFloat) UnmarshalJSON(b []byte) error {
type Plain EnvMapFloat

var rawValue Plain

err := json.Unmarshal(b, &rawValue)
if err != nil {
return err
}

*ev = EnvMapFloat(rawValue)

return nil
}

// Get gets literal value or from system environment.
func (ev EnvMapFloat) Get() (map[string]float64, error) {
if ev.Variable != nil && *ev.Variable != "" {
Expand Down Expand Up @@ -322,22 +273,6 @@ func (ev EnvMapBool) Equal(target EnvMapBool) bool {
(ev.Value != nil && target.Value != nil && maps.Equal(ev.Value, target.Value))
}

// UnmarshalJSON implements json.Unmarshaler.
func (ev *EnvMapBool) UnmarshalJSON(b []byte) error {
type Plain EnvMapBool

var rawValue Plain

err := json.Unmarshal(b, &rawValue)
if err != nil {
return err
}

*ev = EnvMapBool(rawValue)

return nil
}

// Get gets literal value or from system environment.
func (ev EnvMapBool) Get() (map[string]bool, error) {
if ev.Variable != nil && *ev.Variable != "" {
Expand Down
Loading
Loading