You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2026/03/11 18:25:16 UTC
(causeway) branch maintenance-branch updated: CAUSEWAY-3973: [v2] makes the backport a non-breaking change for consuming apps
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch maintenance-branch
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/maintenance-branch by this push:
new b8bb5bd4304 CAUSEWAY-3973: [v2] makes the backport a non-breaking change for consuming apps
b8bb5bd4304 is described below
commit b8bb5bd4304edec4aecbb6d8496d7d4508da90bb
Author: andi-huber <ah...@apache.org>
AuthorDate: Wed Mar 11 19:25:07 2026 +0100
CAUSEWAY-3973: [v2] makes the backport a non-breaking change for
consuming apps
---
.../applib/layout/resource/LayoutResource.java | 2 +-
.../services/grid/spi}/LayoutResource.java | 30 +++++-----------------
.../services/grid/spi/LayoutResourceLoader.java | 30 +++-------------------
3 files changed, 12 insertions(+), 50 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/resource/LayoutResource.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/resource/LayoutResource.java
index cad45f18334..8be2db3aab1 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/resource/LayoutResource.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/resource/LayoutResource.java
@@ -31,7 +31,7 @@
* @since 4.0 {@index}
*/
@Getter @Accessors(fluent = true)
-public final class LayoutResource {
+public class LayoutResource {
private final String resourceName;
private final CommonMimeType format;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/resource/LayoutResource.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/spi/LayoutResource.java
similarity index 54%
copy from api/applib/src/main/java/org/apache/causeway/applib/layout/resource/LayoutResource.java
copy to core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/spi/LayoutResource.java
index cad45f18334..d1ac1eb1d41 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/resource/LayoutResource.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/spi/LayoutResource.java
@@ -16,34 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.applib.layout.resource;
-
-import java.util.Objects;
+package org.apache.causeway.core.metamodel.services.grid.spi;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-import lombok.Getter;
-import lombok.experimental.Accessors;
-
/**
- * Layout data record with name, format and contents (XML, JSON, etc.) based on format.
- *
- * @since 4.0 {@index}
+ * @deprecated was promoted to applib
*/
-@Getter @Accessors(fluent = true)
-public final class LayoutResource {
-
- private final String resourceName;
- private final CommonMimeType format;
- private final String content;
+@Deprecated(forRemoval = true)
+public final class LayoutResource extends org.apache.causeway.applib.layout.resource.LayoutResource{
- public LayoutResource(
- final String resourceName,
- final CommonMimeType format,
- final String content) {
- this.resourceName = Objects.requireNonNull(resourceName);
- this.format = Objects.requireNonNull(format);
- this.content = Objects.requireNonNull(content);
- }
+ public LayoutResource(String resourceName, CommonMimeType format, String content) {
+ super(resourceName, format, content);
+ }
}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/resource/LayoutResource.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/spi/LayoutResourceLoader.java
similarity index 50%
copy from api/applib/src/main/java/org/apache/causeway/applib/layout/resource/LayoutResource.java
copy to core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/spi/LayoutResourceLoader.java
index cad45f18334..524dacfa091 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/resource/LayoutResource.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/spi/LayoutResourceLoader.java
@@ -16,34 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.applib.layout.resource;
-
-import java.util.Objects;
-
-import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-
-import lombok.Getter;
-import lombok.experimental.Accessors;
+package org.apache.causeway.core.metamodel.services.grid.spi;
/**
- * Layout data record with name, format and contents (XML, JSON, etc.) based on format.
- *
- * @since 4.0 {@index}
+ * @deprecated was promoted to applib
*/
-@Getter @Accessors(fluent = true)
-public final class LayoutResource {
-
- private final String resourceName;
- private final CommonMimeType format;
- private final String content;
-
- public LayoutResource(
- final String resourceName,
- final CommonMimeType format,
- final String content) {
- this.resourceName = Objects.requireNonNull(resourceName);
- this.format = Objects.requireNonNull(format);
- this.content = Objects.requireNonNull(content);
- }
+@Deprecated(forRemoval = true)
+public interface LayoutResourceLoader extends org.apache.causeway.applib.layout.resource.LayoutResourceLoader{
}