diff --git a/task06/Readme.md b/task06/Readme.md index f4635e8..b3456c8 100644 --- a/task06/Readme.md +++ b/task06/Readme.md @@ -6,17 +6,6 @@ afterwards also helps. Right now the project only provides a Hello World example for GraphQL. -You can access GraphiQL with the url [http://localhost:8080/graphiql](http://localhost:8080/graphiql). - -You can use this query for the hello world example: -``` -query helloWorld { - helloWorld { - message - } -} -``` - # Task 06 Let's develop a simple blog service. It's possible to create, update and delete posts. Not every post is diff --git a/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/GraphQLAPI.java b/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/GraphQLAPI.java index 7c5bd97..326abe6 100644 --- a/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/GraphQLAPI.java +++ b/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/GraphQLAPI.java @@ -1,14 +1,23 @@ package de.hftstuttgart.vs.task06.api.graphql; -import de.hftstuttgart.vs.task06.api.graphql.model.HelloWorldDO; +import de.hftstuttgart.vs.task06.api.graphql.mapper.CommentMapper; +import de.hftstuttgart.vs.task06.api.graphql.mapper.PostMapper; +import de.hftstuttgart.vs.task06.api.graphql.mapper.PostStateMapper; +import de.hftstuttgart.vs.task06.api.graphql.model.CommentDO; +import de.hftstuttgart.vs.task06.api.graphql.model.CommentInputDO; +import de.hftstuttgart.vs.task06.api.graphql.model.PostDO; +import de.hftstuttgart.vs.task06.api.graphql.model.PostStateDO; import de.hftstuttgart.vs.task06.bm.BlogController; import jakarta.annotation.Nonnull; +import org.springframework.graphql.data.method.annotation.MutationMapping; import org.springframework.graphql.data.method.annotation.QueryMapping; import org.springframework.graphql.data.method.annotation.SchemaMapping; import org.springframework.stereotype.Controller; +import java.util.List; + @Controller -public class GraphQLAPI implements QueryResolver { +public class GraphQLAPI implements QueryResolver, MutationResolver { private final BlogController blogController; @@ -19,16 +28,46 @@ public class GraphQLAPI implements QueryResolver { @Nonnull @Override @QueryMapping - public HelloWorldDO helloWorld() { - return new HelloWorldDO(); + public List posts() { + return blogController.getPosts().stream().map(PostMapper::map).toList(); } - @SchemaMapping - public String message(final HelloWorldDO helloWorld) { - return "Hello World!"; + @Override + @MutationMapping + public PostDO addPost(@Nonnull final String text, @Nonnull final String userName) { + final var post = blogController.addPost(userName, text); + return PostMapper.map(post); } - //TODO 3: Add mappings for queries and mutations defined in your schema + @Override + @MutationMapping + public PostDO editPost(final int postID, @Nonnull final String text) throws Exception { + final var post = blogController.editPost(postID, text); + return PostMapper.map(post); + } - //TODO 5: Add field mapping for count of comments for a post + @Override + @MutationMapping + public CommentDO addComment(final int postID, @Nonnull final CommentInputDO commentInput) throws Exception { + final var comment = blogController.addComment(postID, commentInput.getUserName(), commentInput.getText()); + return CommentMapper.map(comment); + } + + @Override + @MutationMapping + public PostDO changePostState(final int postID, @Nonnull final PostStateDO state) throws Exception { + final var post = blogController.changePostState(postID, PostStateMapper.map(state)); + return PostMapper.map(post); + } + + // Field mapping + @SchemaMapping(typeName = "Post") + public List comments(final PostDO post) { + return blogController.getPost(post.getPostID()).getComments().stream().map(CommentMapper::map).toList(); + } + + @SchemaMapping(typeName = "Post") + public int commentCount(final PostDO post) { + return blogController.getCommentCount(post.getPostID()); + } } diff --git a/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/mapper/CommentMapper.java b/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/mapper/CommentMapper.java index 71bfee3..8b2870b 100644 --- a/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/mapper/CommentMapper.java +++ b/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/mapper/CommentMapper.java @@ -1,13 +1,13 @@ package de.hftstuttgart.vs.task06.api.graphql.mapper; -//import de.hftstuttgart.vs.task06.bm.model.Comment; -//import de.hftstuttgart.vs.task06.api.graphql.model.CommentDO; +import de.hftstuttgart.vs.task06.api.graphql.model.CommentDO; +import de.hftstuttgart.vs.task06.bm.model.Comment; public class CommentMapper { - /*public static CommentDO map(final Comment comment) { + public static CommentDO map(final Comment comment) { return CommentDO.builder() .setText(comment.getText()) .build(); - }*/ + } } diff --git a/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/mapper/PostMapper.java b/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/mapper/PostMapper.java index 5f3b538..0e9cf2c 100644 --- a/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/mapper/PostMapper.java +++ b/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/mapper/PostMapper.java @@ -1,15 +1,16 @@ package de.hftstuttgart.vs.task06.api.graphql.mapper; -//import de.hftstuttgart.vs.task06.api.graphql.model.PostDO; -//import de.hftstuttgart.vs.task06.bm.model.Post; +import de.hftstuttgart.vs.task06.api.graphql.model.PostDO; +import de.hftstuttgart.vs.task06.bm.model.Post; + public class PostMapper { - /*public static PostDO map(final Post post) { + public static PostDO map(final Post post) { return PostDO.builder() .setPostID(post.getPostID()) .setText(post.getText()) .setState(PostStateMapper.map(post.getState())) .build(); - }*/ + } } diff --git a/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/mapper/PostStateMapper.java b/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/mapper/PostStateMapper.java index d4ee701..5e9a258 100644 --- a/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/mapper/PostStateMapper.java +++ b/task06/src/main/java/de/hftstuttgart/vs/task06/api/graphql/mapper/PostStateMapper.java @@ -1,15 +1,15 @@ package de.hftstuttgart.vs.task06.api.graphql.mapper; -//import de.hftstuttgart.vs.task06.api.graphql.model.PostStateDO; -//import de.hftstuttgart.vs.task06.bm.model.PostState; +import de.hftstuttgart.vs.task06.api.graphql.model.PostStateDO; +import de.hftstuttgart.vs.task06.bm.model.PostState; public class PostStateMapper { - /*public static PostStateDO map(final PostState state) { + public static PostStateDO map(final PostState state) { return PostStateDO.valueOf(state.toString()); } public static PostState map(final PostStateDO state) { return PostState.valueOf(state.toString()); - }*/ + } } diff --git a/task06/src/main/java/de/hftstuttgart/vs/task06/bm/BlogController.java b/task06/src/main/java/de/hftstuttgart/vs/task06/bm/BlogController.java index bcc4e1d..f4ecaab 100644 --- a/task06/src/main/java/de/hftstuttgart/vs/task06/bm/BlogController.java +++ b/task06/src/main/java/de/hftstuttgart/vs/task06/bm/BlogController.java @@ -94,6 +94,6 @@ public class BlogController implements UserRepository, PostRepository { public int getCommentCount(final int postID) { throw new RuntimeException("NOT IMPLEMENTED"); - //TODO 4: implement method counting the comments for a post + //TODO 3: implement method counting the comments for a post } } diff --git a/task06/src/main/java/de/hftstuttgart/vs/task06/bm/model/Post.java b/task06/src/main/java/de/hftstuttgart/vs/task06/bm/model/Post.java index 2f8cc03..eebc382 100644 --- a/task06/src/main/java/de/hftstuttgart/vs/task06/bm/model/Post.java +++ b/task06/src/main/java/de/hftstuttgart/vs/task06/bm/model/Post.java @@ -3,6 +3,7 @@ package de.hftstuttgart.vs.task06.bm.model; import java.util.List; import java.util.Objects; +//TODO How is the state of a post? public final class Post { private final int postID; private final String userName; diff --git a/task06/src/main/resources/graphql/schema.graphqls b/task06/src/main/resources/graphql/schema.graphqls index 8edf9a3..72f5b80 100644 --- a/task06/src/main/resources/graphql/schema.graphqls +++ b/task06/src/main/resources/graphql/schema.graphqls @@ -1,11 +1,39 @@ +type Post { + postID: Int! + text: String! + state: PostState! + user: User! + commentCount: Int! + comments: [Comment!]! +} + +enum PostState { + PUBLISHED, UNPUBLISHED, LOCKED +} + +type User { + userName: String! + firstName: String + lastName: String +} + +type Comment { + text: String! + user: User! +} + +input CommentInput { + text: String! + userName: String! +} + type Query { - helloWorld: HelloWorld! + posts: [Post!]! } -type HelloWorld { - message: String -} - -# TODO 1: Add type definitions for the blog service - -# TODO 2: Add queries and mutations with the corresponding parameters and return types \ No newline at end of file +type Mutation { + addPost(text: String!, userName: String!): Post + editPost(postID: Int!, text: String!): Post + addComment(postID: Int!, comment: CommentInput!): Comment + changePostState(postID: Int!, state: PostState!): Post +} \ No newline at end of file diff --git a/task07/.gitignore b/task07/.gitignore deleted file mode 100644 index 549e00a..0000000 --- a/task07/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/task07/.mvn/wrapper/maven-wrapper.jar b/task07/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index cb28b0e..0000000 Binary files a/task07/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/task07/.mvn/wrapper/maven-wrapper.properties b/task07/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index e70e7bc..0000000 --- a/task07/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,2 +0,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/task07/Readme.md b/task07/Readme.md deleted file mode 100644 index c2b7889..0000000 --- a/task07/Readme.md +++ /dev/null @@ -1,17 +0,0 @@ -# Getting Started - -We're going to build a small application which displays continents and countries of the world. -The frontend is already there, you need to integrate a GraphQL API to fetch the data from. -You can access GraphiQL of this API with the url [https://countries.trevorblades.com/](https://countries.trevorblades.com/). - -Play around with the API and get familiar with available queries and the fields of the returned objects as well as the relations. - -# Task 07 - -Let's develop a web app which displays continent and country information. -You need to provide the needed GraphQL queries and configure the GraphQL Client to use the correct documents. - -1. Generate all necessary files (`maven compile`) -2. Add the necessary GraphQL queries in the folder `graphql-documents` -3. Configure the `CountryClient` by filling in the variables and documents -4. Test the frontend if all information is displayed correctly diff --git a/task07/mvnw b/task07/mvnw deleted file mode 100644 index 66df285..0000000 --- a/task07/mvnw +++ /dev/null @@ -1,308 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.2.0 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "$(uname)" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --unix "$CLASSPATH") -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin ; then - javaHome="$(dirname "\"$javaExecutable\"")" - javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" - else - javaExecutable="$(readlink -f "\"$javaExecutable\"")" - fi - javaHome="$(dirname "\"$javaExecutable\"")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=$(cd "$wdir/.." || exit 1; pwd) - fi - # end of workaround - done - printf '%s' "$(cd "$basedir" || exit 1; pwd)" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' < "$1" - fi -} - -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi -} - -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" -else - log "Couldn't find $wrapperJarPath, downloading it ..." - - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; - esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi - - if command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; - esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." - exit 1 - fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 - exit 1 - fi -fi - -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/task07/mvnw.cmd b/task07/mvnw.cmd deleted file mode 100644 index 95ba6f5..0000000 --- a/task07/mvnw.cmd +++ /dev/null @@ -1,205 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM https://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.2.0 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B -) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% diff --git a/task07/pom.xml b/task07/pom.xml deleted file mode 100644 index 14243bb..0000000 --- a/task07/pom.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.2.5 - - - de.hftstuttgart.vs - task07 - 0.0.1-SNAPSHOT - task07 - GraphQL Client task - - 17 - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework - spring-webflux - - - org.springframework.boot - spring-boot-starter-graphql - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.graphql - spring-graphql-test - test - - - org.springframework.boot - spring-boot-devtools - runtime - - - - - - - io.github.deweyjose - graphqlcodegen-maven-plugin - 1.60.1 - - - dgs-codegen - - generate - - - - src/main/resources/graphql-client - - de.hftstuttgart.vs.task07.integration.graphql - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-dgs-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/task07/src/main/java/de/hftstuttgart/vs/task07/Task07Application.java b/task07/src/main/java/de/hftstuttgart/vs/task07/Task07Application.java deleted file mode 100644 index a0fbdd2..0000000 --- a/task07/src/main/java/de/hftstuttgart/vs/task07/Task07Application.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.hftstuttgart.vs.task07; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Task07Application { - - public static void main(String[] args) { - SpringApplication.run(Task07Application.class, args); - } - -} diff --git a/task07/src/main/java/de/hftstuttgart/vs/task07/integration/graphql/CountryClient.java b/task07/src/main/java/de/hftstuttgart/vs/task07/integration/graphql/CountryClient.java deleted file mode 100644 index d8fc622..0000000 --- a/task07/src/main/java/de/hftstuttgart/vs/task07/integration/graphql/CountryClient.java +++ /dev/null @@ -1,54 +0,0 @@ -package de.hftstuttgart.vs.task07.integration.graphql; - -import java.util.List; - -import org.springframework.graphql.client.GraphQlClient; -import org.springframework.graphql.client.HttpGraphQlClient; -import org.springframework.stereotype.Service; -import org.springframework.web.reactive.function.client.WebClient; - -import de.hftstuttgart.vs.task07.integration.graphql.types.Continent; -import de.hftstuttgart.vs.task07.integration.graphql.types.Country; -import reactor.core.publisher.Mono; - -@Service -public class CountryClient { - - /* - TODO: - 1. Add query document names - 2. Assign variables as needed in the query document - */ - - private final GraphQlClient graphQlClient; - - public CountryClient() { - final WebClient webClient = WebClient.create("https://countries.trevorblades.com/graphql"); - graphQlClient = HttpGraphQlClient.builder(webClient).build(); - } - - public Mono getCountryByCountryCode(final String countryCode, final String lang) { - return graphQlClient.documentName("TODO").variable("TODO", "TODO").retrieve("country").toEntity(Country.class); - } - - public Mono> getCountriesByCurrency(final String currency) { - return graphQlClient - .documentName("TODO") - .variable("TODO", "TODO") - .retrieve("countries") - .toEntityList(Country.class); - } - - public Mono> getAllContinents() { - return graphQlClient.documentName("TODO").retrieve("continents").toEntityList(Continent.class); - } - - public Mono getContinentByCodeWithCountries(final String code) { - return graphQlClient - .documentName("TODO") - .variable("TODO", "TODO") - .retrieve("continent") - .toEntity(Continent.class); - } - -} diff --git a/task07/src/main/java/de/hftstuttgart/vs/task07/service/ContinentService.java b/task07/src/main/java/de/hftstuttgart/vs/task07/service/ContinentService.java deleted file mode 100644 index a04ac48..0000000 --- a/task07/src/main/java/de/hftstuttgart/vs/task07/service/ContinentService.java +++ /dev/null @@ -1,29 +0,0 @@ -package de.hftstuttgart.vs.task07.service; - -import java.util.List; - -import org.springframework.stereotype.Service; - -import de.hftstuttgart.vs.task07.integration.graphql.CountryClient; -import de.hftstuttgart.vs.task07.integration.graphql.types.Continent; - -@Service -public class ContinentService implements IContinentService { - - private final CountryClient countryClient; - - public ContinentService(final CountryClient countryClient) { - this.countryClient = countryClient; - } - - @Override - public List getAllContinents() { - return countryClient.getAllContinents().block(); - } - - @Override - public Continent getContinentByCodeWithCountries(final String code) { - return countryClient.getContinentByCodeWithCountries(code).block(); - } - -} diff --git a/task07/src/main/java/de/hftstuttgart/vs/task07/service/CountryService.java b/task07/src/main/java/de/hftstuttgart/vs/task07/service/CountryService.java deleted file mode 100644 index 3bf2558..0000000 --- a/task07/src/main/java/de/hftstuttgart/vs/task07/service/CountryService.java +++ /dev/null @@ -1,29 +0,0 @@ -package de.hftstuttgart.vs.task07.service; - -import java.util.List; - -import org.springframework.stereotype.Service; - -import de.hftstuttgart.vs.task07.integration.graphql.CountryClient; -import de.hftstuttgart.vs.task07.integration.graphql.types.Country; - -@Service -public class CountryService implements ICountryService { - - private final CountryClient countryClient; - - public CountryService(final CountryClient countryClient) { - this.countryClient = countryClient; - } - - @Override - public Country getCountryByCode(final String countryCode, final String lang) { - return countryClient.getCountryByCountryCode(countryCode, lang).block(); - } - - @Override - public List getCountriesByCurrency(final String currency) { - return countryClient.getCountriesByCurrency(currency).block(); - } - -} diff --git a/task07/src/main/java/de/hftstuttgart/vs/task07/service/IContinentService.java b/task07/src/main/java/de/hftstuttgart/vs/task07/service/IContinentService.java deleted file mode 100644 index a1cf64c..0000000 --- a/task07/src/main/java/de/hftstuttgart/vs/task07/service/IContinentService.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.hftstuttgart.vs.task07.service; - -import java.util.List; - -import de.hftstuttgart.vs.task07.integration.graphql.types.Continent; - -public interface IContinentService { - - List getAllContinents(); - - Continent getContinentByCodeWithCountries(String code); - -} diff --git a/task07/src/main/java/de/hftstuttgart/vs/task07/service/ICountryService.java b/task07/src/main/java/de/hftstuttgart/vs/task07/service/ICountryService.java deleted file mode 100644 index 3ed09e7..0000000 --- a/task07/src/main/java/de/hftstuttgart/vs/task07/service/ICountryService.java +++ /dev/null @@ -1,14 +0,0 @@ -package de.hftstuttgart.vs.task07.service; - -import java.util.List; - -import de.hftstuttgart.vs.task07.integration.graphql.types.Country; -import jakarta.annotation.Nullable; - -public interface ICountryService { - - Country getCountryByCode(String countryCode, @Nullable String lang); - - List getCountriesByCurrency(String currency); - -} diff --git a/task07/src/main/java/de/hftstuttgart/vs/task07/view/ContinentController.java b/task07/src/main/java/de/hftstuttgart/vs/task07/view/ContinentController.java deleted file mode 100644 index e7666b9..0000000 --- a/task07/src/main/java/de/hftstuttgart/vs/task07/view/ContinentController.java +++ /dev/null @@ -1,37 +0,0 @@ -package de.hftstuttgart.vs.task07.view; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; - -import de.hftstuttgart.vs.task07.service.IContinentService; - -@Controller -public class ContinentController { - - private final IContinentService continentService; - - public ContinentController(final IContinentService continentService) { - this.continentService = continentService; - } - - @GetMapping("/") - public String index() { - return "redirect:/continents"; - } - - @GetMapping("/continents") - public String continents(final Model model) { - model.addAttribute("continents", continentService.getAllContinents()); - return "continents"; - } - - @GetMapping("/continents/{continentCode}") - public String continentByCode(@PathVariable final String continentCode, final Model model) { - model.addAttribute("continent", continentService.getContinentByCodeWithCountries(continentCode)); - return "continent"; - } - -} - diff --git a/task07/src/main/java/de/hftstuttgart/vs/task07/view/CountryController.java b/task07/src/main/java/de/hftstuttgart/vs/task07/view/CountryController.java deleted file mode 100644 index 7593390..0000000 --- a/task07/src/main/java/de/hftstuttgart/vs/task07/view/CountryController.java +++ /dev/null @@ -1,37 +0,0 @@ -package de.hftstuttgart.vs.task07.view; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestParam; - -import de.hftstuttgart.vs.task07.service.ICountryService; -import jakarta.annotation.Nullable; - -@Controller -public class CountryController { - - private final ICountryService countryService; - - public CountryController(final ICountryService countryService) { - this.countryService = countryService; - } - - @GetMapping("/countries/{countryCode}") - public String continentByCode(@PathVariable final String countryCode, @RequestParam @Nullable final String lang, - final Model model) { - model.addAttribute("country", countryService.getCountryByCode(countryCode, lang)); - model.addAttribute("lang", lang); - return "country"; - } - - @GetMapping("/currencies/{currency}") - public String countriesByCurrency(@PathVariable final String currency, final Model model) { - model.addAttribute("currency", currency); - model.addAttribute("countries", countryService.getCountriesByCurrency(currency)); - return "currency"; - } - -} - diff --git a/task07/src/main/resources/application.properties b/task07/src/main/resources/application.properties deleted file mode 100644 index 33bd732..0000000 --- a/task07/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=task07 diff --git a/task07/src/main/resources/graphql-client/schema.graphqls b/task07/src/main/resources/graphql-client/schema.graphqls deleted file mode 100644 index 4100a41..0000000 --- a/task07/src/main/resources/graphql-client/schema.graphqls +++ /dev/null @@ -1,78 +0,0 @@ -schema { - query: Query -} - -type Continent { - code: ID! - countries: [Country!]! - name: String! -} - -type Country { - awsRegion: String! - capital: String - code: ID! - continent: Continent! - currencies: [String!]! - currency: String - emoji: String! - emojiU: String! - languages: [Language!]! - name(lang: String): String! - native: String! - phone: String! - phones: [String!]! - states: [State!]! - subdivisions: [Subdivision!]! -} - -type Language { - code: ID! - name: String! - native: String! - rtl: Boolean! -} - -type Query { - continent(code: ID!): Continent - continents(filter: ContinentFilterInput = {}): [Continent!]! - countries(filter: CountryFilterInput = {}): [Country!]! - country(code: ID!): Country - language(code: ID!): Language - languages(filter: LanguageFilterInput = {}): [Language!]! -} - -type State { - code: String - country: Country! - name: String! -} - -type Subdivision { - code: ID! - emoji: String - name: String! -} - -input ContinentFilterInput { - code: StringQueryOperatorInput -} - -input CountryFilterInput { - code: StringQueryOperatorInput - continent: StringQueryOperatorInput - currency: StringQueryOperatorInput - name: StringQueryOperatorInput -} - -input LanguageFilterInput { - code: StringQueryOperatorInput -} - -input StringQueryOperatorInput { - eq: String - in: [String!] - ne: String - nin: [String!] - regex: String -} diff --git a/task07/src/main/resources/graphql-documents/getAllContinents.graphql b/task07/src/main/resources/graphql-documents/getAllContinents.graphql deleted file mode 100644 index 351a5f4..0000000 --- a/task07/src/main/resources/graphql-documents/getAllContinents.graphql +++ /dev/null @@ -1 +0,0 @@ -# TODO add query diff --git a/task07/src/main/resources/graphql-documents/getAllCountriesWithCurrency.graphql b/task07/src/main/resources/graphql-documents/getAllCountriesWithCurrency.graphql deleted file mode 100644 index 351a5f4..0000000 --- a/task07/src/main/resources/graphql-documents/getAllCountriesWithCurrency.graphql +++ /dev/null @@ -1 +0,0 @@ -# TODO add query diff --git a/task07/src/main/resources/graphql-documents/getContinentWithCountries.graphql b/task07/src/main/resources/graphql-documents/getContinentWithCountries.graphql deleted file mode 100644 index 351a5f4..0000000 --- a/task07/src/main/resources/graphql-documents/getContinentWithCountries.graphql +++ /dev/null @@ -1 +0,0 @@ -# TODO add query diff --git a/task07/src/main/resources/graphql-documents/getCountry.graphql b/task07/src/main/resources/graphql-documents/getCountry.graphql deleted file mode 100644 index 351a5f4..0000000 --- a/task07/src/main/resources/graphql-documents/getCountry.graphql +++ /dev/null @@ -1 +0,0 @@ -# TODO add query diff --git a/task07/src/main/resources/graphql-documents/graphql.config.yml b/task07/src/main/resources/graphql-documents/graphql.config.yml deleted file mode 100644 index 21f7226..0000000 --- a/task07/src/main/resources/graphql-documents/graphql.config.yml +++ /dev/null @@ -1,6 +0,0 @@ -schema: schema.graphqls -documents: '**/*.graphql' -extensions: - endpoints: - trevorblades: - url: 'https://countries.trevorblades.com/graphql' diff --git a/task07/src/main/resources/graphql-documents/schema.graphqls b/task07/src/main/resources/graphql-documents/schema.graphqls deleted file mode 100644 index 4100a41..0000000 --- a/task07/src/main/resources/graphql-documents/schema.graphqls +++ /dev/null @@ -1,78 +0,0 @@ -schema { - query: Query -} - -type Continent { - code: ID! - countries: [Country!]! - name: String! -} - -type Country { - awsRegion: String! - capital: String - code: ID! - continent: Continent! - currencies: [String!]! - currency: String - emoji: String! - emojiU: String! - languages: [Language!]! - name(lang: String): String! - native: String! - phone: String! - phones: [String!]! - states: [State!]! - subdivisions: [Subdivision!]! -} - -type Language { - code: ID! - name: String! - native: String! - rtl: Boolean! -} - -type Query { - continent(code: ID!): Continent - continents(filter: ContinentFilterInput = {}): [Continent!]! - countries(filter: CountryFilterInput = {}): [Country!]! - country(code: ID!): Country - language(code: ID!): Language - languages(filter: LanguageFilterInput = {}): [Language!]! -} - -type State { - code: String - country: Country! - name: String! -} - -type Subdivision { - code: ID! - emoji: String - name: String! -} - -input ContinentFilterInput { - code: StringQueryOperatorInput -} - -input CountryFilterInput { - code: StringQueryOperatorInput - continent: StringQueryOperatorInput - currency: StringQueryOperatorInput - name: StringQueryOperatorInput -} - -input LanguageFilterInput { - code: StringQueryOperatorInput -} - -input StringQueryOperatorInput { - eq: String - in: [String!] - ne: String - nin: [String!] - regex: String -} diff --git a/task07/src/main/resources/templates/continent.html b/task07/src/main/resources/templates/continent.html deleted file mode 100644 index 7234fe1..0000000 --- a/task07/src/main/resources/templates/continent.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - Continent - World Information System - - - -

-
-
    -
  • - -
  • -
-
- - diff --git a/task07/src/main/resources/templates/continents.html b/task07/src/main/resources/templates/continents.html deleted file mode 100644 index ef5e2ea..0000000 --- a/task07/src/main/resources/templates/continents.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - All Continents - World Information System - - - -

All continents

-
-
    -
  • - -
  • -
-
- - diff --git a/task07/src/main/resources/templates/country.html b/task07/src/main/resources/templates/country.html deleted file mode 100644 index 5652db8..0000000 --- a/task07/src/main/resources/templates/country.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - Country - World Information System - - - -
-
-

-
- -
- - -
-
-

-

Languages

-
-
    -
  • -
-
-

Currencies

-
-
    -
  • - -
  • -
-
-

Phone Prefix

-
-
    -
  • -
-
-

Flag

- - - - - diff --git a/task07/src/main/resources/templates/currency.html b/task07/src/main/resources/templates/currency.html deleted file mode 100644 index 4f4127a..0000000 --- a/task07/src/main/resources/templates/currency.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - Countries paying in - World Information System - - - -

Currency:

-
-
    -
  • - -
  • -
-
- -