diff options
author | Shashank Kumar Shankar <shashank.kumar.shankar@intel.com> | 2018-02-15 14:48:19 -0800 |
---|---|---|
committer | Shashank Kumar Shankar <shashank.kumar.shankar@intel.com> | 2018-02-21 13:51:08 -0800 |
commit | 3e92cb38f9be554afccf7ac409dfbedbeec769a2 (patch) | |
tree | b09247734194975c161987e06d7e1aa0abf8ae24 /src/dkv/api/utils.go | |
parent | 88a7fd4b899bbd1230852be63e380ce843dec338 (diff) |
Update tests and refactor code
This patch adds some more tests and refactors the
codebase.
Change-Id: Iee669b85c5c7f9bdd01271fe86df20506f567d23
Issue-ID: MUSIC-23
Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
Diffstat (limited to 'src/dkv/api/utils.go')
-rw-r--r-- | src/dkv/api/utils.go | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/src/dkv/api/utils.go b/src/dkv/api/utils.go deleted file mode 100644 index 8b87848..0000000 --- a/src/dkv/api/utils.go +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright 2018 Intel Corporation, Inc - * - * 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 api - -import ( - "errors" - "sync" -) - -type KeyValue struct { - sync.RWMutex - kv map[string]string -} - -type ResponseStringStruct struct { - Response string `json:"response"` -} - -type ResponseGETStruct struct { - Response map[string]string `json:"response"` -} - -type ResponseGETSStruct struct { - Response []string `json:"response"` -} - -type LoadStruct struct { - Type *TypeStruct `json:"type"` -} - -type TypeStruct struct { - FilePath string `json:"file_path"` -} - -var KVStruct = &KeyValue{kv: make(map[string]string)} - -func (kvStruct *KeyValue) ReadConfigs(body LoadStruct) error { - if body.Type.FilePath == "default" { - err := kvStruct.FileReader("default") - if err != nil { - return err - } - return nil - } else { - err := kvStruct.FileReader(body.Type.FilePath) - if err != nil { - return err - } - return nil - } -} - -func (kvStruct *KeyValue) FileReader(directory string) error { - defer kvStruct.Unlock() - - kvStruct.Lock() - - if directory == "default" { - propertiesValues, err := PropertiesFilesToKV("default") - if err != nil { - return err - } - for key, value := range propertiesValues { - kvStruct.kv[key] = value - } - return nil - } else { - propertiesValues, err := PropertiesFilesToKV(directory) - if err != nil { - return err - } - for key, value := range propertiesValues { - kvStruct.kv[key] = value - } - return nil - } -} - -func ValidateBody(body LoadStruct) error { - if body.Type == nil { - return errors.New("Type not set. Recheck POST data.") - } else if body.Type.FilePath == "" { - return errors.New("file_path not set") - } else { - return nil - } -} |