Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
"pactflow-example-provider-java-graphql",
]
steps:
- uses: actions/checkout@v2
- name: Set up JDK 18
uses: actions/setup-java@v2
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '18'
java-version: '17'
- name: Test for ${{ matrix.pact_provider }}
run: make test
env:
Expand All @@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
needs: test
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- run: docker pull pactfoundation/pact-cli:latest
- name: Can I deploy?
run: GIT_BRANCH=${GIT_REF:11} make can_i_deploy
Expand All @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-latest
needs: can-i-deploy
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- run: docker pull pactfoundation/pact-cli:latest
- name: Deploy
run: GIT_BRANCH=${GIT_REF:11} make deploy
Expand Down
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11
17.0
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ can_i_deploy: .env
--pacticipant ${PACTICIPANT} \
--version ${GIT_COMMIT} \
--to-environment production \
--retry-while-unknown 0 \
--retry-interval 10
--retry-while-unknown 5 \
--retry-interval 15

deploy_app:
@echo "Deploying to production"
Expand Down
18 changes: 10 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
plugins {
id 'org.springframework.boot' version '2.2.2.RELEASE'
id 'io.spring.dependency-management' version '1.0.8.RELEASE'
id 'org.springframework.boot' version '3.3.4'
id 'io.spring.dependency-management' version '1.1.6'
id 'java'
id "au.com.dius.pact" version "4.2.0"
id "io.freefair.lombok" version "6.6"
id "au.com.dius.pact" version "4.5.13"
id "io.freefair.lombok" version "8.10.2"
}

group = 'com.example'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '15'
java {
sourceCompatibility = '17'
}

repositories {
mavenCentral()
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation "org.apache.httpcomponents:fluent-hc:4.5.5"
implementation 'com.graphql-java:graphql-java:20.0'
implementation "org.apache.httpcomponents:fluent-hc:4.5.14"
implementation 'com.graphql-java:graphql-java:22.3'

testImplementation 'au.com.dius.pact.consumer:junit5:4.2.18'
testImplementation 'au.com.dius.pact.consumer:junit5:4.5.13'
testImplementation('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
15 changes: 2 additions & 13 deletions src/test/java/com/example/products/ProductsPactTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,9 @@

import org.junit.jupiter.api.extension.ExtendWith;
import au.com.dius.pact.consumer.MockServer;
import au.com.dius.pact.core.model.PactSpecVersion;
import au.com.dius.pact.core.model.RequestResponsePact;
import au.com.dius.pact.core.model.annotations.Pact;
import graphql.ExecutionResult;
import graphql.GraphQL;
import graphql.schema.GraphQLSchema;
import graphql.schema.StaticDataFetcher;
import graphql.schema.idl.RuntimeWiring;
import graphql.schema.idl.SchemaGenerator;
import graphql.schema.idl.SchemaParser;
import graphql.schema.idl.TypeDefinitionRegistry;
import static graphql.schema.idl.RuntimeWiring.newRuntimeWiring;

import au.com.dius.pact.consumer.dsl.PactDslJsonArray;
import au.com.dius.pact.consumer.dsl.PactDslJsonBody;
import au.com.dius.pact.consumer.dsl.PactDslWithProvider;
import au.com.dius.pact.consumer.junit5.PactConsumerTestExt;
Expand All @@ -23,7 +13,6 @@

import java.io.IOException;
import java.net.URISyntaxException;
import java.util.List;
import java.util.Map;

import static org.hamcrest.MatcherAssert.assertThat;
Expand Down Expand Up @@ -78,7 +67,7 @@ public RequestResponsePact getProduct(PactDslWithProvider builder) {
.toPact();
}

@PactTestFor(pactMethod = "getProduct")
@PactTestFor(pactMethod = "getProduct", pactVersion = PactSpecVersion.V3)
@Test
public void testGetProduct(MockServer mockServer) throws IOException, URISyntaxException {
Product product = new ProductClient().setUrl(mockServer.getUrl()).getProduct("10");
Expand Down