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
6 changes: 1 addition & 5 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
<name>Open Workflow :: API</name>
<packaging>jar</packaging>
<description>Java SDK for Open Workflow Specification</description>
<properties>
<version.build-helper-maven-plugin>3.6.2</version.build-helper-maven-plugin>
</properties>


<dependencies>
<dependency>
<groupId>org.openworkflow.sdk</groupId>
Expand Down Expand Up @@ -102,7 +99,6 @@
<!-- a hint for IDE's to add the java sources to the classpath -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${version.build-helper-maven-plugin}</version>
<executions>
<execution>
<id>add-mixin</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,9 @@ private static <V extends ObjectMapper, T extends MapperBuilder<V, T>> T configu
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
.disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
.addModule(validationModule)
.changeDefaultPropertyInclusion(
v ->
v.withValueInclusion(JsonInclude.Include.NON_NULL)
.withContentInclusion(JsonInclude.Include.NON_NULL))
.changeDefaultPropertyInclusion(v ->
v.withValueInclusion(JsonInclude.Include.NON_NULL)
.withContentInclusion(JsonInclude.Include.NON_NULL))
.addModule(new JacksonMixInModule())
.findAndAddModules();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,9 @@ public final SELF use(Consumer<UseBuilder>... configurers) {

private SELF use(List<Consumer<UseBuilder>> configurers) {
final UseBuilder builder = new UseBuilder();
configurers.forEach(
c -> {
if (c != null) c.accept(builder);
});
configurers.forEach(c -> {
if (c != null) c.accept(builder);
});
this.workflow.setUse(builder.build());
return self();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,9 @@ public SELF correlate(

@Override
public void accept(EVENT_FILTER filterBuilder) {
filterBuilder.with(
pb -> {
getPropertySteps().forEach(step -> step.accept(pb));
});
filterBuilder.with(pb -> {
getPropertySteps().forEach(step -> step.accept(pb));
});

filterSteps.forEach(step -> step.accept(filterBuilder));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,14 @@ public void accept(CallHttpTaskBuilder builder) {
@Override
public CallHttpSpec andThen(Consumer<? super CallHttpTaskBuilder> after) {
Objects.requireNonNull(after, "after");
steps.add(
fluent -> {
if (!(fluent instanceof CallHttpTaskBuilder builder)) {
throw new IllegalArgumentException(
"andThen requires CallHttpTaskBuilder, got: "
+ (fluent == null ? "null" : fluent.getClass().getName()));
}
after.accept(builder);
});
steps.add(fluent -> {
if (!(fluent instanceof CallHttpTaskBuilder builder)) {
throw new IllegalArgumentException(
"andThen requires CallHttpTaskBuilder, got: "
+ (fluent == null ? "null" : fluent.getClass().getName()));
}
after.accept(builder);
});
return this;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -432,11 +432,8 @@ public static AuthenticationConfigurer oidc(
String clientId,
String clientSecret) {
return a ->
a.openIDConnect(
o ->
o.authority(authority)
.grant(grant)
.client(c -> c.id(clientId).secret(clientSecret)));
a.openIDConnect(o ->
o.authority(authority).grant(grant).client(c -> c.id(clientId).secret(clientSecret)));
}

public static AuthenticationConfigurer oidc(String secret) {
Expand Down Expand Up @@ -472,11 +469,8 @@ public static AuthenticationConfigurer oauth2(
String clientId,
String clientSecret) {
return a ->
a.openIDConnect(
o ->
o.authority(authority)
.grant(grant)
.client(c -> c.id(clientId).secret(clientSecret)));
a.openIDConnect(o ->
o.authority(authority).grant(grant).client(c -> c.id(clientId).secret(clientSecret)));
}

public static AuthenticationConfigurer oauth2(String secret) {
Expand Down Expand Up @@ -514,11 +508,10 @@ public static AuthenticationConfigurer oauth2(
String clientSecret,
Consumer<OAuth2AuthenticationPropertiesEndpointsBuilder> endpoints) {
return a ->
a.oauth2(
o -> {
o.authority(authority).grant(grant).client(c -> c.id(clientId).secret(clientSecret));
o.endpoints(endpoints);
});
a.oauth2(o -> {
o.authority(authority).grant(grant).client(c -> c.id(clientId).secret(clientSecret));
o.endpoints(endpoints);
});
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,8 @@ public RaiseSpec then(Consumer<RaiseTaskBuilder.RaiseTaskErrorBuilder> step) {

@Override
public void accept(RaiseTaskBuilder b) {
b.error(
err -> {
for (var s : steps) s.accept(err);
});
b.error(err -> {
for (var s : steps) s.accept(err);
});
}
}
Loading
Loading