Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
org.etsi.osl.tmf.api
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSL
code
org.etsi.osl.tmf.api
Commits
19e4611b
Commit
19e4611b
authored
5 months ago
by
tranoris
Browse files
Options
Downloads
Patches
Plain Diff
fixe for notes
parent
9850d827
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!59
MR for Release 2024Q4
,
!48
Generic controller enhancement
Pipeline
#10444
passed
5 months ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
+18
-3
18 additions, 3 deletions
...a/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
with
18 additions
and
3 deletions
src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
+
18
−
3
View file @
19e4611b
...
@@ -578,8 +578,12 @@ public class ServiceRepoService {
...
@@ -578,8 +578,12 @@ public class ServiceRepoService {
}
}
if
(
serviceCharacteristicChanged
)
{
if
(
serviceCharacteristicChanged
)
{
if
(
service
.
getServiceCharacteristicByName
(
"_DETAILED_NOTES_"
)
!=
null
)
{
Characteristic
noteCheck
=
service
.
getServiceCharacteristicByName
(
"_DETAILED_NOTES_"
);
if
(
noteCheck
!=
null
&&
noteCheck
.
getValue
()
!=
null
&&
noteCheck
.
getValue
().
getValue
()
!=
null
&&
!
noteCheck
.
getValue
().
getValue
().
equals
(
""
))
{
Note
noteItem
=
new
Note
();
Note
noteItem
=
new
Note
();
noteItem
.
setText
(
"Service Characteristic changed: "
+
charChangedForNotes
);
noteItem
.
setText
(
"Service Characteristic changed: "
+
charChangedForNotes
);
noteItem
.
setAuthor
(
"SIM638-API"
);
noteItem
.
setAuthor
(
"SIM638-API"
);
...
@@ -643,6 +647,11 @@ public class ServiceRepoService {
...
@@ -643,6 +647,11 @@ public class ServiceRepoService {
this
.
addServiceActionQueueItem
(
saqi
);
this
.
addServiceActionQueueItem
(
saqi
);
}
}
/*
/*
* Update any parent service
* Update any parent service
*/
*/
...
@@ -950,6 +959,8 @@ public class ServiceRepoService {
...
@@ -950,6 +959,8 @@ public class ServiceRepoService {
public
ServiceActionQueueItem
addServiceActionQueueItem
(
@Valid
ServiceActionQueueItem
item
)
{
public
ServiceActionQueueItem
addServiceActionQueueItem
(
@Valid
ServiceActionQueueItem
item
)
{
logger
.
debug
(
"Will add ServiceActionQueueItem ServiceRefId: "
+
item
.
getServiceRefId
()
);
logger
.
debug
(
"Will add ServiceActionQueueItem ServiceRefId: "
+
item
.
getServiceRefId
()
);
//find any similar action inqueue and delete them, so to keep this one as the most recent
//find any similar action inqueue and delete them, so to keep this one as the most recent
List
<
ServiceActionQueueItem
>
result
=
this
.
serviceActionQueueRepo
.
findByServiceRefIdAndAction
(
item
.
getServiceRefId
(),
item
.
getAction
());
List
<
ServiceActionQueueItem
>
result
=
this
.
serviceActionQueueRepo
.
findByServiceRefIdAndAction
(
item
.
getServiceRefId
(),
item
.
getAction
());
logger
.
debug
(
"Will add ServiceActionQueueItem ServiceRefId result: "
+
result
.
size
()
);
logger
.
debug
(
"Will add ServiceActionQueueItem ServiceRefId result: "
+
result
.
size
()
);
...
@@ -1157,7 +1168,11 @@ public class ServiceRepoService {
...
@@ -1157,7 +1168,11 @@ public class ServiceRepoService {
supd
.
addServiceCharacteristicItem
(
cNew
);
supd
.
addServiceCharacteristicItem
(
cNew
);
}
}
if
(
as
.
getServiceCharacteristicByName
(
"_DETAILED_NOTES_"
)
!=
null
)
{
Characteristic
noteCheck
=
as
.
getServiceCharacteristicByName
(
"_DETAILED_NOTES_"
);
if
(
noteCheck
!=
null
&&
noteCheck
.
getValue
()
!=
null
&&
noteCheck
.
getValue
().
getValue
()
!=
null
&&
!
noteCheck
.
getValue
().
getValue
().
equals
(
""
))
{
Note
n
=
new
Note
();
Note
n
=
new
Note
();
n
.
setText
(
stateText
+
"Supporting Resource changed with id: "
+
res
.
getId
());
n
.
setText
(
stateText
+
"Supporting Resource changed with id: "
+
res
.
getId
());
n
.
setAuthor
(
"SIM638-API"
);
n
.
setAuthor
(
"SIM638-API"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment