Skip to content
This repository was archived by the owner on Jun 6, 2025. It is now read-only.

GH-3362: Address sonarcloud dos issue in propertiesutil #3363

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

GH-3362: Address sonarcloud dos issue in propertiesutil #3363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
462f7f0
fix sonarQube polynomial issue
j69772 Jan 30, 2025
d57ddd1
update copyright headers
j69772 Jan 30, 2025
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
4 changes: 2 additions & 2 deletions core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/PropertiesUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2017-2023 Crown Copyright
* Copyright 2017-2025 Crown Copyright
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -23,7 +23,7 @@
* Utility methods for Schema Properties.
*/
public final class PropertiesUtil {
private static final Pattern PROPERTY_ALLOWED_CHARACTERS = Pattern.compile("[a-zA-Z0-9|-]*");
private static final Pattern PROPERTY_ALLOWED_CHARACTERS = Pattern.compile("[a-zA-Z0-9|\\-]+");

private PropertiesUtil() {
// Private constructor to prevent instantiation.
Expand Down
4 changes: 2 additions & 2 deletions core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/PropertiesUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2017-2024 Crown Copyright
* Copyright 2017-2025 Crown Copyright
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,7 +30,7 @@ class PropertiesUtilTest {
void shouldThrowExceptionWithInvalidStringName() {
assertThatIllegalArgumentException()
.isThrownBy(() -> PropertiesUtil.validateName(INVALID_STRING))
.withMessage("Property is invalid: inv@l1dStr|ng&^, it must match regex: [a-zA-Z0-9|-]*");
.withMessage("Property is invalid: inv@l1dStr|ng&^, it must match regex: [a-zA-Z0-9|\\-]+");
}

@Test
Expand Down