Skip to content

Feature/osgi servlet config #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oliemansm merged 2 commits into from
Mar 20, 2020
Merged

Feature/osgi servlet config #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d643d8
Added OSGi metadata to kickstart artefact and externalised BND config…
Mar 11, 2020
73b4025
Added OSGi support for multiple configurable GraphQL servlets
Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions graphql-java-kickstart/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Export-Package: graphql.kickstart.*
6 changes: 6 additions & 0 deletions graphql-java-kickstart/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
apply plugin: 'biz.aQute.bnd.builder'

jar {
bndfile = 'bnd.bnd'
}

dependencies {
// GraphQL
compile "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
Expand Down
2 changes: 2 additions & 0 deletions graphql-java-servlet/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Export-Package: graphql.kickstart.*
Require-Capability: osgi.extender
6 changes: 4 additions & 2 deletions graphql-java-servlet/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apply plugin: 'java-library-distribution'
apply plugin: 'biz.aQute.bnd.builder'

jar {
bnd ('Require-Capability': 'osgi.extender')
bndfile = 'bnd.bnd'
}

dependencies {
Expand All @@ -24,7 +24,9 @@ dependencies {
compileOnly 'org.osgi:org.osgi.core:6.0.0'
compileOnly 'org.osgi:org.osgi.service.cm:1.5.0'
compileOnly 'org.osgi:org.osgi.service.component:1.3.0'
compileOnly 'biz.aQute.bnd:biz.aQute.bndlib:4.3.1'
compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0'
compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0'
compileOnly 'org.osgi:org.osgi.annotation:6.0.0'

testCompile 'io.github.graphql-java:graphql-java-annotations:5.2'

Expand Down
19 changes: 11 additions & 8 deletions graphql-java-servlet/src/main/java/graphql/kickstart/servlet/OsgiGraphQLHttpServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import static graphql.schema.GraphQLObjectType.newObject;
import static graphql.schema.GraphQLSchema.newSchema;

import aQute.bnd.component.annotations.Activate;
import aQute.bnd.component.annotations.Component;
import aQute.bnd.component.annotations.Deactivate;
import aQute.bnd.component.annotations.Reference;
import aQute.bnd.component.annotations.ReferenceCardinality;
import aQute.bnd.component.annotations.ReferencePolicy;
import aQute.bnd.component.annotations.ReferencePolicyOption;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.osgi.service.component.annotations.ReferencePolicy;
import org.osgi.service.component.annotations.ReferencePolicyOption;
import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
import graphql.execution.preparsed.PreparsedDocumentProvider;
import graphql.kickstart.servlet.config.DefaultGraphQLSchemaServletProvider;
Expand Down Expand Up @@ -38,6 +38,8 @@
import graphql.kickstart.servlet.core.GraphQLServletListener;
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
import graphql.kickstart.execution.instrumentation.NoOpInstrumentationProvider;
import org.osgi.service.metatype.annotations.Designate;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
Expand All @@ -49,8 +51,9 @@

@Component(
service = {javax.servlet.http.HttpServlet.class, javax.servlet.Servlet.class},
property = {"alias=/graphql", "jmx.objectname=graphql.servlet:type=graphql"}
property = {"service.description=GraphQL HTTP Servlet"}
)
@Designate(ocd = OsgiGraphQLHttpServletConfiguration.class, factory = true)
public class OsgiGraphQLHttpServlet extends AbstractGraphQLHttpServlet {

private final List<GraphQLQueryProvider> queryProviders = new ArrayList<>();
Expand Down
14 changes: 14 additions & 0 deletions ...-servlet/src/main/java/graphql/kickstart/servlet/OsgiGraphQLHttpServletConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package graphql.kickstart.servlet;

import org.osgi.service.metatype.annotations.AttributeDefinition;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;

@ObjectClassDefinition(name = "GraphQL HTTP Servlet", description = "GraphQL HTTP Servlet Configuration")
@interface OsgiGraphQLHttpServletConfiguration {

@AttributeDefinition(name = "alias", description = "Servlet alias")
String alias() default "/graphql";

@AttributeDefinition(name = "jmx.objectname", description = "JMX object name")
String jmx_objectname() default "graphql.servlet:type=graphql";
}