Remove GraphQL (Netflix DGS) layer and cursor-based pagination infrastructure

.github/workflows/gradle.yml

@@ -16,13 +16,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: zulu
         java-version: '11'
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches

build.gradle

@@ -2,7 +2,6 @@ plugins {
     id 'org.springframework.boot' version '2.6.3'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java'
-    id "com.netflix.dgs.codegen" version "5.0.6"
     id "com.diffplug.spotless" version "6.2.1"
 }
 
@@ -36,7 +35,6 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-hateoas'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2'
-    implementation 'com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:4.9.21'
     implementation 'org.flywaydb:flyway-core'
     implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2',
@@ -58,15 +56,17 @@ dependencies {
 
 tasks.named('test') {
 	useJUnitPlatform()
+	reports {
+		html.required = true
+	}
+	testLogging {
+		events "passed", "skipped", "failed"
+		showStandardStreams = true
+	}
 }
 
 tasks.named('clean') {
     doFirst {
         delete './dev.db'
     }
 }
-
-tasks.named('generateJava') {
-    schemaPaths = ["${projectDir}/src/main/resources/schema"] // List of directories containing schema files
-    packageName = 'io.spring.graphql' // The package name to use to generate sources
-}

src/main/java/io/spring/api/security/WebSecurityConfig.java

@@ -48,10 +48,6 @@ protected void configure(HttpSecurity http) throws Exception {
         .authorizeRequests()
         .antMatchers(HttpMethod.OPTIONS)
         .permitAll()
-        .antMatchers("/graphiql")
-        .permitAll()
-        .antMatchers("/graphql")
-        .permitAll()
         .antMatchers(HttpMethod.GET, "/articles/feed")
         .authenticated()
         .antMatchers(HttpMethod.POST, "/users", "/users/login")

src/main/java/io/spring/application/ArticleQueryService.java

@@ -10,14 +10,12 @@
 import io.spring.infrastructure.mybatis.readservice.ArticleReadService;
 import io.spring.infrastructure.mybatis.readservice.UserRelationshipQueryService;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import lombok.AllArgsConstructor;
-import org.joda.time.DateTime;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -51,52 +49,6 @@ public Optional<ArticleData> findBySlug(String slug, User user) {
     }
   }
 
-  public CursorPager<ArticleData> findRecentArticlesWithCursor(
-      String tag,
-      String author,
-      String favoritedBy,
-      CursorPageParameter<DateTime> page,
-      User currentUser) {
-    List<String> articleIds =
-        articleReadService.findArticlesWithCursor(tag, author, favoritedBy, page);
-    if (articleIds.size() == 0) {
-      return new CursorPager<>(new ArrayList<>(), page.getDirection(), false);
-    } else {
-      boolean hasExtra = articleIds.size() > page.getLimit();
-      if (hasExtra) {
-        articleIds.remove(page.getLimit());
-      }
-      if (!page.isNext()) {
-        Collections.reverse(articleIds);
-      }
-
-      List<ArticleData> articles = articleReadService.findArticles(articleIds);
-      fillExtraInfo(articles, currentUser);
-
-      return new CursorPager<>(articles, page.getDirection(), hasExtra);
-    }
-  }
-
-  public CursorPager<ArticleData> findUserFeedWithCursor(
-      User user, CursorPageParameter<DateTime> page) {
-    List<String> followdUsers = userRelationshipQueryService.followedUsers(user.getId());
-    if (followdUsers.size() == 0) {
-      return new CursorPager<>(new ArrayList<>(), page.getDirection(), false);
-    } else {
-      List<ArticleData> articles =
-          articleReadService.findArticlesOfAuthorsWithCursor(followdUsers, page);
-      boolean hasExtra = articles.size() > page.getLimit();
-      if (hasExtra) {
-        articles.remove(page.getLimit());
-      }
-      if (!page.isNext()) {
-        Collections.reverse(articles);
-      }
-      fillExtraInfo(articles, user);
-      return new CursorPager<>(articles, page.getDirection(), hasExtra);
-    }
-  }
-
   public ArticleDataList findRecentArticles(
       String tag, String author, String favoritedBy, Page page, User currentUser) {
     List<String> articleIds = articleReadService.queryArticles(tag, author, favoritedBy, page);

src/main/java/io/spring/application/CommentQueryService.java

@@ -4,14 +4,11 @@
 import io.spring.core.user.User;
 import io.spring.infrastructure.mybatis.readservice.CommentReadService;
 import io.spring.infrastructure.mybatis.readservice.UserRelationshipQueryService;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
-import org.joda.time.DateTime;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -53,33 +50,4 @@ public List<CommentData> findByArticleId(String articleId, User user) {
     return comments;
   }
 
-  public CursorPager<CommentData> findByArticleIdWithCursor(
-      String articleId, User user, CursorPageParameter<DateTime> page) {
-    List<CommentData> comments = commentReadService.findByArticleIdWithCursor(articleId, page);
-    if (comments.isEmpty()) {
-      return new CursorPager<>(new ArrayList<>(), page.getDirection(), false);
-    }
-    if (user != null) {
-      Set<String> followingAuthors =
-          userRelationshipQueryService.followingAuthors(
-              user.getId(),
-              comments.stream()
-                  .map(commentData -> commentData.getProfileData().getId())
-                  .collect(Collectors.toList()));
-      comments.forEach(
-          commentData -> {
-            if (followingAuthors.contains(commentData.getProfileData().getId())) {
-              commentData.getProfileData().setFollowing(true);
-            }
-          });
-    }
-    boolean hasExtra = comments.size() > page.getLimit();
-    if (hasExtra) {
-      comments.remove(page.getLimit());
-    }
-    if (!page.isNext()) {
-      Collections.reverse(comments);
-    }
-    return new CursorPager<>(comments, page.getDirection(), hasExtra);
-  }
 }

src/main/java/io/spring/application/data/ArticleData.java

@@ -1,7 +1,6 @@
 package io.spring.application.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.spring.application.DateTimeCursor;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -11,7 +10,7 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class ArticleData implements io.spring.application.Node {
+public class ArticleData {
   private String id;
   private String slug;
   private String title;
@@ -26,8 +25,4 @@ public class ArticleData implements io.spring.application.Node {
   @JsonProperty("author")
   private ProfileData profileData;
 
-  @Override
-  public DateTimeCursor getCursor() {
-    return new DateTimeCursor(updatedAt);
-  }
 }

src/main/java/io/spring/application/data/CommentData.java

@@ -2,8 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.spring.application.DateTimeCursor;
-import io.spring.application.Node;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -12,7 +10,7 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class CommentData implements Node {
+public class CommentData {
   private String id;
   private String body;
   @JsonIgnore private String articleId;
@@ -22,8 +20,4 @@ public class CommentData implements Node {
   @JsonProperty("author")
   private ProfileData profileData;
 
-  @Override
-  public DateTimeCursor getCursor() {
-    return new DateTimeCursor(createdAt);
-  }
 }