X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=enrichment-coordinator-service%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fenrichment%2FBeanFactory.java;h=1d493bb18758d3985017f942ed2b5d98ed87b7a2;hb=8fd8e9fc86a24be49d61841e381423120a41296d;hp=e636e50f504dd4bbe4ad95746821882dd2a5e215;hpb=367608a9f6c71c2aaae45ed8b1099b9c8e51c0f7;p=nonrtric.git 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 e636e50f..1d493bb1 100644 --- 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.oransc.enrichment.repository.EiJobs; -import org.oransc.enrichment.repository.EiTypes; +import org.oransc.enrichment.repository.InfoJobs; +import org.oransc.enrichment.repository.InfoTypes; 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 EiTypes eiTypes; - private EiJobs eiJobs; + private InfoTypes infoTypes; + private InfoJobs infoJobs; @Bean public ObjectMapper mapper() { @@ -65,29 +65,29 @@ class BeanFactory { } @Bean - public EiJobs eiJobs() { - if (eiJobs == null) { - eiJobs = new EiJobs(getApplicationConfig(), producerCallbacks()); + public InfoJobs infoJobs() { + if (infoJobs == null) { + infoJobs = new InfoJobs(getApplicationConfig(), producerCallbacks()); try { - eiJobs.restoreJobsFromDatabase(); + infoJobs.restoreJobsFromDatabase(); } catch (Exception e) { logger.error("Could not restore jobs from database: {}", e.getMessage()); } } - return eiJobs; + return infoJobs; } @Bean - public EiTypes eiTypes() { - if (this.eiTypes == null) { - eiTypes = new EiTypes(getApplicationConfig()); + public InfoTypes infoTypes() { + if (this.infoTypes == null) { + infoTypes = new InfoTypes(getApplicationConfig()); try { - eiTypes.restoreTypesFromDatabase(); + infoTypes.restoreTypesFromDatabase(); } catch (Exception e) { - logger.error("Could not restore EI types from database: {}", e.getMessage()); + logger.error("Could not restore Information Types from database: {}", e.getMessage()); } } - return eiTypes; + return infoTypes; } @Bean