You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/08/22 10:06:32 UTC
[camel] branch main updated: (chores) camel-core: cleanup obtaining Camel version information (#11168)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 830449d342b (chores) camel-core: cleanup obtaining Camel version information (#11168)
830449d342b is described below
commit 830449d342ba4bea9829481d367af394f7044dcf
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Tue Aug 22 12:06:26 2023 +0200
(chores) camel-core: cleanup obtaining Camel version information (#11168)
Use the static holder pattern to obtain the Camel version without relying on manual locks and volatile variables
---
.../camel/impl/engine/AbstractCamelContext.java | 50 +-------------
.../apache/camel/impl/engine/VersionHolder.java | 79 ++++++++++++++++++++++
2 files changed, 81 insertions(+), 48 deletions(-)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 1b18b86631e..b0c2fb3ec12 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -263,7 +263,6 @@ public abstract class AbstractCamelContext extends BaseService
private Boolean autowiredEnabled = Boolean.TRUE;
private Long delay;
private Map<String, String> globalOptions = new HashMap<>();
- private volatile String version;
private volatile PropertiesComponent propertiesComponent;
private volatile CamelContextNameStrategy nameStrategy;
private volatile ManagementNameStrategy managementNameStrategy;
@@ -1908,57 +1907,12 @@ public abstract class AbstractCamelContext extends BaseService
return new Date(startDate);
}
+
@Override
public String getVersion() {
- if (version == null) {
- synchronized (lock) {
- if (version == null) {
- version = doGetVersion();
- }
- }
- }
- return version;
+ return VersionHolder.VERSION;
}
- private String doGetVersion() {
- String resolvedVersion = null;
-
- InputStream is = null;
- // try to load from maven properties first
- try {
- Properties p = new Properties();
- is = AbstractCamelContext.class
- .getResourceAsStream("/META-INF/maven/org.apache.camel/camel-base-engine/pom.properties");
- if (is != null) {
- p.load(is);
- resolvedVersion = p.getProperty("version", "");
- }
- } catch (Exception e) {
- // ignore
- } finally {
- if (is != null) {
- IOHelper.close(is);
- }
- }
-
- // fallback to using Java API
- if (resolvedVersion == null) {
- Package aPackage = getClass().getPackage();
- if (aPackage != null) {
- resolvedVersion = aPackage.getImplementationVersion();
- if (resolvedVersion == null) {
- resolvedVersion = aPackage.getSpecificationVersion();
- }
- }
- }
-
- if (resolvedVersion == null) {
- // we could not compute the version so use a blank
- resolvedVersion = "";
- }
-
- return resolvedVersion;
- }
@Override
protected void doSuspend() throws Exception {
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/VersionHolder.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/VersionHolder.java
new file mode 100644
index 00000000000..a15943b6501
--- /dev/null
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/VersionHolder.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.impl.engine;
+
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.apache.camel.util.IOHelper;
+
+class VersionHolder {
+ public static final String VERSION;
+ private static final String POM_PROPERTIES =
+ "/META-INF/maven/org.apache.camel/camel-base-engine/pom.properties";
+
+ static {
+ VERSION = doGetVersion();
+ }
+
+ VersionHolder() {
+ }
+
+ private static String doGetVersion() {
+ InputStream is = null;
+ // try to load from maven properties first
+ try {
+ is = VersionHolder.class.getResourceAsStream(POM_PROPERTIES);
+ if (is != null) {
+ Properties p = new Properties();
+
+ p.load(is);
+ return p.getProperty("version", "");
+ }
+ } catch (Exception e) {
+ // ignore
+ } finally {
+ if (is != null) {
+ IOHelper.close(is);
+ }
+ }
+
+ // fallback to using Java API
+ return fallbackResolver();
+ }
+
+ private static String fallbackResolver() {
+ String resolvedVersion = null;
+
+ Package aPackage = VersionHolder.class.getPackage();
+ if (aPackage != null) {
+ resolvedVersion = aPackage.getImplementationVersion();
+ if (resolvedVersion == null) {
+ resolvedVersion = aPackage.getSpecificationVersion();
+ }
+ }
+
+
+ if (resolvedVersion == null) {
+ // we could not compute the version so use a blank
+ resolvedVersion = "";
+ }
+
+ return resolvedVersion;
+ }
+}