diff --git a/src/main/java/org/caosdb/server/FileSystem.java b/src/main/java/org/caosdb/server/FileSystem.java
index 6bff612ca69acc24b699f8807b6969e343c60fb3..67587f3da7930dd2cbf3e76d3ed06f19508efef7 100644
--- a/src/main/java/org/caosdb/server/FileSystem.java
+++ b/src/main/java/org/caosdb/server/FileSystem.java
@@ -174,7 +174,7 @@ public class FileSystem {
tmpFile.getParentFile().mkdirs();
if (tmpFile.isDirectory()) {
// TODO this should generate an error. This means that the
- // tmpIdentifyers are inconsistent
+ // tmpIdentifiers are inconsistent
}
final OutputStream outputStream = new FileOutputStream(tmpFile);
final MessageDigest md = MessageDigest.getInstance("SHA-512");
diff --git a/src/main/java/org/caosdb/server/entity/Entity.java b/src/main/java/org/caosdb/server/entity/Entity.java
index 2ae8ddc1961b197d44a1636ff327962dd583763b..6e61764aea317802b539492945eb1108dd786c1c 100644
--- a/src/main/java/org/caosdb/server/entity/Entity.java
+++ b/src/main/java/org/caosdb/server/entity/Entity.java
@@ -873,23 +873,23 @@ public class Entity extends AbstractObservable implements EntityInterface {
}
// Parse TMPIDENTIFYER.
- String tmpIdentifyer = null;
+ String tmpIdentifier = null;
boolean pickup = false;
if (element.getAttribute("pickup") != null && !element.getAttributeValue("pickup").equals("")) {
- tmpIdentifyer = element.getAttributeValue("pickup");
+ tmpIdentifier = element.getAttributeValue("pickup");
pickup = true;
} else if (element.getAttribute("upload") != null
&& !element.getAttributeValue("upload").equals("")) {
- tmpIdentifyer = element.getAttributeValue("upload");
+ tmpIdentifier = element.getAttributeValue("upload");
}
- if (tmpIdentifyer != null && tmpIdentifyer.endsWith("/")) {
- tmpIdentifyer = tmpIdentifyer.substring(0, tmpIdentifyer.length() - 1);
+ if (tmpIdentifier != null && tmpIdentifier.endsWith("/")) {
+ tmpIdentifier = tmpIdentifier.substring(0, tmpIdentifier.length() - 1);
}
// Store PATH, HASH, SIZE, TMPIDENTIFYER
- if (tmpIdentifyer != null || checksum != null || path != null || size != null) {
+ if (tmpIdentifier != null || checksum != null || path != null || size != null) {
setFileProperties(
- new FileProperties(checksum, path, size, tmpIdentifyer).setPickupable(pickup));
+ new FileProperties(checksum, path, size, tmpIdentifier).setPickupable(pickup));
}
// Parse flags
diff --git a/src/main/java/org/caosdb/server/entity/FileProperties.java b/src/main/java/org/caosdb/server/entity/FileProperties.java
index c2c2c10fae44d4d84af56a33a052f5ed589debed..daeec098f915cf43b4dd1b8794fdd87f2d47d3bc 100644
--- a/src/main/java/org/caosdb/server/entity/FileProperties.java
+++ b/src/main/java/org/caosdb/server/entity/FileProperties.java
@@ -38,7 +38,7 @@ public class FileProperties {
private String checksum = null;
private String path = null;
private Long size = null;
- private String tmpIdentifyer = null;
+ private String tmpIdentifier = null;
public FileProperties setChecksum(final String checksum) {
this.checksum = checksum;
@@ -96,11 +96,11 @@ public class FileProperties {
}
public FileProperties(
- final String checksum, final String path, final Long size, final String tmpIdentifyer) {
+ final String checksum, final String path, final Long size, final String tmpIdentifier) {
this.checksum = checksum;
this.path = (path == null ? null : path.replaceFirst("^/", ""));
this.size = size;
- this.tmpIdentifyer = tmpIdentifyer;
+ this.tmpIdentifier = tmpIdentifier;
}
public void print(final String indent) {
@@ -127,13 +127,13 @@ public class FileProperties {
return this.file;
}
- public FileProperties setTmpIdentifyer(final String tmpIdentifyer) {
- this.tmpIdentifyer = tmpIdentifyer;
+ public FileProperties setTmpIdentifier(final String tmpIdentifier) {
+ this.tmpIdentifier = tmpIdentifier;
return this;
}
- public String getTmpIdentifyer() {
- return this.tmpIdentifyer;
+ public String getTmpIdentifier() {
+ return this.tmpIdentifier;
}
private String getThumbnailPath(final File target) {
@@ -291,6 +291,6 @@ public class FileProperties {
}
public boolean hasTmpIdentifier() {
- return this.tmpIdentifyer != null;
+ return this.tmpIdentifier != null;
}
}
diff --git a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
index b246af0c7715ef3f2a7798e2e629cb575e61128d..79973e672f2f8047a157fec813ba4c8ae6e3cb81 100644
--- a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
+++ b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
@@ -354,8 +354,8 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
if (uploadFile == null) {
entity.addError(ServerMessages.FILE_HAS_NOT_BEEN_UPLOAED);
} else {
- container.addFile(uploadFile.getTmpIdentifyer(), uploadFile);
- entity.getFileProperties().setTmpIdentifyer(uploadFile.getTmpIdentifyer());
+ container.addFile(uploadFile.getTmpIdentifier(), uploadFile);
+ entity.getFileProperties().setTmpIdentifier(uploadFile.getTmpIdentifier());
}
}
}
diff --git a/src/main/java/org/caosdb/server/grpc/UploadBuffer.java b/src/main/java/org/caosdb/server/grpc/UploadBuffer.java
index a955622008d994bd9b0b87aac624790dae6660b2..b341c33cbe9e0ca911c35aad144492cc2631da63 100644
--- a/src/main/java/org/caosdb/server/grpc/UploadBuffer.java
+++ b/src/main/java/org/caosdb/server/grpc/UploadBuffer.java
@@ -46,7 +46,7 @@ public class UploadBuffer {
final FileProperties result =
new FileProperties(null, tmpFile.getAbsolutePath(), tmpFile.length());
result.setFile(tmpFile);
- result.setTmpIdentifyer(fileId);
+ result.setTmpIdentifier(fileId);
return result;
}
}
diff --git a/src/main/java/org/caosdb/server/jobs/core/MatchFileProp.java b/src/main/java/org/caosdb/server/jobs/core/MatchFileProp.java
index cef8b2b8ae9764ceb1e4bd2636c2b532d7e9415b..249fc0b17ebe908a9a7ab9d13bfdb00d869ec630 100644
--- a/src/main/java/org/caosdb/server/jobs/core/MatchFileProp.java
+++ b/src/main/java/org/caosdb/server/jobs/core/MatchFileProp.java
@@ -46,7 +46,7 @@ public class MatchFileProp extends FilesJob {
// descriptiveFileProperties is how the copied/uploaded/... file
// ACTUALLY looks like. (path, checksum, size)
final FileProperties descriptiveFileProperties =
- getFile(normativeFileProperties.getTmpIdentifyer());
+ getFile(normativeFileProperties.getTmpIdentifier());
if (descriptiveFileProperties != null) {
checkChecksum(normativeFileProperties, descriptiveFileProperties);
diff --git a/src/main/java/org/caosdb/server/jobs/core/PickUp.java b/src/main/java/org/caosdb/server/jobs/core/PickUp.java
index 94a80836c863ea226a88e035201a2e2fb9fd1039..b0e04529fa059be33b5af99c47286a3d2a469cdb 100644
--- a/src/main/java/org/caosdb/server/jobs/core/PickUp.java
+++ b/src/main/java/org/caosdb/server/jobs/core/PickUp.java
@@ -46,12 +46,12 @@ public class PickUp extends EntityJob implements Observer {
if (normativeFileProperties.isPickupable()) {
try {
entity.acceptObserver(this);
- this.dropOffBoxPath = normativeFileProperties.getTmpIdentifyer();
+ this.dropOffBoxPath = normativeFileProperties.getTmpIdentifier();
final FileProperties descriptiveFileProperties =
FileSystem.pickUp(this.dropOffBoxPath, getRequestId());
normativeFileProperties.setFile(descriptiveFileProperties.getFile());
normativeFileProperties.setThumbnail(descriptiveFileProperties.getThumbnail());
- normativeFileProperties.setTmpIdentifyer(null);
+ normativeFileProperties.setTmpIdentifier(null);
if (!normativeFileProperties.hasSize()) {
normativeFileProperties.setSize(normativeFileProperties.getFile().length());
}
diff --git a/src/main/java/org/caosdb/server/resource/ScriptingResource.java b/src/main/java/org/caosdb/server/resource/ScriptingResource.java
index 4629457f7bad9eeedfcaf680e6dc3fb5556e6726..6e7cf721cb11bf95df23396bc79d5691335708a6 100644
--- a/src/main/java/org/caosdb/server/resource/ScriptingResource.java
+++ b/src/main/java/org/caosdb/server/resource/ScriptingResource.java
@@ -152,7 +152,7 @@ public class ScriptingResource extends AbstractCaosDBServerResource {
final FileProperties file = FileSystem.upload(item, this.getSRID());
deleteTmpFileAfterTermination(file);
file.setPath(item.getName());
- file.setTmpIdentifyer(item.getFieldName());
+ file.setTmpIdentifier(item.getFieldName());
files.add(file);
form.add(
new Parameter(
diff --git a/src/main/java/org/caosdb/server/transaction/WriteTransaction.java b/src/main/java/org/caosdb/server/transaction/WriteTransaction.java
index daaf78ec58de00553b0a15e040e5c5435265ec0c..1540ca79fdf557c3998f4b66072b4cb5466633a1 100644
--- a/src/main/java/org/caosdb/server/transaction/WriteTransaction.java
+++ b/src/main/java/org/caosdb/server/transaction/WriteTransaction.java
@@ -182,7 +182,7 @@ public class WriteTransaction extends Transaction<WritableContainer>
// get file by tmpIdentifier
final FileProperties f =
- getContainer().getFiles().get(entity.getFileProperties().getTmpIdentifyer());
+ getContainer().getFiles().get(entity.getFileProperties().getTmpIdentifier());
// is it there?
if (f != null) {
@@ -195,7 +195,7 @@ public class WriteTransaction extends Transaction<WritableContainer>
final FileProperties thumbnail =
getContainer()
.getFiles()
- .get(entity.getFileProperties().getTmpIdentifyer() + ".thumbnail");
+ .get(entity.getFileProperties().getTmpIdentifier() + ".thumbnail");
if (thumbnail != null) {
entity.getFileProperties().setThumbnail(thumbnail.getFile());
} else {
@@ -251,7 +251,7 @@ public class WriteTransaction extends Transaction<WritableContainer>
&& !entity.getFileProperties().isPickupable()) {
// dereference files (file upload only)
final FileProperties f =
- getContainer().getFiles().get(entity.getFileProperties().getTmpIdentifyer());
+ getContainer().getFiles().get(entity.getFileProperties().getTmpIdentifier());
if (f != null) {
entity.getFileProperties().setFile(f.getFile());
if (f.getThumbnail() != null) {
@@ -260,7 +260,7 @@ public class WriteTransaction extends Transaction<WritableContainer>
final FileProperties thumbnail =
getContainer()
.getFiles()
- .get(entity.getFileProperties().getTmpIdentifyer() + ".thumbnail");
+ .get(entity.getFileProperties().getTmpIdentifier() + ".thumbnail");
if (thumbnail != null) {
entity.getFileProperties().setThumbnail(thumbnail.getFile());
} else {
diff --git a/src/test/java/org/caosdb/server/scripting/TestServerSideScriptingCaller.java b/src/test/java/org/caosdb/server/scripting/TestServerSideScriptingCaller.java
index 61be0c5c3a06319dbeb826a79ddf1c6e43a0d672..45b8e7f4408ca7186fbc2589b176d3c5eba113ba 100644
--- a/src/test/java/org/caosdb/server/scripting/TestServerSideScriptingCaller.java
+++ b/src/test/java/org/caosdb/server/scripting/TestServerSideScriptingCaller.java
@@ -186,7 +186,7 @@ public class TestServerSideScriptingCaller extends CaosDBTestClass {
}
/**
- * Throw {@link CaosDBException} because tmpIdentifyer is null or empty.
+ * Throw {@link CaosDBException} because tmpIdentifier is null or empty.
*
* @throws FileNotFoundException
* @throws CaosDBException
@@ -222,7 +222,7 @@ public class TestServerSideScriptingCaller extends CaosDBTestClass {
final ArrayList<FileProperties> files = new ArrayList<>();
final FileProperties f = new FileProperties(null, null, null);
- f.setTmpIdentifyer("a2s3d4f5");
+ f.setTmpIdentifier("a2s3d4f5");
f.setPath("testfile");
files.add(f);
@@ -247,7 +247,7 @@ public class TestServerSideScriptingCaller extends CaosDBTestClass {
final ArrayList<FileProperties> files = new ArrayList<>();
final FileProperties f = new FileProperties(null, null, null);
- f.setTmpIdentifyer("a2s3d4f5");
+ f.setTmpIdentifier("a2s3d4f5");
f.setFile(new File("blablabla_non_existing"));
f.setPath("bla");
files.add(f);
@@ -282,7 +282,7 @@ public class TestServerSideScriptingCaller extends CaosDBTestClass {
final ArrayList<FileProperties> files = new ArrayList<>();
final FileProperties f = new FileProperties(null, null, null);
- f.setTmpIdentifyer("a2s3d4f5");
+ f.setTmpIdentifier("a2s3d4f5");
f.setFile(testFile);
f.setPath("testfile");
files.add(f);