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

fix parentChild config but when input string is null or empty #616

Closed
wants to merge 1 commit into from
Closed

fix parentChild config but when input string is null or empty #616

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions .../java/com/netflix/metacat/common/server/properties/ParentChildRelationshipProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ public ParentChildRelationshipProperties(@Nullable final Environment env) {
* @param configStr configString
*/
public void setMaxAllowPerTablePerRelType(@Nullable final String configStr) {
if (configStr == null || configStr.isEmpty()) {
return;
}
try {
this.maxAllowPerTablePerRelType = parseNestedConfigString(configStr);
} catch (Exception e) {
Expand All @@ -74,9 +71,6 @@ public void setMaxAllowPerTablePerRelType(@Nullable final String configStr) {
* @param configStr configString
*/
public void setMaxAllowPerDBPerRelType(@Nullable final String configStr) {
if (configStr == null || configStr.isEmpty()) {
return;
}
try {
this.maxAllowPerDBPerRelType = parseNestedConfigString(configStr);
} catch (Exception e) {
Expand All @@ -90,7 +84,7 @@ public void setMaxAllowPerDBPerRelType(@Nullable final String configStr) {
*/
public void setDefaultMaxAllowPerRelType(@Nullable final String configStr) {
if (configStr == null || configStr.isEmpty()) {
return;
this.defaultMaxAllowPerRelType = new HashMap<>();
}
try {
this.defaultMaxAllowPerRelType =
Expand All @@ -106,6 +100,9 @@ public void setDefaultMaxAllowPerRelType(@Nullable final String configStr) {
}

private Map<String, Map<String, Integer>> parseNestedConfigString(final String configStr) {
if (configStr == null || configStr.isEmpty()) {
return new HashMap<>();
}
return Arrays.stream(configStr.split(";"))
.map(entry -> entry.split(","))
.collect(Collectors.groupingBy(
Expand Down
Loading