Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NONRTRIC - ECS updates of the NBI
[nonrtric.git]
/
enrichment-coordinator-service
/
src
/
main
/
java
/
org
/
oransc
/
enrichment
/
BeanFactory.java
diff --git
a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/BeanFactory.java
b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/BeanFactory.java
index
e636e50
..
1d493bb
100644
(file)
--- a/
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/BeanFactory.java
+++ b/
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/BeanFactory.java
@@
-27,8
+27,8
@@
import java.lang.invoke.MethodHandles;
import org.apache.catalina.connector.Connector;
import org.oransc.enrichment.configuration.ApplicationConfig;
import org.oransc.enrichment.controllers.r1producer.ProducerCallbacks;
import org.apache.catalina.connector.Connector;
import org.oransc.enrichment.configuration.ApplicationConfig;
import org.oransc.enrichment.controllers.r1producer.ProducerCallbacks;
-import org.oransc.enrichment.repository.
Ei
Jobs;
-import org.oransc.enrichment.repository.
Ei
Types;
+import org.oransc.enrichment.repository.
Info
Jobs;
+import org.oransc.enrichment.repository.
Info
Types;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@@
-47,8
+47,8
@@
class BeanFactory {
private final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private ProducerCallbacks producerCallbacks;
private final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private ProducerCallbacks producerCallbacks;
- private
EiTypes ei
Types;
- private
EiJobs ei
Jobs;
+ private
InfoTypes info
Types;
+ private
InfoJobs info
Jobs;
@Bean
public ObjectMapper mapper() {
@Bean
public ObjectMapper mapper() {
@@
-65,29
+65,29
@@
class BeanFactory {
}
@Bean
}
@Bean
- public
EiJobs ei
Jobs() {
- if (
ei
Jobs == null) {
-
eiJobs = new Ei
Jobs(getApplicationConfig(), producerCallbacks());
+ public
InfoJobs info
Jobs() {
+ if (
info
Jobs == null) {
+
infoJobs = new Info
Jobs(getApplicationConfig(), producerCallbacks());
try {
try {
-
ei
Jobs.restoreJobsFromDatabase();
+
info
Jobs.restoreJobsFromDatabase();
} catch (Exception e) {
logger.error("Could not restore jobs from database: {}", e.getMessage());
}
}
} catch (Exception e) {
logger.error("Could not restore jobs from database: {}", e.getMessage());
}
}
- return
ei
Jobs;
+ return
info
Jobs;
}
@Bean
}
@Bean
- public
EiTypes ei
Types() {
- if (this.
ei
Types == null) {
-
eiTypes = new Ei
Types(getApplicationConfig());
+ public
InfoTypes info
Types() {
+ if (this.
info
Types == null) {
+
infoTypes = new Info
Types(getApplicationConfig());
try {
try {
-
ei
Types.restoreTypesFromDatabase();
+
info
Types.restoreTypesFromDatabase();
} catch (Exception e) {
} catch (Exception e) {
- logger.error("Could not restore
EI t
ypes from database: {}", e.getMessage());
+ logger.error("Could not restore
Information T
ypes from database: {}", e.getMessage());
}
}
}
}
- return
ei
Types;
+ return
info
Types;
}
@Bean
}
@Bean