Skip to content

Commit 31f9179

Browse files
authored
Bug/branch duplicate fragments (#1803)
* Corrected bug in user plugins files * Fragments duplication corrected
1 parent 9c5d16a commit 31f9179

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

serving-core/src/main/scala/com/stratio/sparta/serving/core/utils/FragmentUtils.scala

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,8 @@ trait FragmentUtils extends SLF4JLogging with SpartaSerializer {
6868
findFragmentsByType(fragmentType).find(fragment => fragment.name == name)
6969

7070
def createFragment(fragment: FragmentElementModel): FragmentElementModel =
71-
if (existsByTypeAndName(fragment.fragmentType, fragment.name.toLowerCase))
72-
getExistingFragment(fragment).getOrElse(createNewFragment(fragment))
73-
else createNewFragment(fragment)
71+
findFragmentByTypeAndName(fragment.fragmentType, fragment.name.toLowerCase)
72+
.getOrElse(createNewFragment(fragment))
7473

7574
def updateFragment(fragment: FragmentElementModel): FragmentElementModel = {
7675
val newFragment = fragment.copy(name = fragment.name.toLowerCase)
@@ -147,18 +146,6 @@ trait FragmentUtils extends SLF4JLogging with SpartaSerializer {
147146
}
148147
}
149148

150-
private def getExistingFragment(fragment: FragmentElementModel): Option[FragmentElementModel] =
151-
findFragmentsByType(fragment.fragmentType)
152-
.dropWhile(currentFragment => !fragment.equals(currentFragment)).headOption
153-
154-
private def existsByTypeAndName(fragmentType: String, name: String, id: Option[String] = None): Boolean = {
155-
findFragmentsByType(fragmentType).exists(fragment =>
156-
if (id.isDefined && fragment.id.isDefined)
157-
fragment.name == name && fragment.id.get != id.get
158-
else fragment.name == name
159-
)
160-
}
161-
162149
/* POLICY METHODS */
163150

164151
def getPolicyWithFragments(policy: PolicyModel): PolicyModel = {

0 commit comments

Comments
 (0)