simpler console command interface

This commit is contained in:
Radu Ioan Fericean
2015-07-14 21:23:21 +03:00
parent 0f7cc579f3
commit e95b2be88d
49 changed files with 131 additions and 230 deletions

View File

@@ -45,14 +45,11 @@ func (self *CmdAddAccount) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdAddAccount) RpcParams(ptr, reset bool) interface{} {
func (self *CmdAddAccount) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrSetAccount{Direction: utils.OUT}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdAddAccount) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdRemoveAccount) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdRemoveAccount) RpcParams(ptr, reset bool) interface{} {
func (self *CmdRemoveAccount) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrRemoveAccount{Direction: utils.OUT}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdRemoveAccount) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdSetAccountActions) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdSetAccountActions) RpcParams(ptr, reset bool) interface{} {
func (self *CmdSetAccountActions) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.TPAccountActions{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdSetAccountActions) PostprocessRpcParams() error {

View File

@@ -49,14 +49,11 @@ func (self *CmdGetAccounts) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdGetAccounts) RpcParams(ptr, reset bool) interface{} {
func (self *CmdGetAccounts) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrGetAccounts{Direction: "*out"}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdGetAccounts) PostprocessRpcParams() error {

View File

@@ -48,14 +48,11 @@ func (self *CmdExecuteAction) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdExecuteAction) RpcParams(ptr, reset bool) interface{} {
func (self *CmdExecuteAction) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrExecuteAction{Direction: utils.OUT}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdExecuteAction) PostprocessRpcParams() error {

View File

@@ -48,14 +48,11 @@ func (self *CmdActiveSessions) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdActiveSessions) RpcParams(ptr, reset bool) interface{} {
func (self *CmdActiveSessions) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrGetSMASessions{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdActiveSessions) PostprocessRpcParams() error {

View File

@@ -48,14 +48,11 @@ func (self *CmdDebitBalance) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdDebitBalance) RpcParams(ptr, reset bool) interface{} {
func (self *CmdDebitBalance) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.CallDescriptor{Direction: "*out"}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdDebitBalance) PostprocessRpcParams() error {

View File

@@ -48,14 +48,11 @@ func (self *CmdAddBalance) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdAddBalance) RpcParams(ptr, reset bool) interface{} {
func (self *CmdAddBalance) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &v1.AttrAddBalance{BalanceType: utils.MONETARY, Overwrite: false}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdAddBalance) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdGetCacheAge) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdGetCacheAge) RpcParams(ptr, reset bool) interface{} {
func (self *CmdGetCacheAge) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &StringWrapper{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdGetCacheAge) PostprocessRpcParams() error {

View File

@@ -46,14 +46,11 @@ func (self *CmdReloadCache) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdReloadCache) RpcParams(ptr, reset bool) interface{} {
func (self *CmdReloadCache) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ApiReloadCache{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdReloadCache) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdGetCacheStats) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdGetCacheStats) RpcParams(ptr, reset bool) interface{} {
func (self *CmdGetCacheStats) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrCacheStats{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdGetCacheStats) PostprocessRpcParams() error {

View File

@@ -49,14 +49,11 @@ func (self *CmdGetCostDetails) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdGetCostDetails) RpcParams(ptr, reset bool) interface{} {
func (self *CmdGetCostDetails) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrGetCallCost{RunId: utils.DEFAULT_RUNID}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdGetCostDetails) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdExportCdrs) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdExportCdrs) RpcParams(ptr, reset bool) interface{} {
func (self *CmdExportCdrs) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrExportCdrsToFile{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdExportCdrs) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdRemCdrs) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdRemCdrs) RpcParams(ptr, reset bool) interface{} {
func (self *CmdRemCdrs) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrRemCdrs{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdRemCdrs) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdCdrStatsMetrics) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdCdrStatsMetrics) RpcParams(ptr, reset bool) interface{} {
func (self *CmdCdrStatsMetrics) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &v1.AttrGetMetrics{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdCdrStatsMetrics) PostprocessRpcParams() error {

View File

@@ -44,14 +44,11 @@ func (self *CmdCdrStatsQueue) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdCdrStatsQueue) RpcParams(ptr, reset bool) interface{} {
func (self *CmdCdrStatsQueue) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &StringWrapper{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdCdrStatsQueue) PostprocessRpcParams() error {

View File

@@ -44,14 +44,11 @@ func (self *CmdCdrStatsQueueTriggers) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdCdrStatsQueueTriggers) RpcParams(ptr, reset bool) interface{} {
func (self *CmdCdrStatsQueueTriggers) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &StringWrapper{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdCdrStatsQueueTriggers) PostprocessRpcParams() error {

View File

@@ -42,14 +42,11 @@ func (self *CmdCdrStatsQueueIds) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdCdrStatsQueueIds) RpcParams(ptr, reset bool) interface{} {
func (self *CmdCdrStatsQueueIds) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &StringWrapper{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdCdrStatsQueueIds) PostprocessRpcParams() error {

View File

@@ -47,14 +47,11 @@ func (self *CmdCdrReloadQueues) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdCdrReloadQueues) RpcParams(ptr, reset bool) interface{} {
func (self *CmdCdrReloadQueues) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrCDRStatsReloadQueues{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdCdrReloadQueues) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdCdrResetQueues) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdCdrResetQueues) RpcParams(ptr, reset bool) interface{} {
func (self *CmdCdrResetQueues) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrCDRStatsReloadQueues{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdCdrResetQueues) PostprocessRpcParams() error {

View File

@@ -33,7 +33,7 @@ type Commander interface {
FromArgs(args string, verbose bool) error // Load data from os arguments or flag.Args()
Usage() string // usage message
RpcMethod() string // Method which should be called remotely
RpcParams(bool, bool) interface{} // Parameters to send out on rpc
RpcParams(bool) interface{} // Parameters to send out on rpc
PostprocessRpcParams() error // Corrects rpc parameters when needed
RpcResult() interface{} // Only requirement is to have a String method to print on console
ClientArgs() []string // for autocompletion
@@ -88,3 +88,5 @@ type StringWrapper struct {
type StringSliceWrapper struct {
Items []string
}
type EmptyWrapper struct{}

View File

@@ -40,13 +40,13 @@ type CommandExecuter struct {
}
func (ce *CommandExecuter) Usage() string {
jsn, _ := json.Marshal(ce.command.RpcParams(true, true))
jsn, _ := json.Marshal(ce.command.RpcParams(true))
return fmt.Sprintf("\n\tUsage: %s %s \n", ce.command.Name(), FromJSON(jsn, ce.command.ClientArgs()))
}
// Parses command line args and builds CmdBalance value
func (ce *CommandExecuter) FromArgs(args string, verbose bool) error {
params := ce.command.RpcParams(true, true)
params := ce.command.RpcParams(true)
if err := json.Unmarshal(ToJSON(args), params); err != nil {
return err
}
@@ -59,6 +59,10 @@ func (ce *CommandExecuter) FromArgs(args string, verbose bool) error {
func (ce *CommandExecuter) clientArgs(iface interface{}) (args []string) {
val := reflect.ValueOf(iface)
if val.Kind() == reflect.Ptr {
val = val.Elem()
iface = val.Interface()
}
typ := reflect.TypeOf(iface)
for i := 0; i < typ.NumField(); i++ {
valField := val.Field(i)
@@ -74,7 +78,7 @@ func (ce *CommandExecuter) clientArgs(iface interface{}) (args []string) {
}
func (ce *CommandExecuter) ClientArgs() (args []string) {
return ce.clientArgs(ce.command.RpcParams(false, true))
return ce.clientArgs(ce.command.RpcParams(true))
}
// To be overwritten by commands that do not need a rpc call

View File

@@ -47,14 +47,11 @@ func (self *CmdGetCost) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdGetCost) RpcParams(ptr, reset bool) interface{} {
func (self *CmdGetCost) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.CallDescriptor{Direction: "*out"}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdGetCost) PostprocessRpcParams() error {

View File

@@ -51,14 +51,11 @@ func (self *CmdGetDataCost) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdGetDataCost) RpcParams(ptr, reset bool) interface{} {
func (self *CmdGetDataCost) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &v1.AttrGetDataCost{Direction: utils.OUT}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdGetDataCost) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdGetDestination) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdGetDestination) RpcParams(ptr, reset bool) interface{} {
func (self *CmdGetDestination) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &StringWrapper{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdGetDestination) PostprocessRpcParams() error {

View File

@@ -46,14 +46,11 @@ func (self *CmdSetDestination) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdSetDestination) RpcParams(ptr, reset bool) interface{} {
func (self *CmdSetDestination) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrSetDestination{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdSetDestination) PostprocessRpcParams() error {

View File

@@ -48,14 +48,11 @@ func (self *CmdGetLcr) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdGetLcr) RpcParams(ptr, reset bool) interface{} {
func (self *CmdGetLcr) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.LcrRequest{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdGetLcr) PostprocessRpcParams() error {

View File

@@ -46,14 +46,11 @@ func (self *LoadTpFromFolder) RpcMethod() string {
return self.rpcMethod
}
func (self *LoadTpFromFolder) RpcParams(ptr, reset bool) interface{} {
func (self *LoadTpFromFolder) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.AttrLoadTpFromFolder{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *LoadTpFromFolder) PostprocessRpcParams() error {

View File

@@ -46,14 +46,11 @@ func (self *LoadTpFromStorDb) RpcMethod() string {
return self.rpcMethod
}
func (self *LoadTpFromStorDb) RpcParams(ptr, reset bool) interface{} {
func (self *LoadTpFromStorDb) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &v1.AttrLoadTpFromStorDb{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *LoadTpFromStorDb) PostprocessRpcParams() error {

View File

@@ -47,14 +47,11 @@ func (self *CmdGetMaxDuration) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdGetMaxDuration) RpcParams(ptr, reset bool) interface{} {
func (self *CmdGetMaxDuration) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.CallDescriptor{Direction: "*out"}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdGetMaxDuration) PostprocessRpcParams() error {

View File

@@ -49,14 +49,11 @@ func (self *CmdParse) RpcMethod() string {
return ""
}
func (self *CmdParse) RpcParams(ptr, reset bool) interface{} {
func (self *CmdParse) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &AttrParse{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdParse) RpcResult() interface{} {

View File

@@ -44,14 +44,11 @@ func (self *CmdPublish) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdPublish) RpcParams(ptr, reset bool) interface{} {
func (self *CmdPublish) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.PublishInfo{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdPublish) PostprocessRpcParams() error {

View File

@@ -46,14 +46,11 @@ func (self *CmdSetRatingProfile) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdSetRatingProfile) RpcParams(ptr, reset bool) interface{} {
func (self *CmdSetRatingProfile) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.TPRatingProfile{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdSetRatingProfile) PostprocessRpcParams() error {

View File

@@ -43,14 +43,11 @@ func (self *CmdReloadScheduler) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdReloadScheduler) RpcParams(ptr, reset bool) interface{} {
func (self *CmdReloadScheduler) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &StringWrapper{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdReloadScheduler) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdGetSharedGroup) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdGetSharedGroup) RpcParams(ptr, reset bool) interface{} {
func (self *CmdGetSharedGroup) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &StringWrapper{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdGetSharedGroup) PostprocessRpcParams() error {

View File

@@ -30,7 +30,7 @@ func init() {
type CmdStatus struct {
name string
rpcMethod string
rpcParams *StringWrapper
rpcParams *EmptyWrapper
*CommandExecuter
}
@@ -42,14 +42,11 @@ func (self *CmdStatus) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdStatus) RpcParams(ptr, reset bool) interface{} {
func (self *CmdStatus) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &StringWrapper{}
self.rpcParams = &EmptyWrapper{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdStatus) PostprocessRpcParams() error {

View File

@@ -44,14 +44,11 @@ func (self *CmdSubscribe) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdSubscribe) RpcParams(ptr, reset bool) interface{} {
func (self *CmdSubscribe) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.SubscribeInfo{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdSubscribe) PostprocessRpcParams() error {

View File

@@ -44,14 +44,11 @@ func (self *CmdShowSubscribers) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdShowSubscribers) RpcParams(ptr, reset bool) interface{} {
func (self *CmdShowSubscribers) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &StringWrapper{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdShowSubscribers) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdAddTriggeredAction) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdAddTriggeredAction) RpcParams(ptr, reset bool) interface{} {
func (self *CmdAddTriggeredAction) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &v1.AttrAddActionTrigger{BalanceDirection: "*out"}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdAddTriggeredAction) PostprocessRpcParams() error {

View File

@@ -44,14 +44,11 @@ func (self *CmdUnsubscribe) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdUnsubscribe) RpcParams(ptr, reset bool) interface{} {
func (self *CmdUnsubscribe) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.SubscribeInfo{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdUnsubscribe) PostprocessRpcParams() error {

View File

@@ -43,14 +43,11 @@ func (self *CmdUserAddIndex) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdUserAddIndex) RpcParams(ptr, reset bool) interface{} {
func (self *CmdUserAddIndex) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &StringSliceWrapper{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdUserAddIndex) PostprocessRpcParams() error {

View File

@@ -31,7 +31,7 @@ func init() {
type CmdUserShowIndexes struct {
name string
rpcMethod string
rpcParams *StringWrapper
rpcParams *EmptyWrapper
*CommandExecuter
}
@@ -43,14 +43,11 @@ func (self *CmdUserShowIndexes) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdUserShowIndexes) RpcParams(ptr, reset bool) interface{} {
func (self *CmdUserShowIndexes) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &StringWrapper{}
self.rpcParams = &EmptyWrapper{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdUserShowIndexes) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdUserRemove) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdUserRemove) RpcParams(ptr, reset bool) interface{} {
func (self *CmdUserRemove) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.UserProfile{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdUserRemove) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdSetUser) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdSetUser) RpcParams(ptr, reset bool) interface{} {
func (self *CmdSetUser) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.UserProfile{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdSetUser) PostprocessRpcParams() error {

View File

@@ -45,14 +45,11 @@ func (self *CmdUpdateUser) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdUpdateUser) RpcParams(ptr, reset bool) interface{} {
func (self *CmdUpdateUser) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.UserProfile{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdUpdateUser) PostprocessRpcParams() error {

View File

@@ -46,14 +46,11 @@ func (self *CmdGetUsers) RpcMethod() string {
return self.rpcMethod
}
func (self *CmdGetUsers) RpcParams(ptr, reset bool) interface{} {
func (self *CmdGetUsers) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &engine.UserProfile{}
}
if ptr {
return self.rpcParams
}
return *self.rpcParams
return self.rpcParams
}
func (self *CmdGetUsers) PostprocessRpcParams() error {