From de9a02994728fc4f2e43819a073cc0064957c1d9 Mon Sep 17 00:00:00 2001
From: jkv <jenskristianvilladsen@gmail.com>
Date: Wed, 9 Sep 2020 00:43:41 +0200
Subject: [PATCH] import is sufficient

---
 src/main/java/ca/uhn/fhir/jpa/starter/Application.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/Application.java b/src/main/java/ca/uhn/fhir/jpa/starter/Application.java
index ba23124..083a3bf 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/Application.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/Application.java
@@ -14,12 +14,14 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 
 @ServletComponentScan(basePackageClasses = {
   JpaRestfulServer.class}, basePackages = "ca.uhn.fhir.jpa.starter")
 @SpringBootApplication(exclude = ElasticsearchRestClientAutoConfiguration.class)
+@Import({SubscriptionSubmitterConfig.class, SubscriptionProcessorConfig.class, SubscriptionChannelConfig.class,WebsocketDispatcherConfig.class })
 public class Application extends SpringBootServletInitializer {
 
   public static void main(String[] args) {
@@ -52,18 +54,12 @@ public class Application extends SpringBootServletInitializer {
     return servletRegistrationBean;
   }
 
-
   @Bean
   public ServletRegistrationBean overlayRegistrationBean() {
 
     AnnotationConfigWebApplicationContext annotationConfigWebApplicationContext = new AnnotationConfigWebApplicationContext();
     annotationConfigWebApplicationContext.register(FhirTesterConfig.class);
 
-    annotationConfigWebApplicationContext.register(SubscriptionSubmitterConfig.class);
-    annotationConfigWebApplicationContext.register(SubscriptionProcessorConfig.class);
-    annotationConfigWebApplicationContext.register(SubscriptionChannelConfig.class);
-    annotationConfigWebApplicationContext.register(WebsocketDispatcherConfig.class);
-
     DispatcherServlet dispatcherServlet = new DispatcherServlet(
       annotationConfigWebApplicationContext);
     dispatcherServlet.setContextClass(AnnotationConfigWebApplicationContext.class);