File tree Expand file tree Collapse file tree 1 file changed +2
-15
lines changed
serving-core/src/main/scala/com/stratio/sparta/serving/core/utils Expand file tree Collapse file tree 1 file changed +2
-15
lines changed Original file line number Diff line number Diff line change @@ -68,9 +68,8 @@ trait FragmentUtils extends SLF4JLogging with SpartaSerializer {
68
68
findFragmentsByType(fragmentType).find(fragment => fragment.name == name)
69
69
70
70
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))
74
73
75
74
def updateFragment (fragment : FragmentElementModel ): FragmentElementModel = {
76
75
val newFragment = fragment.copy(name = fragment.name.toLowerCase)
@@ -147,18 +146,6 @@ trait FragmentUtils extends SLF4JLogging with SpartaSerializer {
147
146
}
148
147
}
149
148
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
-
162
149
/* POLICY METHODS */
163
150
164
151
def getPolicyWithFragments (policy : PolicyModel ): PolicyModel = {
You can’t perform that action at this time.
0 commit comments