Jcloud does not really support version numbers and will instead creat…

…e an ETAG which is not comprehensible by the end users. We need to use jcloud storage metadata properties to manage the versions being created.

Added the following new properties for identifying the version property name to be used as well as the strategy.
- jcloud.external.resource.management.version.property.name
- jcloud.versioning.strategy
The strategy is to indicate how versioning will be performed based on how the system is configured.
- ALL - each file uploaded will create a new version (Default)
- DRAFT - each file updloaded will create a new version - but once approved, it can only create one version for each approval
- APPROVED - Can only create one version per approval process.

Jcloud does not allow specifying the creation date on the object.  It will always assume that it was created on the date loaded and updated on the date loaded. So if loading older data and we want the date to reflect that older date, we need to store the data in a custom property.  Added support for specifying the created date property name as well.
jcloud.external.resource.management.created.date.property.name
Updates the existing change date so that it always specifies the changed date. Prior to this change it would leave the change date property empty when it was equal to the current date.

Also fixed some other minor issue
 - remove finalize() as it was deprecated.

core/src/main/java/org/fao/geonet/api/records/attachments/AbstractStore.java

@@ -286,7 +286,7 @@ public String toString() {
 
     private String escapeResourceManagementExternalProperties(String value) {
         return value.replace(RESOURCE_MANAGEMENT_EXTERNAL_PROPERTIES_SEPARATOR, RESOURCE_MANAGEMENT_EXTERNAL_PROPERTIES_ESCAPED_SEPARATOR);
-}
+    }
 
     /**
      * Create an encoded base 64 object id contains the following fields to uniquely identify the resource

datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java

@@ -779,14 +779,14 @@ public String toString() {
     }
 
     protected static class ResourceHolderImpl implements ResourceHolder {
-        private CmisObject cmisObject;
+        private final CmisObject cmisObject;
         private Path tempFolderPath;
         private Path path;
         private final MetadataResource metadataResource;
 
         public ResourceHolderImpl(final CmisObject cmisObject, MetadataResource metadataResource) throws IOException {
             // Preserve filename by putting the files into a temporary folder and using the same filename.
-            tempFolderPath = Files.createTempDirectory("gn-meta-res-" + String.valueOf(metadataResource.getMetadataId() + "-"));
+            tempFolderPath = Files.createTempDirectory("gn-meta-res-" + metadataResource.getMetadataId() + "-");
             tempFolderPath.toFile().deleteOnExit();
             path = tempFolderPath.resolve(getFilename(cmisObject.getName()));
             this.metadataResource = metadataResource;
@@ -817,11 +817,5 @@ public void close() throws IOException {
             path=null;
             tempFolderPath = null;
         }
-
-        @Override
-        protected void finalize() throws Throwable {
-            close();
-            super.finalize();
-        }
     }
 }

datastorages/jcloud/src/main/java/org/fao/geonet/resources/JCloudConfiguration.java

@@ -68,6 +68,11 @@ public class JCloudConfiguration {
      */
     private String externalResourceManagementChangedDatePropertyName;
 
+    /**
+     * Property name for storing the creation date of the record.
+     */
+    private String externalResourceManagementCreatedDatePropertyName;
+
     /**
      * Property name for validation status that is expected to be an integer with values of null, 0, 1, 2
      * (See MetadataResourceExternalManagementProperties.ValidationStatus for code meaning)
@@ -86,7 +91,39 @@ public class JCloudConfiguration {
      * Enable option to add versioning in the link to the resource.
      */
     private Boolean versioningEnabled;
+    /**
+     * Property name for storing the version information JCloud does not support versioning.
+     */
+    private String externalResourceManagementVersionPropertyName;
 
+    /**
+     * Property to identify the version strategy to be used.
+     */
+    public enum VersioningStrategy {
+        /**
+         * Each new resource change should generate a new version
+         * i.e. All new uploads will increase the version including draft and working copy.
+         * For workflow, this could cause confusion on working copies which would increase the version in the working copy
+         * but when merged only the last version would be merged and could make it look like there are missing versions.
+         */
+        ALL,
+        /**
+         * Each new resource change should generate a new version, But working copies will only increase by one version.
+         * This will avoid working copy version increases more than one to avoid the issues from ALL (lost versions on merge)
+         * This option may be preferred to ALL when workflow is enabled.
+         */
+        DRAFT,
+        /**
+         * Add a new version each time a metadata is approved.
+         * i.e. draft will remain as version 1 until approved and working copy will only increase by 1 which is what would be used once approved.
+         */
+        APPROVED
+    }
+
+    /**
+     * Version strategy to use when generating new versions
+     */
+    private VersioningStrategy versioningStrategy = VersioningStrategy.ALL;
 
     public void setProvider(String provider) {
         this.provider = provider;
@@ -225,6 +262,24 @@ public void setVersioningEnabled(String versioningEnabled) {
         this.versioningEnabled = BooleanUtils.toBooleanObject(versioningEnabled);
     }
 
+    public String getExternalResourceManagementVersionPropertyName() {
+        return externalResourceManagementVersionPropertyName;
+    }
+
+    public void setExternalResourceManagementVersionPropertyName(String externalResourceManagementVersionPropertyName) {
+        this.externalResourceManagementVersionPropertyName = externalResourceManagementVersionPropertyName;
+    }
+
+    public VersioningStrategy getVersioningStrategy() {
+        return versioningStrategy;
+    }
+
+    public void setVersioningStrategy(String versioningStrategy) {
+        if (StringUtils.hasLength(versioningStrategy)) {
+            this.versioningStrategy = VersioningStrategy.valueOf(versioningStrategy);
+        }
+    }
+
     public String getMetadataUUIDPropertyName() {
        return metadataUUIDPropertyName;
     }
@@ -240,6 +295,15 @@ public String getExternalResourceManagementChangedDatePropertyName() {
     public void setExternalResourceManagementChangedDatePropertyName(String externalResourceManagementChangedDatePropertyName) {
         this.externalResourceManagementChangedDatePropertyName = externalResourceManagementChangedDatePropertyName;
     }
+
+    public String getExternalResourceManagementCreatedDatePropertyName() {
+        return externalResourceManagementCreatedDatePropertyName;
+    }
+
+    public void setExternalResourceManagementCreatedDatePropertyName(String externalResourceManagementCreatedDatePropertyName) {
+        this.externalResourceManagementCreatedDatePropertyName = externalResourceManagementCreatedDatePropertyName;
+    }
+
     public String getExternalResourceManagementValidationStatusPropertyName() {
         return externalResourceManagementValidationStatusPropertyName;
     }
@@ -311,7 +375,9 @@ private void validateMetadataPropertyNames() throws  IllegalArgumentException {
         String[] names = {
             getMetadataUUIDPropertyName(),
             getExternalResourceManagementChangedDatePropertyName(),
-            getExternalResourceManagementValidationStatusPropertyName()
+            getExternalResourceManagementValidationStatusPropertyName(),
+            getExternalResourceManagementCreatedDatePropertyName(),
+            getExternalResourceManagementVersionPropertyName()
         };
 
         JCloudMetadataNameValidator.validateMetadataNamesForProvider(provider, names);

datastorages/jcloud/src/main/resources/config-store/config-jcloud-overrides.properties

@@ -16,7 +16,10 @@ jcloud.external.resource.management.validation.status.property.name=${JCLOUD_EXT
 jcloud.external.resource.management.validation.status.default.value=${JCLOUD_EXTERNAL_RESOURCE_MANAGEMENT_VALIDATION_STATUS_DEFAULT_VALUE:#{null}}
 
 jcloud.external.resource.management.changed.date.property.name=${JCLOUD_EXTERNAL_RESOURCE_MANAGEMENT_CHANGE_DATE_PROPERTY_NAME:#{null}}
+jcloud.external.resource.management.created.date.property.name=${JCLOUD_EXTERNAL_RESOURCE_MANAGEMENT_CREATED_DATE_PROPERTY_NAME:#{null}}
 
 jcloud.versioning.enabled=${JCLOUD_VERSIONING_ENABLED:#{null}}
+jcloud.versioning.strategy=${JCLOUD_VERSIONING_STRATEGY:#{null}}
+jcloud.external.resource.management.version.property.name=${JCLOUD_EXTERNAL_RESOURCE_MANAGEMENT_VERSION_PROPERTY_NAME:#{null}}
 
 jcloud.metadata.uuid.property.name=${JCLOUD_METADATA_UUID_PROPERTY_NAME:#{null}}

datastorages/jcloud/src/main/resources/config-store/config-jcloud.xml

@@ -53,8 +53,12 @@
         <property name="externalResourceManagementValidationStatusPropertyName" value="${jcloud.external.resource.management.validation.status.property.name}"/>
         <property name="externalResourceManagementValidationStatusDefaultValue" value="${jcloud.external.resource.management.validation.status.default.value}"/>
         <property name="externalResourceManagementChangedDatePropertyName" value="${jcloud.external.resource.management.changed.date.property.name}"/>
+        <property name="externalResourceManagementCreatedDatePropertyName" value="${jcloud.external.resource.management.created.date.property.name}"/>
 
         <property name="versioningEnabled" value="${jcloud.versioning.enabled}"/>
+        <!-- Supported versioning Strategy:  ALL, DRAFT, APPROVED -->
+        <property name="versioningStrategy" value="${jcloud.versioning.strategy}"/>
+        <property name="externalResourceManagementVersionPropertyName" value="${jcloud.external.resource.management.version.property.name}"/>
 
         <property name="metadataUUIDPropertyName" value="${jcloud.metadata.uuid.property.name}"/>
     </bean>

datastorages/s3/src/main/java/org/fao/geonet/api/records/attachments/S3Store.java

@@ -295,11 +295,5 @@ public void close() throws IOException {
                 path = null;
             }
         }
-
-        @Override
-        protected void finalize() throws Throwable {
-            close();
-            super.finalize();
-        }
     }
 }