Merge pull request #717 from enonic/issue-716

Upgrade lib-graphql to 2.0.1 #716

Author: anatol-sialitski

build.gradle

@@ -38,7 +38,7 @@ dependencies {
     include "com.enonic.lib:lib-mustache:2.0.0"
     include "com.enonic.lib:lib-http-client:3.0.0"
     include "com.enonic.lib:lib-util:2.2.1"
-    include "com.enonic.lib:lib-graphql:1.1.1"
+    include "com.enonic.lib:lib-graphql:2.0.1"
     include "com.enonic.lib:lib-geoip:2.0.0"
     include "com.enonic.lib:lib-text-encoding:2.0.0"
     include "com.enonic.lib:lib-notifications:2.0.0"

src/main/resources/lib/officeleague/graphql.js

@@ -0,0 +1,39 @@
+const graphQlLib = require('/lib/graphql');
+
+for (let prop in graphQlLib) {
+    exports[prop] = graphQlLib[prop];
+}
+
+const schemaGenerator = graphQlLib.newSchemaGenerator();
+
+exports.createSchema = function (params) {
+    return schemaGenerator.createSchema(params);
+}
+
+exports.createPageInfoObjectType = function (params) {
+    return schemaGenerator.createPageInfoObjectType(params);
+}
+
+exports.createObjectType = function (params) {
+    return schemaGenerator.createObjectType(params);
+}
+
+exports.createInputObjectType = function (params) {
+    return schemaGenerator.createInputObjectType(params);
+}
+
+exports.createInterfaceType = function (params) {
+    return schemaGenerator.createInterfaceType(params);
+}
+
+exports.createUnionType = function (params) {
+    return schemaGenerator.createUnionType(params);
+}
+
+exports.createEnumType = function (params) {
+    return schemaGenerator.createEnumType(params);
+}
+
+exports.getSchemaGenerator = function () {
+    return schemaGenerator;
+}

src/main/resources/services/graphql/graphql-enums.js

@@ -1,4 +1,4 @@
-var graphQlLib = require('/lib/graphql');
+var graphQlLib = require('/lib/officeleague/graphql');
 
 exports.handednessEnumType = graphQlLib.createEnumType({
     name: 'Handedness',

src/main/resources/services/graphql/graphql-info-pages.js

@@ -1,4 +1,4 @@
-var graphQlLib = require('/lib/graphql');
+var graphQlLib = require('/lib/officeleague/graphql');
 // var graphQlConnectionLib = require('/lib/graphql-connection');
 // var graphQlEnumsLib = require('./graphql-enums');
 // var graphQlUtilLib = require('./graphql-util');
@@ -26,4 +26,4 @@ exports.infoPageType = graphQlLib.createObjectType({
             }
         }
     }
-});
+});

src/main/resources/services/graphql/graphql-input-types.js

@@ -1,4 +1,4 @@
-var graphQlLib = require('/lib/graphql');
+var graphQlLib = require('/lib/officeleague/graphql');
 var graphQlEnumsLib = require('./graphql-enums');
 
 exports.pointCreationType = graphQlLib.createInputObjectType({
@@ -27,4 +27,4 @@ exports.gamePlayerCreationType = graphQlLib.createInputObjectType({
             type: graphQlLib.nonNull(graphQlLib.GraphQLID)
         }
     }
-});
+});

src/main/resources/services/graphql/graphql-object-types.js

@@ -1,4 +1,4 @@
-var graphQlLib = require('/lib/graphql');
+var graphQlLib = require('/lib/officeleague/graphql');
 var graphQlConnectionLib = require('/lib/graphql-connection');
 var graphQlEnumsLib = require('./graphql-enums');
 var graphQlUtilLib = require('./graphql-util');
@@ -165,7 +165,7 @@ exports.playerType = graphQlLib.createObjectType({
     }
 });
 
-exports.playerConnectionType = graphQlConnectionLib.createConnectionType(exports.playerType);
+exports.playerConnectionType = graphQlConnectionLib.createConnectionType(graphQlLib.getSchemaGenerator(), exports.playerType);
 
 exports.teamStatsType = graphQlLib.createObjectType({
     name: 'TeamStats',
@@ -251,7 +251,7 @@ exports.teamType = graphQlLib.createObjectType({
         }
     }
 });
-exports.teamConnectionType = graphQlConnectionLib.createConnectionType(exports.teamType);
+exports.teamConnectionType = graphQlConnectionLib.createConnectionType(graphQlLib.getSchemaGenerator(), exports.teamType);
 
 exports.gamePlayerType = graphQlLib.createObjectType({
     name: 'GamePlayer',
@@ -470,7 +470,7 @@ exports.gameType = graphQlLib.createObjectType({
         }
     }
 });
-exports.gameConnectionType = graphQlConnectionLib.createConnectionType(exports.gameType);
+exports.gameConnectionType = graphQlConnectionLib.createConnectionType(graphQlLib.getSchemaGenerator(), exports.gameType);
 
 exports.leaguePlayerType = graphQlLib.createObjectType({
     name: 'LeaguePlayer',
@@ -536,7 +536,7 @@ exports.leaguePlayerType = graphQlLib.createObjectType({
         }
     }
 });
-exports.leaguePlayerConnectionType = graphQlConnectionLib.createConnectionType(exports.leaguePlayerType);
+exports.leaguePlayerConnectionType = graphQlConnectionLib.createConnectionType(graphQlLib.getSchemaGenerator(), exports.leaguePlayerType);
 
 exports.leagueTeamType = graphQlLib.createObjectType({
     name: 'LeagueTeam',
@@ -576,7 +576,7 @@ exports.leagueTeamType = graphQlLib.createObjectType({
         }
     }
 });
-exports.leagueTeamConnectionType = graphQlConnectionLib.createConnectionType(exports.leagueTeamType);
+exports.leagueTeamConnectionType = graphQlConnectionLib.createConnectionType(graphQlLib.getSchemaGenerator(), exports.leagueTeamType);
 
 exports.leagueStatsType = graphQlLib.createObjectType({
     name: 'LeagueStats',
@@ -808,4 +808,4 @@ var getCurrentPlayerId = function () {
 
 var isAdmin = function () {
     return authLib.hasRole('system.admin');
-};
+};

src/main/resources/services/graphql/graphql-root-mutation.js

@@ -1,4 +1,4 @@
-var graphQlLib = require('/lib/graphql');
+var graphQlLib = require('/lib/officeleague/graphql');
 var graphQlEnumsLib = require('./graphql-enums');
 var graphQlObjectTypesLib = require('./graphql-object-types');
 var graphQlInputTypesLib = require('./graphql-input-types');
@@ -875,4 +875,4 @@ var isNotAdmin = function () {
 
 var isAdmin = function () {
     return authLib.hasRole('system.admin');
-};
+};

src/main/resources/services/graphql/graphql-root-query.js

@@ -1,4 +1,4 @@
-const graphQlLib = require('/lib/graphql');
+const graphQlLib = require('/lib/officeleague/graphql');
 const graphQlConnectionLib = require('/lib/graphql-connection');
 const graphQlObjectTypesLib = require('./graphql-object-types');
 const graphQlInfoPagesLib = require('./graphql-info-pages');
@@ -317,4 +317,4 @@ exports.rootQueryType = graphQlLib.createObjectType({
             }
         }
     }
-});
+});

src/main/resources/services/graphql/graphql-schema.js

@@ -1,8 +1,8 @@
-var graphQlLib = require('/lib/graphql');
+var graphQlLib = require('/lib/officeleague/graphql');
 var graphQlRootQueryLib = require('./graphql-root-query');
 var graphQlRootMutationLib = require('./graphql-root-mutation');
 
 exports.schema = graphQlLib.createSchema({
     query: graphQlRootQueryLib.rootQueryType,
     mutation: graphQlRootMutationLib.rootMutationType
-});
+});

src/main/resources/services/graphql/graphql.js

@@ -1,4 +1,4 @@
-var graphQlLib = require('/lib/graphql');
+var graphQlLib = require('/lib/officeleague/graphql');
 var schemaLib = require('./graphql-schema');
 
 exports.post = function (req) {
@@ -9,4 +9,4 @@ exports.post = function (req) {
         contentType: 'application/json',
         body: result
     };
-};
+};