X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2FBeanFactory.java;h=e2874cb772ed7a829b0e607ce6d4bfacac181710;hb=e2a037745508a3c1ada650ea3571ca57f0a90851;hp=e05eb95f256b0dc35d2f9228a939a591f1e3d306;hpb=f3461cb776023b950d62edd25eca148b6d354c9c;p=nonrtric.git diff --git a/policy-agent/src/main/java/org/oransc/policyagent/BeanFactory.java b/policy-agent/src/main/java/org/oransc/policyagent/BeanFactory.java index e05eb95f..e2874cb7 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/BeanFactory.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/BeanFactory.java @@ -21,17 +21,23 @@ package org.oransc.policyagent; import com.fasterxml.jackson.databind.ObjectMapper; + +import org.apache.catalina.connector.Connector; import org.oransc.policyagent.clients.A1ClientFactory; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.repository.Policies; import org.oransc.policyagent.repository.PolicyTypes; import org.oransc.policyagent.repository.Rics; import org.oransc.policyagent.repository.Services; +import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; +import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration class BeanFactory { + private final ApplicationConfig applicationConfig = new ApplicationConfig(); + @Bean public Policies getPolicies() { return new Policies(); @@ -49,7 +55,7 @@ class BeanFactory { @Bean public ApplicationConfig getApplicationConfig() { - return new ApplicationConfig(); + return this.applicationConfig; } @Bean @@ -59,12 +65,27 @@ class BeanFactory { @Bean A1ClientFactory getA1ClientFactory() { - return new A1ClientFactory(); + return new A1ClientFactory(this.applicationConfig); } @Bean public ObjectMapper mapper() { - return new ObjectMapper(); + return new ObjectMapper(); + } + + @Bean + public ServletWebServerFactory servletContainer() { + TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory(); + tomcat.addAdditionalTomcatConnectors(getHttpConnector()); + return tomcat; + } + + private static Connector getHttpConnector() { + Connector connector = new Connector(TomcatServletWebServerFactory.DEFAULT_PROTOCOL); + connector.setScheme("http"); + connector.setPort(8081); + connector.setSecure(false); + return connector; } }