Adopting ordered properties map (part 2)

Author: cmaglie

.travis.yml

@@ -10,7 +10,7 @@ install:
   - go get golang.org/x/tools/cmd/cover
   - go get github.com/mattn/goveralls
   - go get github.com/wadey/gocovmerge
-  - go get github.com/arduino/go-properties-map
+  - go get github.com/arduino/go-properties-orderedmap
   - go get github.com/arduino/go-timeutils
 
 script:

README.md

@@ -63,7 +63,7 @@ To build, run the following commands:
 go get github.com/go-errors/errors
 go get github.com/stretchr/testify
 go get github.com/jstemmer/go-junit-report
-go get -u github.com/arduino/go-properties-map
+go get -u github.com/arduino/go-properties-orderedmap
 go get -u github.com/arduino/go-timeutils
 go get google.golang.org/grpc
 go get github.com/golang/protobuf/proto

fail_if_imported_library_is_wrong.go

@@ -51,7 +51,7 @@ func (s *FailIfImportedLibraryIsWrong) Run(ctx *types.Context) error {
 				return i18n.ErrorfWithLogger(logger, constants.MSG_ARCH_FOLDER_NOT_SUPPORTED)
 			}
 			for _, propName := range libraries.MandatoryProperties {
-				if _, ok := library.Properties[propName]; !ok {
+				if !library.Properties.ContainsKey(propName) {
 					return i18n.ErrorfWithLogger(logger, constants.MSG_PROP_IN_LIBRARY, propName, library.InstallDir)
 				}
 			}

platform_keys_rewrite_loader.go

@@ -39,7 +39,7 @@ import (
 	"github.com/arduino/arduino-builder/constants"
 	"github.com/arduino/arduino-builder/i18n"
 	"github.com/arduino/arduino-builder/types"
-	"github.com/arduino/go-properties-map"
+	"github.com/arduino/go-properties-orderedmap"
 )
 
 type PlatformKeysRewriteLoader struct{}
@@ -73,8 +73,8 @@ func (s *PlatformKeysRewriteLoader) Run(ctx *types.Context) error {
 				return i18n.WrapError(err)
 			}
 			rewriteKey := strings.Join(keyParts[2:], ".")
-			oldValue := txt[key]
-			newValue := txt[constants.PLATFORM_REWRITE_NEW+"."+strings.Join(keyParts[1:], ".")]
+			oldValue := txt.Get(key)
+			newValue := txt.Get(constants.PLATFORM_REWRITE_NEW + "." + strings.Join(keyParts[1:], "."))
 			platformKeyRewrite := types.PlatforKeyRewrite{Key: rewriteKey, OldValue: oldValue, NewValue: newValue}
 			platformKeysRewrite.Rewrites = growSliceOfRewrites(platformKeysRewrite.Rewrites, index)
 			platformKeysRewrite.Rewrites[index] = platformKeyRewrite

test/helper_tools_downloader.go

@@ -47,7 +47,7 @@ import (
 	"github.com/arduino/arduino-builder/i18n"
 	"github.com/arduino/arduino-builder/utils"
 	"github.com/arduino/go-paths-helper"
-	"github.com/arduino/go-properties-map"
+	"github.com/arduino/go-properties-orderedmap"
 	"github.com/go-errors/errors"
 )
 

wipeout_build_path_if_build_options_changed.go

@@ -38,7 +38,7 @@ import (
 	"github.com/arduino/arduino-builder/gohasissues"
 	"github.com/arduino/arduino-builder/i18n"
 	"github.com/arduino/arduino-builder/types"
-	"github.com/arduino/go-properties-map"
+	"github.com/arduino/go-properties-orderedmap"
 )
 
 type WipeoutBuildPathIfBuildOptionsChanged struct{}
@@ -51,15 +51,15 @@ func (s *WipeoutBuildPathIfBuildOptionsChanged) Run(ctx *types.Context) error {
 	previousBuildOptionsJson := ctx.BuildOptionsJsonPrevious
 	logger := ctx.GetLogger()
 
-	var opts properties.Map
-	var prevOpts properties.Map
+	var opts *properties.Map
+	var prevOpts *properties.Map
 	json.Unmarshal([]byte(buildOptionsJson), &opts)
 	json.Unmarshal([]byte(previousBuildOptionsJson), &prevOpts)
 
 	// If SketchLocation path is different but filename is the same, consider it equal
-	if filepath.Base(opts["sketchLocation"]) == filepath.Base(prevOpts["sketchLocation"]) {
-		delete(opts, "sketchLocation")
-		delete(prevOpts, "sketchLocation")
+	if filepath.Base(opts.Get("sketchLocation")) == filepath.Base(prevOpts.Get("sketchLocation")) {
+		opts.Remove("sketchLocation")
+		prevOpts.Remove("sketchLocation")
 	}
 
 	// If options are not changed check if core has