Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ build
*.iml
*.ipr
*.iws
.idea/
12 changes: 11 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ repositories {
}

apply plugin: 'java'
compileJava {
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
}

apply plugin: 'osgi'
apply plugin: 'license'
apply plugin: 'java-library-distribution'
Expand Down Expand Up @@ -117,7 +122,7 @@ dependencies {
compile 'commons-fileupload:commons-fileupload:1.3.1'

// GraphQL
compile 'com.graphql-java:graphql-java:2.2.0'
compile 'com.graphql-java:graphql-java:2.3.0'
compile 'com.graphql-java:graphql-java-annotations:0.13.1'

// JSON
Expand Down Expand Up @@ -179,6 +184,11 @@ modifyPom {
name 'Yurii Rashkovskii'
email 'yrashk@gmail.com'
}
developer {
id 'apottere'
name 'Andrew Potter'
email 'apottere@gmail.com'
}
}
}
}
12 changes: 10 additions & 2 deletions src/test/java/graphql/servlet/GraphQLVariablesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,19 @@ public static class Data {
private String field2;
}

@Value
public static class DataInput {
@GraphQLField
private String field1;
@GraphQLField
private String field2;
}

@GraphQLName("data")
public static class DataQuery {
@GraphQLField
public Data echo(Data data) {
return data;
public Data echo(DataInput data) {
return new Data(data.getField1(), data.getField2());
}
}

Expand Down