You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2022/01/14 02:02:51 UTC
[brooklyn-server] branch master updated: remove bogus warnings and debug error messages
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new a4454bf remove bogus warnings and debug error messages
a4454bf is described below
commit a4454bf9735d4aa950b55aa2866111a3bd07ddd4
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Jan 14 02:01:00 2022 +0000
remove bogus warnings and debug error messages
mainly around non-osgi version accepting a dot in the qualifier,
which is not uncommon and accepted everywhere, but can cause bogus warnings;
also demote debug error-looking messages in Yamls to be trace
---
.../org/apache/brooklyn/core/typereg/RegisteredTypeNamingTest.java | 6 +++++-
.../java/org/apache/brooklyn/util/text/BrooklynVersionSyntax.java | 6 +++---
utils/common/src/main/java/org/apache/brooklyn/util/yaml/Yamls.java | 2 +-
.../org/apache/brooklyn/util/text/BrooklynVersionSyntaxTest.java | 5 ++++-
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/core/src/test/java/org/apache/brooklyn/core/typereg/RegisteredTypeNamingTest.java b/core/src/test/java/org/apache/brooklyn/core/typereg/RegisteredTypeNamingTest.java
index 3fc8dc3..2da4958 100644
--- a/core/src/test/java/org/apache/brooklyn/core/typereg/RegisteredTypeNamingTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/typereg/RegisteredTypeNamingTest.java
@@ -45,8 +45,12 @@ public class RegisteredTypeNamingTest {
assertVersion("1", true, true, true);
assertVersion("1.0.0", true, true, true);
assertVersion("1.0.0.SNAPSHOT", true, true, false);
+ assertVersion("1.0.SNAPSHOT", true, false, false);
assertVersion("1.0.0-SNAPSHOT", true, false, true);
-
+ assertVersion("1.0-SNAPSHOT", true, false, true);
+ assertVersion("1.0.0-1-2.3_b", true, false, true);
+ assertVersion("1.0.0-1-2!3_b", true, false, false);
+
assertVersion("", false, false, false);
assertVersion(null, false, false, false);
assertVersion("1:1", false, false, false);
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/text/BrooklynVersionSyntax.java b/utils/common/src/main/java/org/apache/brooklyn/util/text/BrooklynVersionSyntax.java
index 6f23489..26bb33c 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/text/BrooklynVersionSyntax.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/text/BrooklynVersionSyntax.java
@@ -40,6 +40,7 @@ public class BrooklynVersionSyntax {
public final static String OSGI_TOKEN_REGEX = "[" + OSGI_TOKEN_CHARS + "]+";
public final static String NUMBER = "[0-9]+";
public final static String QUALIFIER = OSGI_TOKEN_REGEX;
+ public final static String BROOKLYN_QUALIFIER = "[" + "." + OSGI_TOKEN_CHARS + "]+";
public final static String VALID_OSGI_VERSION_REGEX =
NUMBER +
@@ -54,10 +55,9 @@ public class BrooklynVersionSyntax {
NUMBER +
"(" + DOT + NUMBER +
"(" + DOT + NUMBER +
- "(" + "-" + QUALIFIER +
- ")?" +
")?" +
- ")?";
+ ")?" +
+ "(" + "-" + BROOKLYN_QUALIFIER + ")?";
private static boolean isUsable(String candidate) {
return candidate!=null && candidate.matches(USABLE_REGEX);
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/yaml/Yamls.java b/utils/common/src/main/java/org/apache/brooklyn/util/yaml/Yamls.java
index 5e92b11..05a0167 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/yaml/Yamls.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/yaml/Yamls.java
@@ -606,7 +606,7 @@ b: 1
+ "which is an older version, dragging in an older version of SnakeYAML which does not support Mark.getIndex.", e);
} catch (Exception e) {
Exceptions.propagateIfFatal(e);
- log.debug("Unable to find element in yaml (setting in result): "+e);
+ if (log.isTraceEnabled()) log.trace("Unable to find element in yaml (setting in result): "+e);
result.error = e;
return result;
}
diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/text/BrooklynVersionSyntaxTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/text/BrooklynVersionSyntaxTest.java
index 4fa02d6..3102926 100644
--- a/utils/common/src/test/java/org/apache/brooklyn/util/text/BrooklynVersionSyntaxTest.java
+++ b/utils/common/src/test/java/org/apache/brooklyn/util/text/BrooklynVersionSyntaxTest.java
@@ -28,8 +28,11 @@ public class BrooklynVersionSyntaxTest {
assertVersion("1", true, true, true);
assertVersion("1.0.0", true, true, true);
assertVersion("1.0.0.SNAPSHOT", true, true, false);
+ assertVersion("1.0.SNAPSHOT", true, false, false);
assertVersion("1.0.0-SNAPSHOT", true, false, true);
-
+ assertVersion("1.0-SNAPSHOT", true, false, true);
+ assertVersion("1.0-SNAPSHOT.2", true, false, true);
+
assertVersion("", false, false, false);
assertVersion(null, false, false, false);
assertVersion("1:1", false, false, false);