Fix shamrock-openapi

- use BeanContainer abstraction - remove dependency on weld
quarkusio · Aug 31, 2018 · a318ce1 · a318ce1
1 parent 026a17b
commit a318ce1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/openapi/deployment/pom.xml b/openapi/deployment/pom.xml
@@ -17,10 +17,6 @@
       <groupId>org.jboss.shamrock</groupId>
       <artifactId>shamrock-core-deployment</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.shamrock</groupId>
-      <artifactId>shamrock-weld-deployment</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jboss.shamrock</groupId>
       <artifactId>shamrock-undertow-deployment</artifactId>

diff --git a/...i/runtime/src/main/java/org/jboss/shamrock/openapi/runtime/OpenApiDeploymentTemplate.java b/...i/runtime/src/main/java/org/jboss/shamrock/openapi/runtime/OpenApiDeploymentTemplate.java
@@ -1,11 +1,10 @@
 package org.jboss.shamrock.openapi.runtime;
 
-import javax.enterprise.inject.se.SeContainer;
-
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.openapi.OASFilter;
 import org.eclipse.microprofile.openapi.models.OpenAPI;
+import org.jboss.shamrock.runtime.BeanContainer;
 import org.jboss.shamrock.runtime.ContextObject;
 import org.jboss.shamrock.runtime.Shamrock;
 
@@ -19,7 +18,7 @@
  */
 public class OpenApiDeploymentTemplate {
 
-    public void setupModel(@ContextObject("weld.container") SeContainer container, OpenAPI staticModel, OpenAPI annotationModel) {
+    public void setupModel(@ContextObject("bean.container") BeanContainer container, OpenAPI staticModel, OpenAPI annotationModel) {
         Config config = ConfigProvider.getConfig();
         OpenApiConfig openApiConfig = new OpenApiConfigImpl(config);
 
@@ -32,7 +31,7 @@ public void setupModel(@ContextObject("weld.container") SeContainer container, O
         document.filter(filter(openApiConfig));
         document.initialize();
 
-        container.select(OpenApiDocumentProducer.class).get().setDocument(document);
+        container.instance(OpenApiDocumentProducer.class).setDocument(document);
     }
 
     private OpenApiDocument createDocument(OpenApiConfig openApiConfig) {