Skip to content
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

backport: Fix issue when trying to determine if a bean has been defined for transient fields. #139

Merged
merged 3 commits into from
Sep 24, 2024
Merged

backport: Fix issue when trying to determine if a bean has been defined for transient fields. #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2b133b
backport: Fix issue when trying to determine if a bean has been defin…
TatuLund Sep 13, 2024
07b5f4d
Update TestConfig.java
TatuLund Sep 13, 2024
f839cc4
Update SerializationDeserializationTest.java
TatuLund Sep 13, 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
3 changes: 2 additions & 1 deletion ...va/com/vaadin/kubernetes/starter/sessiontracker/serialization/SpringTransientHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ private TransientDescriptor detectBean(Object target, Field field) {

private boolean matchesPrototype(String beanName, Object beanDefinition,
Class<?> fieldValueType) {
return appCtx.isPrototype(beanName)
return appCtx.containsBeanDefinition(beanName)
&& appCtx.isPrototype(beanName)
&& beanDefinition.getClass() == fieldValueType;
}

Expand Down
1 change: 0 additions & 1 deletion ...din/kubernetes/starter/sessiontracker/serialization/SerializationDeserializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ void processConstructorInjectedComponent(
.readWithTransients();
Assertions.assertThat(result).isNotSameAs(target)
.isExactlyInstanceOf(TestConfig.CtorInjectionTarget.class)
.hasNoNullFieldsOrProperties()
.asInstanceOf(InstanceOfAssertFactories
.type(TestConfig.CtorInjectionTarget.class))
.extracting(obj -> obj.defaultImpl, obj -> obj.alternative)
Expand Down
3 changes: 3 additions & 0 deletions .../src/test/java/com/vaadin/kubernetes/starter/sessiontracker/serialization/TestConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public void execute() {
static class CtorInjectionTarget implements Serializable {
transient TestService defaultImpl;
transient TestService alternative;
transient Object nonBeanTransient = new Object();

public CtorInjectionTarget(TestService defaultImpl,
@Qualifier("ALTERNATIVE") TestService alternative) {
Expand Down Expand Up @@ -91,6 +92,7 @@ static class PrototypeTarget implements Serializable {
@Autowired
@Qualifier("EXTENSION")
transient PrototypeComponent extPrototypeScoped;
transient Object nonBeanTransient = new Object();
}

interface PrototypeService {
Expand Down Expand Up @@ -119,6 +121,7 @@ static class PrototypeServiceTarget implements Serializable {
@Autowired
@Qualifier("B")
transient PrototypeService prototypeServiceB;
transient Object nonBeanTransient = new Object();
}

@Component
Expand Down