Skip to content

Commit

Permalink
fix: reenable graphql-java-extended-scalars
Browse files Browse the repository at this point in the history
  • Loading branch information
LukasLohoff committed Dec 15, 2022
1 parent 62bf2b6 commit c0099c8
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 473 deletions.
8 changes: 8 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@
<!-- Database -->
<hibernate-extra-types.version>2.20.0</hibernate-extra-types.version>

<!-- GraphQL -->
<graphql-java-extended-scalars.version>19.1</graphql-java-extended-scalars.version>

<!-- Swagger/REST -->
<springdoc-openapi.version>1.6.12</springdoc-openapi.version>

Expand Down Expand Up @@ -426,6 +429,11 @@
<artifactId>spring-boot-starter-graphql</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java-extended-scalars</artifactId>
<version>${graphql-java-extended-scalars.version}</version>
</dependency>

<!-- Logging -->
<dependency>
Expand Down
4 changes: 4 additions & 0 deletions shogun-lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-graphql</artifactId>
</dependency>
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java-extended-scalars</artifactId>
</dependency>

<!-- Lombok -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
*/
package de.terrestris.shogun.lib.config;

import de.terrestris.shogun.lib.graphql.scalar.DateTimeScalar;
import de.terrestris.shogun.lib.graphql.scalar.GeometryScalar;
import de.terrestris.shogun.lib.graphql.scalar.JsonScalar;
import de.terrestris.shogun.lib.graphql.scalar.LongScalar;
import graphql.scalars.ExtendedScalars;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.graphql.execution.RuntimeWiringConfigurer;
Expand All @@ -30,10 +28,10 @@ public class GraphQLConfig {
@Bean
public RuntimeWiringConfigurer runtimeWiringConfigurer() {
return wiringBuilder -> {
wiringBuilder.scalar(JsonScalar.INSTANCE);
wiringBuilder.scalar(ExtendedScalars.Json);
wiringBuilder.scalar(GeometryScalar.INSTANCE);
wiringBuilder.scalar(DateTimeScalar.INSTANCE);
wiringBuilder.scalar(LongScalar.INSTANCE);
wiringBuilder.scalar(ExtendedScalars.DateTime);
wiringBuilder.scalar(ExtendedScalars.GraphQLLong);
};
}

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit c0099c8

Please sign in to comment.