From c9c6c59c5cbf03d313eb66972f0f1ec8a9ac5079 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Wed, 26 Apr 2023 10:46:08 +0200
Subject: [PATCH] Migrate code to reorganized E/R format ref. #24992

---
 CHANGELOG.md                                   |  5 +++++
 pom.xml                                        |  2 +-
 .../publisher/ResourceRegistryPublisher.java   | 18 ++++++++++++++++--
 .../ResourceRegistryPublisherImpl.java         | 16 ++++++++++++++--
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37f8aec..da09fdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for Resource Registry Publisher
 
+## [v4.4.0-SNAPSHOT]
+
+- Migrated code to reorganized E/R format [#24992]
+
+
 ## [v4.3.0]
 
 - Enhanced gcube-bom version
diff --git a/pom.xml b/pom.xml
index f51a63d..f9e8dc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
 	<groupId>org.gcube.information-system</groupId>
 	<artifactId>resource-registry-publisher</artifactId>
-	<version>4.3.0</version>
+	<version>4.4.0-SNAPSHOT</version>
 	<name>Resource Registry Publisher</name>
 	<description>Resource Registry Publisher is a library designed to interact with Resource Registry Instances APIs</description>
 
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/ResourceRegistryPublisher.java b/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/ResourceRegistryPublisher.java
index e50ae65..2479b6e 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/ResourceRegistryPublisher.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/ResourceRegistryPublisher.java
@@ -38,9 +38,23 @@ public interface ResourceRegistryPublisher {
 
 	public void setHierarchicalMode(boolean hierarchicalMode);
 
-	public boolean isIncludeContexts();
+	/**
+	 * Use {@link #includeContexts()} instead
+	 * @return
+	 */
+	@Deprecated
+	public boolean isIncludeContextsInHeader();
 
-	public void setIncludeContexts(boolean includeContexts);
+	/**
+	 * Use {@link #includeContexts(boolean)} instead
+	 * @param includeContextsInHeader
+	 */
+	@Deprecated
+	public void setIncludeContextsInHeader(boolean includeContexts);
+	
+	public boolean includeContexts();
+
+	public void includeContexts(boolean includeContexts);
 
 	public void addHeader(String name, String value);
 	
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/ResourceRegistryPublisherImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/ResourceRegistryPublisherImpl.java
index 1ec14cb..7b40f4b 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/ResourceRegistryPublisherImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/ResourceRegistryPublisherImpl.java
@@ -75,13 +75,25 @@ public class ResourceRegistryPublisherImpl implements ResourceRegistryPublisher
 		this.hierarchicalMode = hierarchicalMode;
 	}
 	
+	@Deprecated
 	@Override
-	public boolean isIncludeContexts() {
+	public boolean isIncludeContextsInHeader() {
+		return includeContexts();
+	}
+
+	@Deprecated
+	@Override
+	public void setIncludeContextsInHeader(boolean includeContexts) {
+		includeContexts(includeContexts);
+	}
+	
+	@Override
+	public boolean includeContexts() {
 		return includeContexts;
 	}
 	
 	@Override
-	public void setIncludeContexts(boolean includeContexts) {
+	public void includeContexts(boolean includeContexts) {
 		this.includeContexts = includeContexts;
 	}