Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/springwolf/master' into re…
Browse files Browse the repository at this point in the history
…produce/amqp-channel-name

* refs/remotes/springwolf/master: (34 commits)
  chore(example): Bump rabbitmq from 3.9-management-alpine to rabbitmq:4.0-management-alpine in amqp-example
  chore(example): Bump confluentinc/cp-kafka from 7.4.6 to 7.7.1 in cloud-stream-example
  chore(example): Bump apache/activemq-artemis from 2.34.0/2.31.2 to 2.37.0-alpine in jms-example
  chore(example): Bump confluentinc/cp-kafka from 7.4.6 to 7.7.1 in kafka-example
  chore(example): Bump localstack/localstack from 2.2.0 to 3.7.2 in sns-example
  chore(example): Bump localstack/localstack from 3.3.0 to 3.7.2 in sqs-example
  chore: start development on springwolf 1.8.0-SNAPSHOT
  chore(deps): Bump org.springframework.boot from 3.3.3 to 3.3.4 (springwolf#986)
  test(jms): increase timeout of ProducerSystemTest from 10s to 20s to fix flaky test (springwolf#992)
  chore(deps): Bump io.awspring.cloud:spring-cloud-aws-dependencies (springwolf#987)
  chore(deps): Bump protobufJavaVersion from 4.28.1 to 4.28.2 (springwolf#989)
  chore(deps): Bump swaggerVersion from 2.2.23 to 2.2.24 (springwolf#988)
  chore(deps): Bump com.networknt:json-schema-validator (springwolf#990)
  chore(deps): Bump the dependencies-angular group across 1 directory with 12 updates (springwolf#983)
  chore(deps): Bump junitJupiterVersion from 5.10.3 to 5.11.0 (springwolf#933)
  chore(deps): Bump the npm_and_yarn group (springwolf#973)
  chore(deps-dev): Bump @types/jest in /springwolf-ui (springwolf#976)
  chore(gh): allow ui pipeline to publish to gh-pages branch
  Chore/gradle 8.10.1 (springwolf#981)
  Feat/add options to amqp annotation (springwolf#980)
  ...
  • Loading branch information
timonback committed Sep 28, 2024
2 parents 7d3c07c + d460c8a commit 33fac8d
Show file tree
Hide file tree
Showing 272 changed files with 5,577 additions and 5,085 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SPRINGWOLF_VERSION=1.7.0-SNAPSHOT
SPRINGWOLF_VERSION=1.8.0-SNAPSHOT
13 changes: 13 additions & 0 deletions .github/workflows/springwolf-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ on:
types: [ opened, synchronize, ready_for_review ]
workflow_dispatch:

permissions:
contents: read
checks: write
id-token: write

jobs:
build:

Expand All @@ -32,6 +37,14 @@ jobs:
- name: Run build, check, analyzeDependencies
run: ./gradlew -p springwolf-core build

- name: Publish Test Report
uses: mikepenz/action-junit-report@v4
if: success() || failure()
with:
check_name: test-core
require_tests: true
report_paths: '**/build/test-results/test/TEST-*.xml'

- name: Publish package
if: github.ref == 'refs/heads/master'
run: ./gradlew -p springwolf-core publish
Expand Down
15 changes: 14 additions & 1 deletion .github/workflows/springwolf-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ on:
types: [ opened, synchronize, ready_for_review ]
workflow_dispatch:

permissions:
contents: read
checks: write
id-token: write

jobs:
build:

Expand Down Expand Up @@ -53,14 +58,22 @@ jobs:
- name: Run build, check, analyzeDependencies on example
run: ./gradlew -p ${{ env.example }} build

- name: Publish Test Report
uses: mikepenz/action-junit-report@v4
if: success() || failure()
with:
check_name: test-plugin-${{ matrix.plugin }}-junit
require_tests: true
report_paths: '**/build/test-results/test/TEST-*.xml'

- name: Run e2e tests
run: ./gradlew -p springwolf-examples/e2e npm_run_test
env:
SPRINGWOLF_EXAMPLE: ${{ matrix.plugin }}
- uses: actions/upload-artifact@v4
if: always()
with:
name: playwright-report-${{ matrix.plugin }}
name: test-plugin-${{ matrix.plugin }}-playwright
path: springwolf-examples/e2e/playwright-report/
retention-days: 14

Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/springwolf-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ on:
types: [ opened, synchronize, ready_for_review ]
workflow_dispatch:

permissions:
contents: write
checks: write
id-token: write

env:
project: springwolf-ui

Expand All @@ -34,6 +39,13 @@ jobs:

- name: Test
run: ./gradlew -p ${{ env.project }} npm_run_test
- name: Publish Test Report
uses: mikepenz/action-junit-report@v4
if: success() || failure()
with:
check_name: test-ui-jest
require_tests: true
report_paths: '**/build/test-results/test/*.xml'

- name: Build
run: ./gradlew -p ${{ env.project }} build
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
id 'ca.cutterslade.analyze' version '1.9.1'
id 'io.spring.dependency-management' version '1.1.6' apply false
id 'org.springframework.boot' version '3.3.3' apply false
id 'org.springframework.boot' version '3.3.4' apply false
id 'org.owasp.dependencycheck' version '10.0.4'
id 'com.diffplug.spotless' version '6.25.0'
id 'com.bmuschko.docker-spring-boot-application' version '9.4.0' apply false
Expand Down
12 changes: 6 additions & 6 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ ext {

commonsLang3Version = '3.17.0'

kafkaAvroSerializerVersion = '7.7.0'
kafkaAvroSerializerVersion = '7.7.1'

kafkaClientsVersion = '3.7.1'
kafkaStreamsVersion = '3.8.0'

kafkaProtobufSerializerVersion = '7.7.0'
kafkaProtobufSerializerVersion = '7.7.1'

jacksonVersion = '2.17.2'
jacksonDatatypeProtobufVersion = '0.9.15'
Expand All @@ -52,25 +52,25 @@ ext {

jakartaXmlBindApiVersion = '4.0.2'

jsonSchemaValidator = '1.5.1'
jsonSchemaValidator = '1.5.2'

mockitoCoreVersion = '5.13.0'
mockitoJunitJupiterVersion = '5.13.0'

monetaVersion = '1.4.4'
moneyApiVersion = '1.1'

protobufJavaVersion = '4.28.0'
protobufJavaVersion = '4.28.2'

junitJupiterVersion = '5.10.3'
junitJupiterVersion = '5.11.0'
jsonUnitAssertJVersion = '3.4.1'

lombokVersion = '1.18.34'

slf4jApiVersion = '2.0.16'
slf4jSimpleVersion = '2.0.16'

swaggerVersion = '2.2.23'
swaggerVersion = '2.2.24'

testcontainersVersion = '1.20.1'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ plugins {
id 'ca.cutterslade.analyze'
}

ext['junit-jupiter.version'] = "${junitJupiterVersion}"

dependencies {
implementation "org.springframework:spring-context"

Expand All @@ -18,8 +20,9 @@ dependencies {

implementation "javax.money:money-api:${moneyApiVersion}"

testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}"
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter'
testRuntimeOnly "org.slf4j:slf4j-simple:${slf4jSimpleVersion}"
}

jar {
Expand Down
11 changes: 8 additions & 3 deletions springwolf-add-ons/springwolf-generic-binding/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ plugins {
id 'ca.cutterslade.analyze'
}

ext['junit-jupiter.version'] = "${junitJupiterVersion}"

dependencies {
api project(":springwolf-core")
api project(":springwolf-asyncapi")
Expand All @@ -20,9 +22,12 @@ dependencies {
compileOnly "org.projectlombok:lombok:${lombokVersion}"

testImplementation "org.assertj:assertj-core:${assertjCoreVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
testImplementation("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}"
testImplementation "org.mockito:mockito-core:${mockitoCoreVersion}"

testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.junit.jupiter:junit-jupiter-params'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter'
testRuntimeOnly "org.slf4j:slf4j-simple:${slf4jSimpleVersion}"
}

jar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import org.springframework.util.StringValueResolver;

@Configuration
public class SpringwolfGenericBindingAutoConfiguration {

@Bean
@Order(value = BindingProcessorPriority.GENERIC_BINDING)
public AsyncGenericOperationBindingProcessor asyncGenericOperationBindingProcessor() {
return new AsyncGenericOperationBindingProcessor();
public AsyncGenericOperationBindingProcessor asyncGenericOperationBindingProcessor(
StringValueResolver stringValueResolver) {
return new AsyncGenericOperationBindingProcessor(stringValueResolver);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,18 @@
import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import io.github.springwolf.core.asyncapi.scanners.bindings.operations.AbstractOperationBindingProcessor;
import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding;
import org.springframework.util.StringValueResolver;

import java.util.HashMap;
import java.util.Map;

public class AsyncGenericOperationBindingProcessor
extends AbstractOperationBindingProcessor<AsyncGenericOperationBinding> {

public AsyncGenericOperationBindingProcessor(StringValueResolver stringValueResolver) {
super(stringValueResolver);
}

@Override
protected ProcessedOperationBinding mapToOperationBinding(AsyncGenericOperationBinding bindingAnnotation) {
Map<String, Object> bindingData = PropertiesUtil.toMap(bindingAnnotation.fields());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,20 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.springframework.util.StringValueResolver;

import java.util.Arrays;
import java.util.List;
import java.util.Map;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;

class AsyncGenericOperationBindingProcessorTest {

private final AsyncGenericOperationBindingProcessor processor = new AsyncGenericOperationBindingProcessor();
private final StringValueResolver stringValueResolver = mock(StringValueResolver.class);
private final AsyncGenericOperationBindingProcessor processor =
new AsyncGenericOperationBindingProcessor(stringValueResolver);

@Test
void testClassWithoutAnnotation() {
Expand Down
10 changes: 7 additions & 3 deletions springwolf-add-ons/springwolf-json-schema/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ plugins {
id 'ca.cutterslade.analyze'
}

ext['junit-jupiter.version'] = "${junitJupiterVersion}"

dependencies {
api project(":springwolf-core")
api project(":springwolf-asyncapi")
Expand All @@ -27,9 +29,11 @@ dependencies {

testImplementation "org.mockito:mockito-core:${mockitoCoreVersion}"
testImplementation "org.assertj:assertj-core:${assertjCoreVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}"

testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.junit.jupiter:junit-jupiter-params'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter'
testRuntimeOnly "org.slf4j:slf4j-simple:${slf4jSimpleVersion}"

testImplementation "com.networknt:json-schema-validator:${jsonSchemaValidator}"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ plugins {
id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}"
}

ext['junit-jupiter.version'] = "${junitJupiterVersion}"

dependencies {
api project(":springwolf-core")

Expand All @@ -30,9 +32,11 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:${kotlinxSerializationVersion}"
implementation "org.jetbrains.kotlin:kotlin-reflect"

testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-api"
testRuntimeOnly "org.junit.jupiter:junit-jupiter"
testRuntimeOnly "org.slf4j:slf4j-simple:${slf4jSimpleVersion}"

testImplementation "org.assertj:assertj-core:${assertjCoreVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
testImplementation "net.javacrumbs.json-unit:json-unit-assertj:${jsonUnitAssertJVersion}"

}
Expand Down
8 changes: 6 additions & 2 deletions springwolf-asyncapi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ plugins {
id 'ca.cutterslade.analyze'
}

ext['junit-jupiter.version'] = "${junitJupiterVersion}"

dependencies {
implementation "io.swagger.core.v3:swagger-core-jakarta:${swaggerVersion}"
implementation "jakarta.validation:jakarta.validation-api"
Expand All @@ -21,14 +23,16 @@ dependencies {

testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"

testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"

testImplementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
testImplementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
testImplementation "io.swagger.core.v3:swagger-core-jakarta:${swaggerVersion}"
testImplementation "net.javacrumbs.json-unit:json-unit-assertj:${jsonUnitAssertJVersion}"
testImplementation "org.assertj:assertj-core:${assertjCoreVersion}"

testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}"
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter'
testRuntimeOnly "org.slf4j:slf4j-simple:${slf4jSimpleVersion}"
}

jar {
Expand Down
11 changes: 9 additions & 2 deletions springwolf-bindings/springwolf-amqp-binding/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ plugins {
id 'ca.cutterslade.analyze'
}

ext['junit-jupiter.version'] = "${junitJupiterVersion}"

dependencies {
api project(":springwolf-asyncapi")
api project(":springwolf-core")
Expand All @@ -14,10 +16,15 @@ dependencies {
implementation "org.springframework:spring-core"
implementation "org.springframework.boot:spring-boot-autoconfigure"

compileOnly "org.projectlombok:lombok:${lombokVersion}"
annotationProcessor "org.projectlombok:lombok:${lombokVersion}"

testImplementation "org.assertj:assertj-core:${assertjCoreVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
testImplementation "org.mockito:mockito-core:${mockitoCoreVersion}"

testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-api"
testRuntimeOnly "org.junit.jupiter:junit-jupiter"
testRuntimeOnly "org.slf4j:slf4j-simple:${slf4jSimpleVersion}"
}

jar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

int expiration() default 0;

String userId() default "";

String[] cc() default {};

int priority() default 0;
Expand All @@ -31,6 +33,8 @@

boolean mandatory() default false;

String[] bcc() default {};

boolean timestamp() default false;

boolean ack() default false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.core.annotation.Order;
import org.springframework.util.StringValueResolver;

/**
* Autoconfiguration for the springwolf Amqp Binding.
Expand All @@ -21,8 +22,8 @@ public class SpringwolfAmqpBindingAutoConfiguration {
@Bean
@Order(value = BindingProcessorPriority.PROTOCOL_BINDING)
@ConditionalOnMissingBean
public AmqpOperationBindingProcessor amqpOperationBindingProcessor() {
return new AmqpOperationBindingProcessor();
public AmqpOperationBindingProcessor amqpOperationBindingProcessor(StringValueResolver stringValueResolver) {
return new AmqpOperationBindingProcessor(stringValueResolver);
}

@Bean
Expand Down
Loading

0 comments on commit 33fac8d

Please sign in to comment.