Merge pull request #16 from jaksonlin/develop

omit empy implementation through plugin incorrect, revoke

astbuilder/golang/astPlugin.go

@@ -113,54 +113,3 @@ func arrayNodeFromStringNode(nodeValue string) (*ast.JsonArrayNode, error) {
 	return rs, nil
 
 }
-
-var omitEmptyPlugin ast.ASTNodePlugin = ast.NewASTNodePlugin(PLUGIN_OMITEMPTY, omitEmptyConversion, nil)
-
-func omitEmptyConversion(visitor ast.JsonVisitor, node ast.JsonNode) error {
-	// this is a struct field, we need to omit it if the value is empty
-	node, ok := node.(*ast.JsonKeyValuePairNode)
-	if !ok {
-		return nil
-	}
-	switch valueNode := node.(type) {
-	case *ast.JsonStringNode:
-		val, err := valueNode.GetValue()
-		if err != nil {
-			return err
-		}
-		if val == "" {
-			node.SetVisited()
-			return nil
-		}
-	case *ast.JsonNumberNode:
-		if valueNode.Value == 0 {
-			node.SetVisited()
-			return nil
-		}
-	case *ast.JsonBooleanNode:
-		if !valueNode.Value {
-			node.SetVisited()
-			return nil
-		}
-	case *ast.JsonNullNode:
-		node.SetVisited()
-		return nil
-	case *ast.JsonArrayNode:
-		if valueNode.Length() == 0 {
-			node.SetVisited()
-			return nil
-		}
-	case *ast.JsonObjectNode:
-		isMapMeta := valueNode.GetMeta(OBJECT_FROM_MAP_META)
-		// map with no key value pair in struct field when omitempty set, omit it
-		if isMapMeta != nil && isMapMeta.(bool) {
-			if valueNode.Length() == 0 {
-				node.SetVisited()
-				return nil
-			}
-		}
-	default:
-		return nil
-	}
-	return nil
-}

astbuilder/golang/tokenprovider.go

@@ -54,11 +54,6 @@ func (w *workingItem) SetMetaAndPlugins(node ast.JsonNode) {
 			}
 		}
 
-		if w.tagOptions.Omitempty {
-			// for omitEmpty, we will plug on the kvpair node directly, this will remove the push of k and v node
-			node.PrependPlugin(omitEmptyPlugin)
-		}
-
 	}
 
 }