Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
a2b5f6fe
Commit
a2b5f6fe
authored
Nov 19, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extended bsh controller to allow for GLIS update
parent
d305d136
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
3 deletions
+28
-3
src/main/java/org/genesys2/server/mvc/admin/BeanshellController.java
...va/org/genesys2/server/mvc/admin/BeanshellController.java
+15
-0
src/main/java/org/genesys2/server/service/worker/AccessionModifiedAspect.java
...nesys2/server/service/worker/AccessionModifiedAspect.java
+13
-3
No files found.
src/main/java/org/genesys2/server/mvc/admin/BeanshellController.java
View file @
a2b5f6fe
...
...
@@ -29,8 +29,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
org.genesys.glis.v1.api.GenesysApi
;
import
org.genesys2.server.service.AccessionService
;
import
org.genesys2.server.service.GenesysFilterService
;
import
org.genesys2.server.service.GenesysService
;
import
org.genesys2.server.service.worker.AccessionModifiedAspect
;
import
org.genesys2.server.service.worker.AccessionProcessor
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.InitializingBean
;
...
...
@@ -71,6 +74,15 @@ public class BeanshellController implements InitializingBean {
@Autowired
private
GenesysApi
glisGenesys
;
@Autowired
private
AccessionProcessor
accessionProcessor
;
@Autowired
private
AccessionModifiedAspect
accessionsModifiedAspect
;
@Autowired
private
AccessionService
accessionService
;
@PersistenceContext
private
EntityManager
entityManager
;
...
...
@@ -91,6 +103,9 @@ public class BeanshellController implements InitializingBean {
this
.
exposedBeans
.
put
(
"genesysService"
,
genesysService
);
this
.
exposedBeans
.
put
(
"filterService"
,
filterService
);
this
.
exposedBeans
.
put
(
"glisGenesys"
,
glisGenesys
);
this
.
exposedBeans
.
put
(
"accessionService"
,
accessionService
);
this
.
exposedBeans
.
put
(
"accessionsModifiedAspect"
,
accessionsModifiedAspect
);
this
.
exposedBeans
.
put
(
"accessionProcessor"
,
accessionProcessor
);
this
.
exposedBeans
.
put
(
"entityManager"
,
entityManager
);
this
.
exposedBeans
.
put
(
"jdbc"
,
jdbcTemplate
);
}
...
...
src/main/java/org/genesys2/server/service/worker/AccessionModifiedAspect.java
View file @
a2b5f6fe
...
...
@@ -85,10 +85,10 @@ public class AccessionModifiedAspect implements InitializingBean {
}
/** The Constant LOG. */
p
ublic
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
AccessionModifiedAspect
.
class
);
p
rivate
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
AccessionModifiedAspect
.
class
);
@After
(
value
=
"execution(* org.genesys2.server.persistence.AccessionRepository.save(*)) && args(arg)"
)
p
ublic
void
afterPersistAccession
(
JoinPoint
joinPoint
,
Object
arg
)
throws
Throwable
{
p
rotected
void
afterPersistAccession
(
JoinPoint
joinPoint
,
Object
arg
)
throws
Throwable
{
StopWatch
stopWatch
=
StopWatch
.
createStarted
();
LOG
.
trace
(
"After persist accession(s): {}"
,
arg
);
...
...
@@ -103,6 +103,16 @@ public class AccessionModifiedAspect implements InitializingBean {
LOG
.
debug
(
"Persist notification for 1 accession took {}ms"
,
stopWatch
.
getTime
(
TimeUnit
.
MILLISECONDS
));
}
}
/**
* Fake persist accession records to trigger listeners.
*
* @param accessions the accessions
*/
public
void
fakePersist
(
Collection
<
Accession
>
accessions
)
{
LOG
.
info
(
"Fake-persisting {} accessions"
,
accessions
.
size
());
handlePersist
(
accessions
);
}
private
void
handlePersist
(
Collection
<
Accession
>
accessions
)
{
if
(
CollectionUtils
.
isEmpty
(
accessions
))
{
...
...
@@ -113,7 +123,7 @@ public class AccessionModifiedAspect implements InitializingBean {
}
@Before
(
value
=
"execution(* org.genesys2.server.persistence.AccessionRepository.delete(*)) && args(arg)"
)
p
ublic
void
beforeDeleteAccession
(
JoinPoint
joinPoint
,
Object
arg
)
throws
Throwable
{
p
rotected
void
beforeDeleteAccession
(
JoinPoint
joinPoint
,
Object
arg
)
throws
Throwable
{
StopWatch
stopWatch
=
StopWatch
.
createStarted
();
LOG
.
trace
(
"Before delete accession(s): {}"
,
arg
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment