GraphQL 4.0.0 Bump. Project clean up. #80

JoeHartzell · 2021-03-27T03:49:16Z

This includes a bump to the GraphQL version for 4.0.0. It also includes cleaning up the example projects. This would include

GraphQL.Relay.StarWars

Remove Node.js dependency
Fix swapi url
Bump GraphQL version to 4.0.0.
Bump dotnet version to .net5

GraphQL.Relay

Bump GraphQL version to 4.0.0.
Bump dotnet version to .net5
Fixed breaking changes

GraphQL.Relay.Todo

Bump GraphQL version to 4.0.0.
Bump dotnet version to .net5
Fixed breaking changes

GraphQL.Relay.Test

Bump GraphQL version to 4.0.0.
Bump dotnet version to .net5
Fixed breaking changes

Would resolve a few open issues. #79, #54

…aphql.Relay.StarWars to .net5.0 and graphql-dotnet 4.0.2.

src/GraphQL.Relay/Types/MutationGraphType.cs

src/GraphQL.Relay/Types/QueryGraphType.cs

Shane32 · 2021-03-29T13:36:12Z

This is a big step in the right direction; thanks @JoeHartzell ! Once the "TODO: Test this" comment has been resolved, I would approve this. I think the project still has a lot more cleanup to do before it is ready for another release.

JoeHartzell · 2021-03-29T20:25:03Z

Alright. I will look into adding a test for that. In the little bit of testing I did, it seems to work. I just didn't get to verifying it with a test case.

I did see quite a bit more to clean up around documentation, example projects, etc... If you have a roadmap/issues that need resolved I would be more than happy to help. I was trying really hard to just keep this focused on the .net/graphql version updates. 😂

Co-authored-by: Shane Krueger <[email protected]>

sungam3r · 2021-03-29T21:14:23Z

Relates to #55

Shane32 · 2021-03-30T00:45:57Z

Yes, much easier to review multiple smaller PRs than one large one!

The next step (separate PR) is probably stripping away all the bits of the library that don’t relate to Relay and/or have other better implementations, such as deleting the Http namespace in favor of the server project. (I see you’ve already converted the sample projects to use the server project 👍 .)

JoeHartzell · 2021-03-30T21:04:33Z

Alright I wrote a few test cases for the remaining TODO. Turns out that the method I used was incorrect, should be corrected now.
Since this relates to #55, would you like me to merge those changes into this PR?

…tead of by object

sungam3r · 2021-03-30T21:38:31Z

No. I need to review both independently.

src/GraphQL.Relay/GraphQL.Relay.csproj

Co-authored-by: Shane Krueger <[email protected]>

JoeHartzell · 2021-03-31T21:16:26Z

Alright I think this is good to go. I'm not sure why this is conflicting? Those conflicts should have been resolved at commit b3ad664. The conflict showed up after accepting the suggestion change to the .net targeting.

There is nothing for me to merge from the upstream (GraphQL.Relay master) branch.

Shane32 · 2021-03-31T21:23:30Z

Switch to the upstream branch and pull it, and then switch back to your branch and merge from master, then push the merge commit. I think @sungam3r pulled in some dependabot changes within the last 24 hours which caused the conflict.

Shane32 · 2021-03-31T21:32:40Z

If you don't have the upstream master branch pulled, then you need to "fetch" the upstream repo so that when you try to merge, it will see the new commits.

Shane32 · 2021-03-31T22:46:01Z

Merge this JoeHartzell#1 and it will fix the PR @JoeHartzell

Shane32 · 2021-03-31T22:51:28Z

Switch to the upstream branch and pull it, and then switch back to your branch and merge from master, then push the merge commit. I think @sungam3r pulled in some dependabot changes within the last 24 hours which caused the conflict.

Btw, since your branch is named master, you won't be able to pull the main repo's master branch. But you should still be able to "fetch" the main repo and then merge changes from it.

Fix merge conflict

JoeHartzell · 2021-04-01T00:03:15Z

Alright thanks for the clarification there!

sungam3r · 2021-04-01T14:08:30Z

I would like to review this before merge when I have time.

Shane32 · 2021-04-01T19:16:07Z

@sungam3r If you have time, that would be great! This isn't the end-all of cleanup required for this repo before we release another version, so if you are busy, then we should merge it based on my review. We can certainly wait a bit though.

Shane32 · 2021-04-13T15:04:27Z

@sungam3r I have reviewed this PR and am going to merge this to keep development moving on this repo. Mostly this is just cleanup and transition from 2.4.0 anyway.

Shane32 · 2021-04-15T04:56:05Z

@sungam3r I've merged this PR. Please make comments when/if you have time to do so, and we can address them in a separate PR.

Shane32 · 2021-04-15T05:10:35Z

This is the first meaningful commit to this repo in almost 3 years. 🥇

src/GraphQL.Relay.StarWars/GraphQL.Relay.StarWars.csproj

sungam3r · 2021-04-15T20:17:33Z

src/GraphQL.Relay.StarWars/Startup.cs

+using GraphQL.Server;
+using GraphQL.Types;
+using GraphQL.Types.Relay;
+using GraphQL.Relay.Types;


Add empty line after using.

src/GraphQL.Relay.Test/GraphQL.Relay.Test.csproj

sungam3r · 2021-04-15T20:22:00Z

src/GraphQL.Relay.Test/Types/IncompleteSliceExceptionTests.cs

@@ -19,7 +19,7 @@ public void Message_WhenMessageIsProvidedInCtor_ReturnsPassedMessage()
            var ex = new IncompleteSliceException("Test");
            Assert.Equal("Test", ex.Message);
            ex = new IncompleteSliceException("Test", "paramName");
-            Assert.StartsWith($"Test{Environment.NewLine}", ex.Message);
+            Assert.StartsWith($"Test", ex.Message);


sungam3r · 2021-04-15T20:22:09Z

src/GraphQL.Relay.Test/Types/IncompleteSliceExceptionTests.cs

@@ -32,7 +32,7 @@ public void InnerException_WhenInnerExceptionIsPassedToCtor_ReturnsPassedExcepti
            Assert.Equal(inner, ex.InnerException);

            ex = new IncompleteSliceException("Test", "paramName", inner);
-            Assert.StartsWith($"Test{Environment.NewLine}", ex.Message);
+            Assert.StartsWith($"Test", ex.Message);


sungam3r · 2021-04-15T20:22:48Z

src/GraphQL.Relay.Test/Types/QueryGraphTypeTests.cs

@@ -0,0 +1,119 @@
+namespace GraphQL.Relay.Test.Types
+{
+    using System.Linq;


Move usings outside the namespace.

sungam3r · 2021-04-15T20:23:11Z

src/GraphQL.Relay.Test/Types/QueryGraphTypeTests.cs

+    {
+        public string Id { get; set; }
+
+        public static IEnumerable<SimpleData> GetData() => new List<SimpleData> {


{ on new line

sungam3r · 2021-04-15T20:23:33Z

src/GraphQL.Relay.Test/Types/QueryGraphTypeTests.cs

+        public override SimpleData GetById(string id) => SimpleData
+            .GetData()
+            .FirstOrDefault(x => x.Id.Equals(id));
+


remove empty line

sungam3r · 2021-04-15T20:24:47Z

src/GraphQL.Relay.Test/Types/QueryGraphTypeTests.cs

+
+    public class SimpleSchema : Schema
+    {
+        public SimpleSchema() => (Query) = (new QueryGraphType());


public SimpleSchema() => (Query) = (new QueryGraphType());
->
public SimpleSchema() => Query = new QueryGraphType();

src/GraphQL.Relay.Todo/GraphQL.Relay.Todo.csproj

sungam3r · 2021-04-15T20:28:12Z

src/GraphQL.Relay.Todo/Schema/Mutation.cs

    {
-        public TodoMutation(): base() {
+        public TodoMutation() : base()


public TodoMutation() : base() -> public TodoMutation()

src/GraphQL.Relay.Todo/GraphQL.Relay.Todo.csproj

src/GraphQL.Relay/GraphQL.Relay.csproj

sungam3r · 2021-04-15T20:40:09Z

I've merged this PR. Please make comments when/if you have time to do so, and we can address them in a separate PR.

#86

JoeHartzell · 2021-04-16T22:28:04Z

I think @Shane32 might have addressed some of these. As most of these are "linting" errors, do you think it would make sense to add an .editorconfig file to the project? Could probably just bring the one over from graphql-dotnet just to keep things consistent?

sungam3r · 2021-04-17T04:51:42Z

Yes

sungam3r · 2021-04-17T04:53:26Z

As an option we may pull editorconfig from main repo into this repo root when building on ci.

JoeHartzell added 4 commits March 26, 2021 19:22

Updated Graphql.Relay to .net5.0 and graphql-dotnet 4.0.2. Updated Gr…

3117585

…aphql.Relay.StarWars to .net5.0 and graphql-dotnet 4.0.2.

Updated GraphQL.Relay.Test to .net5. Fixed failing tests.

0fd3148

Fixed errors with GraphQL.Relay.Todo

966532c

Removed Node.js dependency in GraphQL.Relay.StarWars

a3e797d

Shane32 reviewed Mar 29, 2021

View reviewed changes

src/GraphQL.Relay/Types/MutationGraphType.cs Outdated Show resolved Hide resolved

Shane32 reviewed Mar 29, 2021

View reviewed changes

src/GraphQL.Relay/Types/QueryGraphType.cs Outdated Show resolved Hide resolved

Update src/GraphQL.Relay/Types/MutationGraphType.cs

09c3eb4

Co-authored-by: Shane Krueger <[email protected]>

JoeHartzell added 2 commits March 30, 2021 16:58

Added QueryGraphTypeTests. Fixed the failing test for QueryGraphType.

864fc90

Fixed merge conflicts

b3ad664

Changed QueryGraphTypeTests to compare arguments by Name and Type ins…

e707956

…tead of by object

Shane32 requested changes Mar 30, 2021

View reviewed changes

src/GraphQL.Relay/GraphQL.Relay.csproj Outdated Show resolved Hide resolved

Update src/GraphQL.Relay/GraphQL.Relay.csproj

fd6f16f

Co-authored-by: Shane Krueger <[email protected]>

Merge

2fffc97

JoeHartzell and others added 2 commits March 31, 2021 19:55

Fixed merge conflicts

60d1dba

Merge pull request #1 from graphql-dotnet/fix_merge

8bb63bd

Fix merge conflict

Shane32 approved these changes Apr 1, 2021

View reviewed changes

Shane32 merged commit eae38b7 into graphql-dotnet:master Apr 15, 2021