remove additionsl pathslice attribute, calculate it from sdcpb.path

Author: steiler

pkg/tree/sharedEntryAttributes.go

@@ -609,41 +609,6 @@ func (s *sharedEntryAttributes) remainsToExist() bool {
 // getRegularDeletes performs deletion calculation on elements that have a schema attached.
 func (s *sharedEntryAttributes) getRegularDeletes(deletes []types.DeleteEntry, aggregate bool) ([]types.DeleteEntry, error) {
 	var err error
-	// if entry is a container type, check the keys, to be able to
-	// issue a delte for the whole branch at once via keys
-	// switch s.schema.GetSchema().(type) {
-	// case *sdcpb.SchemaElem_Container:
-	// 	// deletes for child elements (choice cases) that newly became inactive.
-	// 	for _, v := range s.choicesResolvers {
-	// 		// oldBestCaseName := v.getOldBestCaseName()
-	// 		// newBestCaseName := v.getBestCaseName()
-	// 		// // so if we have an old and a new best cases (not "") and the names are different,
-	// 		// // all the old to the deletion list
-	// 		// if oldBestCaseName != "" && newBestCaseName != "" && oldBestCaseName != newBestCaseName {
-	// 		// 	// try fetching the case from the childs
-	// 		// 	oldBestCaseEntry, exists := s.childs.GetEntry(oldBestCaseName)
-	// 		// 	if exists {
-	// 		// 		deletes = append(deletes, oldBestCaseEntry)
-	// 		// 	} else {
-	// 		// 		// it might be that the child is not loaded into the tree, but just considered from the treecontext cache for the choice/case resolution
-	// 		// 		// if so, we create and return the DeleteEntryImpl struct
-	// 		// 		path, err := s.SdcpbPath()
-	// 		// 		if err != nil {
-	// 		// 			return nil, err
-	// 		// 		}
-	// 		// 		deletes = append(deletes, types.NewDeleteEntryImpl(path, append(s.Path(), oldBestCaseName)))
-	// 		// 	}
-	// 		// }
-	// 		path, err := s.SdcpbPath()
-	// 		if err != nil {
-	// 			return nil, err
-	// 		}
-	// 		deleteElements := v.GetDeletes()
-	// 		for _, de := range deleteElements {
-	// 			deletes = append(deletes, types.NewDeleteEntryImpl(path, append(s.Path(), de)))
-	// 		}
-	// 	}
-	// }
 
 	if s.shouldDelete() && !s.IsRoot() && len(s.GetSchemaKeys()) == 0 {
 		return append(deletes, s), nil
@@ -654,7 +619,8 @@ func (s *sharedEntryAttributes) getRegularDeletes(deletes []types.DeleteEntry, a
 		if err != nil {
 			return nil, err
 		}
-		deletes = append(deletes, types.NewDeleteEntryImpl(path, append(s.Path(), elem)))
+		path.Elem = append(path.Elem, &sdcpb.PathElem{Name: elem})
+		deletes = append(deletes, types.NewDeleteEntryImpl(path))
 	}
 
 	for _, e := range s.childs.GetAll() {

pkg/tree/types/delete_entry.go

@@ -1,6 +1,7 @@
 package types
 
 import (
+	"github.com/sdcio/data-server/pkg/utils"
 	sdcpb "github.com/sdcio/sdc-protos/sdcpb"
 )
 
@@ -12,21 +13,19 @@ type DeleteEntry interface {
 // DeleteEntryImpl is a crutch to flag oldbestcases if on a choice, the active case changed
 type DeleteEntryImpl struct {
 	sdcpbPath *sdcpb.Path
-	pathslice PathSlice
 }
 
-func NewDeleteEntryImpl(sdcpbPath *sdcpb.Path, pathslice PathSlice) *DeleteEntryImpl {
+func NewDeleteEntryImpl(sdcpbPath *sdcpb.Path) *DeleteEntryImpl {
 	return &DeleteEntryImpl{
 		sdcpbPath: sdcpbPath,
-		pathslice: pathslice,
 	}
 }
 
 func (d *DeleteEntryImpl) SdcpbPath() (*sdcpb.Path, error) {
 	return d.sdcpbPath, nil
 }
 func (d *DeleteEntryImpl) Path() PathSlice {
-	return d.pathslice
+	return utils.ToStrings(d.sdcpbPath, false, false)
 }
 
 type DeleteEntriesList []DeleteEntry