Skip to content

Fix for empty domain object #110

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
strug merged 6 commits into from
Mar 18, 2026
Merged

Fix for empty domain object #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c6fc6a
Up libs
strug Mar 17, 2026
4f23b96
Up libs
strug Mar 17, 2026
47739e9
Add log
strug Mar 17, 2026
66adcfd
Merge remote-tracking branch 'origin/master' into ft/up-lib-dominant
strug Mar 17, 2026
08de636
Fix empty domain object
strug Mar 18, 2026
b756c11
Merge remote-tracking branch 'origin/master' into ft/up-lib-dominant
strug Mar 18, 2026
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
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/daway/handler/dominant/impl/CategoryHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ protected Integer getTargetRefId() {

@Override
protected boolean acceptDomainObject() {
return getDomainObject().isSetCategory();
return getDomainObject() != null && getDomainObject().isSetCategory();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/daway/handler/dominant/impl/CurrencyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ protected String getTargetRefId() {

@Override
protected boolean acceptDomainObject() {
return getDomainObject().isSetCurrency();
return getDomainObject() != null && getDomainObject().isSetCurrency();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/daway/handler/dominant/impl/PartyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected String getTargetRefId() {

@Override
protected boolean acceptDomainObject() {
return getDomainObject().isSetPartyConfig();
return getDomainObject() != null && getDomainObject().isSetPartyConfig();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/daway/handler/dominant/impl/PaymentInstitutionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ protected Integer getTargetRefId() {

@Override
protected boolean acceptDomainObject() {
return getDomainObject().isSetPaymentInstitution();
return getDomainObject() != null && getDomainObject().isSetPaymentInstitution();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/daway/handler/dominant/impl/PaymentRoutingRulesHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class PaymentRoutingRulesHandler

@Override
protected boolean acceptDomainObject() {
return getDomainObject().isSetRoutingRules();
return getDomainObject() != null && getDomainObject().isSetRoutingRules();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/daway/handler/dominant/impl/ProviderHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ protected Integer getTargetRefId() {

@Override
protected boolean acceptDomainObject() {
return getDomainObject().isSetProvider();
return getDomainObject() != null && getDomainObject().isSetProvider();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/daway/handler/dominant/impl/ProxyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected Integer getTargetRefId() {

@Override
protected boolean acceptDomainObject() {
return getDomainObject().isSetProxy();
return getDomainObject() != null && getDomainObject().isSetProxy();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/daway/handler/dominant/impl/ShopHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ protected String getTargetRefId() {

@Override
protected boolean acceptDomainObject() {
return getDomainObject().isSetShopConfig();
return getDomainObject() != null && getDomainObject().isSetShopConfig();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/daway/handler/dominant/impl/TermSetHierarchyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ protected Integer getTargetRefId() {

@Override
protected boolean acceptDomainObject() {
return getDomainObject().isSetTermSetHierarchy();
return getDomainObject() != null && getDomainObject().isSetTermSetHierarchy();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/daway/handler/dominant/impl/TerminalHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected Integer getTargetRefId() {

@Override
protected boolean acceptDomainObject() {
return getDomainObject().isSetTerminal();
return getDomainObject() != null && getDomainObject().isSetTerminal();
Copy link
Copy Markdown
Contributor

@ggmaleva ggmaleva Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

а эту проверку на null нельзя вынести в getDomainObject() ?

Copy link
Copy Markdown
Contributor Author

@strug strug Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

а эту проверку на null нельзя вынести в getDomainObject() ?

вынести проверить и вернуть оттуда null ? ))

Copy link
Copy Markdown
Contributor

@ggmaleva ggmaleva Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

как раз вернуть объект точно НЕ null и проверить это в одном месте , а не в каждом handler)

Copy link
Copy Markdown
Contributor Author

@strug strug Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

возвращать ведь нечего) там просто гетер, можно вернуть какой-нибудь optional но все равно проверять придется

Copy link
Copy Markdown
Contributor

@ggmaleva ggmaleva Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ага, глянул в код

}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/daway/handler/dominant/impl/WalletHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected String getTargetRefId() {

@Override
protected boolean acceptDomainObject() {
return getDomainObject().isSetWalletConfig();
return getDomainObject() != null && getDomainObject().isSetWalletConfig();
}

@Override
Expand Down
Loading