You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2025/07/11 23:09:03 UTC
(grails-core) branch issue13705-metadataFix created (now 5f63311b9d)
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a change to branch issue13705-metadataFix
in repository https://gitbox.apache.org/repos/asf/grails-core.git
at 5f63311b9d fix: #13705 - revert changes to Metadata from micronaut removal and remove unused fields
This branch includes the following new commits:
new 5f63311b9d fix: #13705 - revert changes to Metadata from micronaut removal and remove unused fields
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(grails-core) 01/01: fix: #13705 - revert changes to Metadata from micronaut removal and remove unused fields
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch issue13705-metadataFix
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 5f63311b9da05364c814f0d894697c7db68278cc
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Fri Jul 11 19:08:50 2025 -0400
fix: #13705 - revert changes to Metadata from micronaut removal and remove unused fields
---
.../src/main/groovy/grails/util/Metadata.groovy | 64 ++++++++++++++++++++--
.../app1/grails-app/conf/application.yml | 4 +-
2 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/grails-gradle/model/src/main/groovy/grails/util/Metadata.groovy b/grails-gradle/model/src/main/groovy/grails/util/Metadata.groovy
index 111c720648..bb7f9776be 100644
--- a/grails-gradle/model/src/main/groovy/grails/util/Metadata.groovy
+++ b/grails-gradle/model/src/main/groovy/grails/util/Metadata.groovy
@@ -40,6 +40,7 @@ import java.lang.ref.SoftReference
* @since 1.1
*/
@CompileStatic
+// #12012 - Slf4j cannot be used on this class because this is used prior to the context being initialized
class Metadata {
private static final long serialVersionUID = -582452926111226898L
public static final String FILE = "application.yml"
@@ -48,7 +49,6 @@ class Metadata {
public static final String DEFAULT_APPLICATION_NAME = "grailsApplication"
public static final String APPLICATION_GRAILS_VERSION = "info.app.grailsVersion"
public static final String SERVLET_VERSION = "info.app.servletVersion"
- public static final String WAR_DEPLOYED = "info.app.warDeployed"
public static final String DEFAULT_SERVLET_VERSION = "6.0"
public static final String BUILD_INFO_FILE = "META-INF/grails.build.info"
@@ -56,7 +56,6 @@ class Metadata {
private final MutablePropertySources propertySources = new MutablePropertySources()
private final ConfigurablePropertyResolver propertyResolver
private Resource metadataFile
- private boolean warDeployed
private String servletVersion = DEFAULT_SERVLET_VERSION
private Map<String, Object> props = null
@@ -91,6 +90,9 @@ class Metadata {
return metadataFile
}
+ /**
+ * Resets the current state of the Metadata so it is re-read.
+ */
static void reset() {
Metadata m = getFromMap()
if (m != null) {
@@ -107,10 +109,11 @@ class Metadata {
final Map<String, Object> m = [(APPLICATION_NAME): (Object) DEFAULT_APPLICATION_NAME]
addPropertySource(new MapPropertySource("appName", m))
}
-
- warDeployed = getProperty(WAR_DEPLOYED, Boolean.class, false)
}
+ /**
+ * @return the metadata for the current application
+ */
static Metadata getCurrent() {
Metadata m = getFromMap()
if (m == null) {
@@ -136,12 +139,23 @@ class Metadata {
url = classLoader.getResource(BUILD_INFO_FILE)
if (url != null) {
- if (IOUtils.isWithinBinary(url)) {
+ if (IOUtils.isWithinBinary(url) || !Environment.isDevelopmentEnvironmentAvailable()) {
url.withInputStream { input ->
addPropertySource(loadProperties(input, "build.info"))
}
}
+ } else {
+ // try WAR packaging resolve
+ url = classLoader.getResource("../../" + BUILD_INFO_FILE)
+ if (url != null) {
+ if (IOUtils.isWithinBinary(url) || !Environment.isDevelopmentEnvironmentAvailable()) {
+ url.withInputStream { input ->
+ addPropertySource(loadProperties(input, "build.info"))
+ }
+ }
+ }
}
+ afterLoading()
}
catch (Exception e) {
throw new RuntimeException("Cannot load application metadata:" + e.getMessage(), e)
@@ -175,16 +189,31 @@ class Metadata {
}
}
+ /**
+ * Loads a Metadata instance from a Reader
+ * @param inputStream The InputStream
+ * @return a Metadata instance
+ */
static Metadata getInstance(InputStream inputStream) {
Metadata m = new Metadata(inputStream)
holder.set(new FinalReference<Metadata>(m))
return m
}
+ /**
+ * Loads and returns a new Metadata object for the given File.
+ * @param file The File
+ * @return A Metadata object
+ */
static Metadata getInstance(File file) {
return getInstance(new FileSystemResource(file))
}
+ /**
+ * Loads and returns a new Metadata object for the given File.
+ * @param file The File
+ * @return A Metadata object
+ */
static Metadata getInstance(Resource file) {
Reference<Metadata> ref = holder.get()
if (ref != null) {
@@ -196,6 +225,10 @@ class Metadata {
return new Metadata(file)
}
+ /**
+ * Reloads the application metadata.
+ * @return The metadata object
+ */
static Metadata reload() {
Resource f = getCurrent().getMetadataFile()
return (f != null && f.exists()) ? getInstance(f) : new Metadata()
@@ -235,18 +268,31 @@ class Metadata {
return getProperty(APPLICATION_VERSION, String.class, null)
}
+ /**
+ * @return The Grails version used to build the application
+ */
String getGrailsVersion() {
return getProperty(APPLICATION_GRAILS_VERSION, String.class, null)
}
+ /**
+ * @return The environment the application expects to run in
+ */
String getEnvironment() {
return getProperty("grails.env", String.class, null)
}
+ /**
+ * @return The application name
+ */
String getApplicationName() {
return getProperty(APPLICATION_NAME, String.class, DEFAULT_APPLICATION_NAME)
}
+
+ /**
+ * @return The version of the servlet spec the application was created for
+ */
String getServletVersion() {
return getProperty(SERVLET_VERSION, String.class, DEFAULT_SERVLET_VERSION)
}
@@ -255,10 +301,16 @@ class Metadata {
this.servletVersion = servletVersion
}
+ /**
+ * @return true if this application is deployed as a WAR
+ */
boolean isWarDeployed() {
- return warDeployed
+ Environment.isWarDeployed()
}
+ /**
+ * @return True if the development sources are present
+ */
boolean isDevelopmentEnvironmentAvailable() {
return Environment.isDevelopmentEnvironmentAvailable()
}
diff --git a/grails-test-examples/app1/grails-app/conf/application.yml b/grails-test-examples/app1/grails-app/conf/application.yml
index 509f9c15d6..919c1c342e 100644
--- a/grails-test-examples/app1/grails-app/conf/application.yml
+++ b/grails-test-examples/app1/grails-app/conf/application.yml
@@ -118,11 +118,11 @@ environments:
url: jdbc:h2:mem:devDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
test:
dataSource:
- dbCreate: update
+ dbCreate: create-drop
url: jdbc:h2:mem:testDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
production:
dataSource:
- dbCreate: update
+ dbCreate: create-drop
url: jdbc:h2:./prodDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
properties:
jmxEnabled: true