From 3283994ed0bb41099776e8f6ec9b3fbcbc767a84 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 4 Oct 2023 09:14:08 +0200
Subject: [PATCH] Deprecate JCR entity definition

---
 .../src/org/argeo/app/api/EntityConstants.java     |  2 +-
 .../src/org/argeo/app/api/EntityDefinition.java    |  4 +---
 .../argeo/app/core/AbstractEntityDefinition.java   | 14 ++++++++++++++
 .../src/org/argeo/app/jcr/JcrEntityDefinition.java | 14 +++++++-------
 4 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 org.argeo.app.core/src/org/argeo/app/core/AbstractEntityDefinition.java

diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityConstants.java b/org.argeo.app.api/src/org/argeo/app/api/EntityConstants.java
index c7885be..f04a6d0 100644
--- a/org.argeo.app.api/src/org/argeo/app/api/EntityConstants.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityConstants.java
@@ -3,6 +3,6 @@ package org.argeo.app.api;
 /** Constant related to entities, typically used in an OSGi context. */
 public interface EntityConstants {
 	final static String TYPE = "entity.type";
-	final static String DEFAULT_EDITOR_ID = "entity.defaultEditorId";
+//	final static String DEFAULT_EDITOR_ID = "entity.defaultEditorId";
 
 }
diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityDefinition.java b/org.argeo.app.api/src/org/argeo/app/api/EntityDefinition.java
index e1280cf..97f7d7c 100644
--- a/org.argeo.app.api/src/org/argeo/app/api/EntityDefinition.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityDefinition.java
@@ -1,10 +1,8 @@
 package org.argeo.app.api;
 
-import javax.jcr.Node;
-
 /** The definition of an entity, a composite configurable data structure. */
 public interface EntityDefinition {
-	String getEditorId(Node entity);
+//	String getEditorId(Node entity);
 
 	String getType();
 }
diff --git a/org.argeo.app.core/src/org/argeo/app/core/AbstractEntityDefinition.java b/org.argeo.app.core/src/org/argeo/app/core/AbstractEntityDefinition.java
new file mode 100644
index 0000000..7e10bf0
--- /dev/null
+++ b/org.argeo.app.core/src/org/argeo/app/core/AbstractEntityDefinition.java
@@ -0,0 +1,14 @@
+package org.argeo.app.core;
+
+import org.argeo.app.api.EntityDefinition;
+
+public abstract class AbstractEntityDefinition implements EntityDefinition {
+
+	public void init() {
+
+	}
+
+	public void destroy() {
+
+	}
+}
diff --git a/org.argeo.app.jcr/src/org/argeo/app/jcr/JcrEntityDefinition.java b/org.argeo.app.jcr/src/org/argeo/app/jcr/JcrEntityDefinition.java
index e76315c..8795d02 100644
--- a/org.argeo.app.jcr/src/org/argeo/app/jcr/JcrEntityDefinition.java
+++ b/org.argeo.app.jcr/src/org/argeo/app/jcr/JcrEntityDefinition.java
@@ -2,7 +2,6 @@ package org.argeo.app.jcr;
 
 import java.util.Map;
 
-import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -14,11 +13,12 @@ import org.argeo.jcr.Jcr;
 import org.osgi.framework.BundleContext;
 
 /** An entity definition based on a JCR data structure. */
+@Deprecated
 public class JcrEntityDefinition implements EntityDefinition {
 	private Repository repository;
 
 	private String type;
-	private String defaultEditorId;
+//	private String defaultEditorId;
 
 	public void init(BundleContext bundleContext, Map<String, String> properties) throws RepositoryException {
 		Session adminSession = CmsJcrUtils.openDataAdminSession(repository, null);
@@ -26,7 +26,7 @@ public class JcrEntityDefinition implements EntityDefinition {
 			type = properties.get(EntityConstants.TYPE);
 			if (type == null)
 				throw new IllegalArgumentException("Entity type property " + EntityConstants.TYPE + " must be set.");
-			defaultEditorId = properties.get(EntityConstants.DEFAULT_EDITOR_ID);
+//			defaultEditorId = properties.get(EntityConstants.DEFAULT_EDITOR_ID);
 //			String definitionPath = EntityNames.ENTITY_DEFINITIONS_PATH + '/' + type;
 //			if (!adminSession.itemExists(definitionPath)) {
 //				Node entityDefinition = JcrUtils.mkdirs(adminSession, definitionPath, EntityTypes.ENTITY_DEFINITION);
@@ -48,10 +48,10 @@ public class JcrEntityDefinition implements EntityDefinition {
 
 	}
 
-	@Override
-	public String getEditorId(Node entity) {
-		return defaultEditorId;
-	}
+//	@Override
+//	public String getEditorId(Node entity) {
+//		return defaultEditorId;
+//	}
 
 	@Override
 	public String getType() {
-- 
2.30.2