diff --git a/conf/core/jobs.csv b/conf/core/jobs.csv
index 7e153c34668b785b6a70180d7dd9cd09c160fe08..3da052ff8529770646669c2f997d830dcb57d649 100644
--- a/conf/core/jobs.csv
+++ b/conf/core/jobs.csv
@@ -1,8 +1,8 @@
#
# This file is a part of the CaosDB Project.
#
-# Copyright (C) 2021 Timm Fitsche <t.fitschen@indiscale.com>
-# Copyright (C) 2021 IndiScale GmbH <info@indiscale.com>
+# Copyright (C) 2021-2023 Timm Fitsche <t.fitschen@indiscale.com>
+# Copyright (C) 2021-2023 IndiScale GmbH <info@indiscale.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLSetQueryTemplateDefinition.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLSetQueryTemplateDefinition.java
index ad1f40c763f6e36671095583ddfa79d002edc1d3..70293edb974c2f12ba78caefc8474a768774e9d2 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLSetQueryTemplateDefinition.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLSetQueryTemplateDefinition.java
@@ -29,7 +29,7 @@ import org.caosdb.server.database.exceptions.TransactionException;
import org.caosdb.server.entity.EntityID;
/**
- * Implements {@link SetQueryTemplateDefinitionImpl} for a MySQL/MariaDB back-end.
+ * Implements {@link SetQueryTemplateDefinitionImpl} for a MariaDB back-end.
*
* @author Timm Fitschen <t.fitschen@indiscale.com>
*/
diff --git a/src/main/java/org/caosdb/server/entity/EntityIdRegistry.java b/src/main/java/org/caosdb/server/entity/EntityIdRegistry.java
index e3cfd736ed5c3793c5bf0babe6519d0ce5af62be..e4e1158447decf9f98ece6f4de805919b404a5c5 100644
--- a/src/main/java/org/caosdb/server/entity/EntityIdRegistry.java
+++ b/src/main/java/org/caosdb/server/entity/EntityIdRegistry.java
@@ -27,7 +27,7 @@ import org.caosdb.server.transaction.Transaction;
/**
* An abstract layer for managing entity ids.
*
- * <p>That is, checking wether something is a well-formed id, generating well-formed ids and more.
+ * <p>That is, checking whether something is a well-formed id, generating well-formed ids and more.
*
* <p>This class follows a Strategy Pattern. The actual implemenation can be found in one of the
* implementations of the {@link EntityIdRegistryStrategy} interface.
diff --git a/src/main/java/org/caosdb/server/jobs/Job.java b/src/main/java/org/caosdb/server/jobs/Job.java
index 299e32c2df170646269de0c1c04f20e99a7966cd..7bb94635ed21c14c80c92d315539dd4fab5416ab 100644
--- a/src/main/java/org/caosdb/server/jobs/Job.java
+++ b/src/main/java/org/caosdb/server/jobs/Job.java
@@ -579,6 +579,7 @@ public abstract class Job {
}
resolvedEntity = null;
} else {
+ // We want another version, throw away current result.
resolvedEntity = null;
}
@@ -590,14 +591,14 @@ public abstract class Job {
}
}
- // find by name in the container...
+ // Last resort: find by name ...
if (resolvedEntity == null && versionId == null) {
- // from current transaction's container
+ // ... from current transaction's container
resolvedEntity = getEntityByName(name);
}
if (resolvedEntity == null && name != null) {
- // from database
+ // ... from database
resolvedEntity = retrieveValidLazyEntityByName(name, resulting_version);
}
diff --git a/src/main/java/org/caosdb/server/jobs/LazyEntityResolver.java b/src/main/java/org/caosdb/server/jobs/LazyEntityResolver.java
index 9932962a03e5ee448e16a81d83a4b864e73409d2..7088ce7d35903daf34a0e060241aa22d749988c0 100644
--- a/src/main/java/org/caosdb/server/jobs/LazyEntityResolver.java
+++ b/src/main/java/org/caosdb/server/jobs/LazyEntityResolver.java
@@ -36,7 +36,7 @@ import org.caosdb.server.transaction.Transaction;
* or has been retrieved fully and so on.
*
* <p>However, when the entities parents or properties are being retrieved after the transaction's
- * access has been released, a {@link IllegalStateException} will be thrown.
+ * access has been released, an {@link IllegalStateException} will be thrown.
*
* @author Timm Fitschen <t.fitschen@indiscale.com>
*/
diff --git a/src/main/java/org/caosdb/server/jobs/Schedule.java b/src/main/java/org/caosdb/server/jobs/Schedule.java
index bc51fca9b69cb30ebd4567fb5355546aeffd904d..1b7ac8f4b41118803e7d5a540be6a1a3ba57cfec 100644
--- a/src/main/java/org/caosdb/server/jobs/Schedule.java
+++ b/src/main/java/org/caosdb/server/jobs/Schedule.java
@@ -55,15 +55,15 @@ public class Schedule {
}
public ScheduledJob add(final Job j) {
- final ScheduledJob ret = new ScheduledJob(j);
- List<ScheduledJob> jobs = jobLists.get(ret.getTransactionStage().ordinal());
+ final ScheduledJob scheduled = new ScheduledJob(j);
+ List<ScheduledJob> jobs = jobLists.get(scheduled.getTransactionStage().ordinal());
if (jobs == null) {
jobs = new CopyOnWriteArrayList<ScheduledJob>();
- jobLists.put(ret.getTransactionStage().ordinal(), jobs);
+ jobLists.put(scheduled.getTransactionStage().ordinal(), jobs);
}
- if (!jobs.contains(ret)) {
- jobs.add(ret);
- return ret;
+ if (!jobs.contains(scheduled)) {
+ jobs.add(scheduled);
+ return scheduled;
}
return null;
}
diff --git a/src/main/java/org/caosdb/server/jobs/core/CheckDatatypePresent.java b/src/main/java/org/caosdb/server/jobs/core/CheckDatatypePresent.java
index 257e1895924fc3199ee269c86331da970b625d84..b3a06ca09d7870da843a2f3ad295e019ab683c12 100644
--- a/src/main/java/org/caosdb/server/jobs/core/CheckDatatypePresent.java
+++ b/src/main/java/org/caosdb/server/jobs/core/CheckDatatypePresent.java
@@ -140,9 +140,11 @@ public final class CheckDatatypePresent extends EntityJob {
}
}
+ /**
+ * If this is a record type property or a concrete property, assign the data type of the
+ * corresponding abstract property.
+ */
private void inheritDatatypeFromAbstractEntity() throws Message {
- // if this is a record type property or a concrete property, assign
- // the data type of the corresponding abstract property.
EntityInterface abstractProperty = resolve(getEntity());
if (abstractProperty != null && abstractProperty.hasDatatype()) {
getEntity().setDatatype(abstractProperty.getDatatype());
diff --git a/src/main/java/org/caosdb/server/jobs/core/ResolveNames.java b/src/main/java/org/caosdb/server/jobs/core/ResolveNames.java
index b19aca6d30e6743ad59814fc1b755634c228f33d..e353375baaaa11c59d7e67c7e39c8cd5a8eb38ee 100644
--- a/src/main/java/org/caosdb/server/jobs/core/ResolveNames.java
+++ b/src/main/java/org/caosdb/server/jobs/core/ResolveNames.java
@@ -67,7 +67,7 @@ public class ResolveNames extends ContainerJob {
.getEntity();
e.setId(valid.getId());
} catch (final EntityDoesNotExistException exc) {
- // definitely not an id.
+ // Definitely not an existing id.
}
}