Skip to content

runtime-v2: fix the issue where old agents can't parse the process configuration with new attributes #981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 22, 2024
Merged

runtime-v2: fix the issue where old agents can't parse the process configuration with new attributes #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c25d371
runtime-v2: fix issue with old agents cant parse process configuration
brig Sep 19, 2024
b27586a
revapi skip
brig Sep 19, 2024
d4b6856
ignoreUnknown properties to all cfg classes
brig Sep 19, 2024
e7e80ad
Merge branch 'master' into brig/fix-props-ignore
ibodrov Sep 19, 2024
6d28dec
Merge branch 'master' into brig/fix-props-ignore
brig Sep 21, 2024
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
22 changes: 3 additions & 19 deletions client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,25 +190,9 @@
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
<configuration>
<analysisConfiguration>
<revapi.ignore>
<item>
<code>java.field.serialVersionUIDUnchanged</code>
</item>
<item>
<code>java.method.parameterTypeParameterChanged</code>
</item>
<item>
<code>java.method.returnTypeTypeParametersChanged</code>
</item>
<item>
<code>java.class.externalClassExposedInAPI</code>
</item>
<item>
<code>java.method.numberOfParametersChanged</code>
</item>
</revapi.ignore>
</analysisConfiguration>
<!-- lots of incompatible changes due to breaking changes in dependencies -->
<!-- re-enable after release -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
Expand Down
8 changes: 5 additions & 3 deletions ...e/v2/model/src/main/java/com/walmartlabs/concord/runtime/v2/model/EventConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
* Licensed 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
*
*
* http://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.
Expand All @@ -20,6 +20,7 @@
* =====
*/

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
Expand All @@ -33,6 +34,7 @@
@Value.Immutable
@Value.Style(jdkOnly = true)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonSerialize(as = ImmutableEventConfiguration.class)
@JsonDeserialize(as = ImmutableEventConfiguration.class)
public interface EventConfiguration extends Serializable {
Expand Down Expand Up @@ -186,7 +188,7 @@ default boolean truncateMeta() {
default Collection<String> metaBlacklist() {
return Collections.emptyList();
}

static ImmutableEventConfiguration.Builder builder() {
return ImmutableEventConfiguration.builder();
}
Expand Down
6 changes: 4 additions & 2 deletions runtime/v2/model/src/main/java/com/walmartlabs/concord/runtime/v2/model/ExclusiveMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
* Licensed 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
*
*
* http://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.
Expand All @@ -20,6 +20,7 @@
* =====
*/

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
Expand All @@ -31,6 +32,7 @@
@Value.Immutable
@Value.Style(jdkOnly = true)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonSerialize(as = ImmutableExclusiveMode.class)
@JsonDeserialize(as = ImmutableExclusiveMode.class)
public interface ExclusiveMode extends Serializable {
Expand Down
2 changes: 2 additions & 0 deletions ...rc/main/java/com/walmartlabs/concord/runtime/v2/model/ProcessDefinitionConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
* =====
*/

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
Expand All @@ -37,6 +38,7 @@
@Value.Immutable
@Value.Style(jdkOnly = true)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonSerialize(as = ImmutableProcessDefinitionConfiguration.class)
@JsonDeserialize(as = ImmutableProcessDefinitionConfiguration.class)
public interface ProcessDefinitionConfiguration extends Serializable {
Expand Down
Loading