You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2021/10/28 11:59:45 UTC
[jackrabbit-filevault] branch
bugfix/JCRVLT-557-conf-implicit-nt-calc updated: JCRVLT-557: adjust
variable/method/prop name as suggested by kwin
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch bugfix/JCRVLT-557-conf-implicit-nt-calc
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/bugfix/JCRVLT-557-conf-implicit-nt-calc by this push:
new c666086 JCRVLT-557: adjust variable/method/prop name as suggested by kwin
c666086 is described below
commit c6660861d4f7bef4888c9ef8d5fe3e449b35a015
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Thu Oct 28 12:58:02 2021 +0100
JCRVLT-557: adjust variable/method/prop name as suggested by kwin
---
.../vault/fs/impl/io/FolderArtifactHandler.java | 19 ++++++++++---------
.../jackrabbit/vault/fs/io/ImportOptions.java | 22 +++++++++++-----------
.../apache/jackrabbit/vault/fs/io/Importer.java | 2 +-
3 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FolderArtifactHandler.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FolderArtifactHandler.java
index a593c2b..d119845 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FolderArtifactHandler.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FolderArtifactHandler.java
@@ -48,9 +48,9 @@ import org.jetbrains.annotations.NotNull;
public class FolderArtifactHandler extends AbstractArtifactHandler {
/**
- * whether correct primary type should be enforced upon creation
+ * whether primary type of folders should be overwritten
*/
- private boolean enforceCorrectPrimaryType = true;
+ private boolean overwritePrimaryTypesOfFolders = true;
/**
* qualified names of those default node types which should not be used for intermediate nodes (as they come with too many restrictions)
@@ -79,14 +79,15 @@ public class FolderArtifactHandler extends AbstractArtifactHandler {
}
/**
- * Sets whether correct primary type should be enforced upon creation
+ * Sets whether primary type of folders should be overwritten
*
- * @param enforceCorrectPrimaryType
- * set to "false" to disable the default behavior of enforcing
- * the primary node type
+ * @param primary
+ * type of folders should be overwritten set to "false" to
+ * disable the default behavior of overwriting the primary node
+ * type
*/
- public void setEnforceCorrectPrimaryType(boolean enforceCorrectPrimaryType) {
- this.enforceCorrectPrimaryType = enforceCorrectPrimaryType;
+ public void setOverwritePrimaryTypesOfFolders(boolean overwritePrimaryTypesOfFolders) {
+ this.overwritePrimaryTypesOfFolders = overwritePrimaryTypesOfFolders;
}
private Node createIntermediateNode(Node parent, String intermediateNodeName) throws RepositoryException {
@@ -139,7 +140,7 @@ public class FolderArtifactHandler extends AbstractArtifactHandler {
}
Node node = parent.getNode(dir.getRelativePath());
- if (enforceCorrectPrimaryType
+ if (overwritePrimaryTypesOfFolders
&& wspFilter.contains(node.getPath()) && wspFilter.getImportMode(node.getPath()) == ImportMode.REPLACE && !nodeType.equals(node.getPrimaryNodeType().getName())) {
modifyPrimaryType(node, info);
}
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ImportOptions.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ImportOptions.java
index 20489dd..a853a9a 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ImportOptions.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ImportOptions.java
@@ -73,19 +73,19 @@ public class ImportOptions {
private @NotNull IdConflictPolicy idConflictPolicy = IdConflictPolicy.FAIL;
- private static boolean DEFAULT_ENFORCE_CORRECT_PRIMARY_NODETYPE;
+ private static boolean OVERWRITE_PRIMARY_TYPES_OF_FOLDERS;
static {
boolean t = true;
- String key = "org.apache.jackrabbit.vault.fs.io.ImportOptions.DEFAULT_ENFORCE_CORRECT_PRIMARY_NODETYPE";
+ String key = "org.apache.jackrabbit.vault.fs.io.ImportOptions.OVERWRITE_PRIMARY_TYPES_OF_FOLDERS";
String sp = System.getProperty(key);
if (sp != null) {
log.info(key + " set to: '" + sp + "' (default is '" + t + "')");
t = Boolean.parseBoolean(sp);
}
- DEFAULT_ENFORCE_CORRECT_PRIMARY_NODETYPE = t;
+ OVERWRITE_PRIMARY_TYPES_OF_FOLDERS = t;
}
- private boolean enforceCorrectPrimaryType = DEFAULT_ENFORCE_CORRECT_PRIMARY_NODETYPE;
+ private boolean overwritePrimaryTypesOfFolders = OVERWRITE_PRIMARY_TYPES_OF_FOLDERS;
/**
* Default constructor.
@@ -118,7 +118,7 @@ public class ImportOptions {
pathMapping = base.pathMapping;
dependencyHandling = base.dependencyHandling;
idConflictPolicy = base.idConflictPolicy;
- enforceCorrectPrimaryType = base.enforceCorrectPrimaryType;
+ overwritePrimaryTypesOfFolders = base.overwritePrimaryTypesOfFolders;
}
}
@@ -145,7 +145,7 @@ public class ImportOptions {
ret.pathMapping = pathMapping;
ret.dependencyHandling = dependencyHandling;
ret.idConflictPolicy = idConflictPolicy;
- ret.enforceCorrectPrimaryType = enforceCorrectPrimaryType;
+ ret.overwritePrimaryTypesOfFolders = overwritePrimaryTypesOfFolders;
return ret;
}
@@ -281,8 +281,8 @@ public class ImportOptions {
this.cugHandling = cugHandling;
}
- public boolean getEnforceCorrectPrimaryType() {
- return enforceCorrectPrimaryType;
+ public boolean getOverwritePrimaryTypesOfFolders() {
+ return overwritePrimaryTypesOfFolders;
}
/**
@@ -489,7 +489,7 @@ public class ImportOptions {
result = prime * result + ((pathMapping == null) ? 0 : pathMapping.hashCode());
result = prime * result + ((idConflictPolicy == null) ? 0 : idConflictPolicy.hashCode());
result = prime * result + (strict ? 1231 : 1237);
- result = prime * result + (enforceCorrectPrimaryType ? 1231 : 1237);
+ result = prime * result + (overwritePrimaryTypesOfFolders ? 1231 : 1237);
return result;
}
@@ -556,7 +556,7 @@ public class ImportOptions {
return false;
if (strict != other.strict)
return false;
- if (enforceCorrectPrimaryType != other.enforceCorrectPrimaryType)
+ if (overwritePrimaryTypesOfFolders != other.overwritePrimaryTypesOfFolders)
return false;
if (!idConflictPolicy.equals(other.idConflictPolicy))
return false;
@@ -576,7 +576,7 @@ public class ImportOptions {
+ (hookClassLoader != null ? "hookClassLoader=" + hookClassLoader + ", " : "")
+ (pathMapping != null ? "pathMapping=" + pathMapping + ", " : "")
+ (dependencyHandling != null ? "dependencyHandling=" + dependencyHandling + ", " : "")
- + "enforceCorrectPrimaryType=" + enforceCorrectPrimaryType + ", "
+ + "overwritePrimaryTypesOfFolders=" + overwritePrimaryTypesOfFolders + ", "
+ "idConflictPolicy=" + idConflictPolicy + "]";
}
}
\ No newline at end of file
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java
index f1d0a9b..5faa099 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java
@@ -400,7 +400,7 @@ public class Importer {
genericHandler.setCugHandling(opts.getCugHandling());
folderHandler.setAcHandling(opts.getAccessControlHandling());
folderHandler.setCugHandling(opts.getCugHandling());
- folderHandler.setEnforceCorrectPrimaryType(opts.getEnforceCorrectPrimaryType());
+ folderHandler.setOverwritePrimaryTypesOfFolders(opts.getOverwritePrimaryTypesOfFolders());
filter = opts.getFilter();
if (filter == null) {