From 1dff1ca8e5527d961f13512048f6ad22b83c5c0d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 8 Jan 2015 15:40:37 +0000 Subject: [PATCH] rename abstract class --- .gitattributes | 2 +- ...tionTask.java => EntityValidationTaskBase.java} | 14 +++++++------- .../validation/EntityValidationTaskQueue.java | 4 ++-- .../validation/EntityValidationThread.java | 6 +++--- .../validation/Level2ValidationTask.java | 2 +- .../validation/Level3ValidationTask.java | 2 +- .../persistence/validation/ValidationExecutor.java | 8 ++++---- 7 files changed, 19 insertions(+), 19 deletions(-) rename cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/{EntityValidationTask.java => EntityValidationTaskBase.java} (88%) diff --git a/.gitattributes b/.gitattributes index 31aa561ccb..365bc891ca 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1517,7 +1517,7 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/MatchMode.ja cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/NativeSqlOrderHint.java -text cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/OrderHint.java -text cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/RandomOrder.java -text -cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTask.java -text +cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTaskBase.java -text cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTaskQueue.java -text cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationThread.java -text cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/Level2ValidationTask.java -text diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTask.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTaskBase.java similarity index 88% rename from cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTask.java rename to cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTaskBase.java index 069834747c..a5b758fd83 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTask.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTaskBase.java @@ -31,9 +31,9 @@ import eu.etaxonomy.cdm.model.validation.CRUDEventType; * @author ayco_holleman * */ -public abstract class EntityValidationTask implements Runnable { +public abstract class EntityValidationTaskBase implements Runnable { - private static final Logger logger = Logger.getLogger(EntityValidationTask.class); + private static final Logger logger = Logger.getLogger(EntityValidationTaskBase.class); private final CdmBase entity; private final CRUDEventType crudEventType; @@ -53,7 +53,7 @@ public abstract class EntityValidationTask implements Runnable { * @param validationGroups * The validation groups to apply */ - public EntityValidationTask(CdmBase entity, Class... validationGroups){ + public EntityValidationTaskBase(CdmBase entity, Class... validationGroups){ this(entity, CRUDEventType.NONE, validationGroups); } @@ -69,7 +69,7 @@ public abstract class EntityValidationTask implements Runnable { * @param validationGroups * The validation groups to apply */ - public EntityValidationTask(CdmBase entity, CRUDEventType crudEventType, Class... validationGroups){ + public EntityValidationTaskBase(CdmBase entity, CRUDEventType crudEventType, Class... validationGroups){ this.entity = entity; this.crudEventType = crudEventType; this.validationGroups = validationGroups; @@ -162,10 +162,10 @@ public abstract class EntityValidationTask implements Runnable { if (this == obj) { return true; } - if (obj == null || !(obj instanceof EntityValidationTask)) { + if (obj == null || !(obj instanceof EntityValidationTaskBase)) { return false; } - EntityValidationTask other = (EntityValidationTask) obj; + EntityValidationTaskBase other = (EntityValidationTaskBase) obj; if (!Arrays.deepEquals(validationGroups, other.validationGroups)) { return false; } @@ -184,7 +184,7 @@ public abstract class EntityValidationTask implements Runnable { @Override public String toString(){ - return EntityValidationTask.class.getName() + ':' + entity.toString() + Arrays.deepToString(validationGroups); + return EntityValidationTaskBase.class.getName() + ':' + entity.toString() + Arrays.deepToString(validationGroups); } } diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTaskQueue.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTaskQueue.java index e764048635..5e0a39a28b 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTaskQueue.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTaskQueue.java @@ -74,10 +74,10 @@ class EntityValidationTaskQueue extends ArrayBlockingQueue { private void cleanup(Runnable runnable) { - EntityValidationTask newTask = (EntityValidationTask) runnable; + EntityValidationTaskBase newTask = (EntityValidationTaskBase) runnable; Iterator iterator = this.iterator(); while (iterator.hasNext()) { - EntityValidationTask oldTask = (EntityValidationTask) iterator.next(); + EntityValidationTaskBase oldTask = (EntityValidationTaskBase) iterator.next(); if (oldTask.getEntity().equals(newTask.getEntity())) { iterator.remove(); } diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationThread.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationThread.java index 38dd3afb24..622e6e1275 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationThread.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationThread.java @@ -28,7 +28,7 @@ public final class EntityValidationThread extends Thread { private final Validator validator; private boolean terminationRequested; - private EntityValidationTask currentTask; + private EntityValidationTaskBase currentTask; EntityValidationThread(ThreadGroup group, Runnable runnable, String name, Validator validator) @@ -73,13 +73,13 @@ public final class EntityValidationThread extends Thread { } - EntityValidationTask getCurrentTask() + EntityValidationTaskBase getCurrentTask() { return currentTask; } - void setCurrentTask(EntityValidationTask currentTask) + void setCurrentTask(EntityValidationTaskBase currentTask) { this.currentTask = currentTask; } diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/Level2ValidationTask.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/Level2ValidationTask.java index a86936a8bc..d033f2409f 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/Level2ValidationTask.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/Level2ValidationTask.java @@ -18,7 +18,7 @@ import eu.etaxonomy.cdm.validation.Level2; * @author ayco holleman * */ -public class Level2ValidationTask extends EntityValidationTask { +public class Level2ValidationTask extends EntityValidationTaskBase { public Level2ValidationTask(CdmBase entity){ super(entity, Level2.class); diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/Level3ValidationTask.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/Level3ValidationTask.java index d33959281e..648aa6ca9b 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/Level3ValidationTask.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/Level3ValidationTask.java @@ -18,7 +18,7 @@ import eu.etaxonomy.cdm.validation.Level3; * @author ayco holleman * */ -public class Level3ValidationTask extends EntityValidationTask { +public class Level3ValidationTask extends EntityValidationTaskBase { public Level3ValidationTask(CdmBase entity){ super(entity, Level3.class); diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/ValidationExecutor.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/ValidationExecutor.java index d3c52a9684..53aebfaeca 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/ValidationExecutor.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/ValidationExecutor.java @@ -22,7 +22,7 @@ import org.apache.log4j.Logger; /** * A {@code ThreadPoolExecutor} specialized in dealing with {@link EntityValidationThread}s and - * validation tasks (see {@link EntityValidationTask}). This implementation creates a thread + * validation tasks (see {@link EntityValidationTaskBase}). This implementation creates a thread * pool containing just one thread, meaning all validation tasks are run one after another on * that one thread. Especially for Level-3 validation tasks this is probably exactly what you * want. These tasks are run upon CRUD events, and you don't want the database to be crawled to @@ -126,7 +126,7 @@ public class ValidationExecutor extends ThreadPoolExecutor implements RejectedEx */ @Override public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){ - EntityValidationTask task = (EntityValidationTask) r; + EntityValidationTaskBase task = (EntityValidationTaskBase) r; logger.error(String.format("Validation of %s cancelled. Too many validation tasks waiting to be executed.", task.getEntity().toString())); } @@ -146,7 +146,7 @@ public class ValidationExecutor extends ThreadPoolExecutor implements RejectedEx @Override protected void beforeExecute(Thread thread, Runnable runnable){ EntityValidationThread validationThread = (EntityValidationThread) thread; - EntityValidationTask task = (EntityValidationTask) runnable; + EntityValidationTaskBase task = (EntityValidationTaskBase) runnable; validationThread.setTerminationRequested(false); task.setValidator(validationThread.getValidator()); checkPool(validationThread, task); @@ -166,7 +166,7 @@ public class ValidationExecutor extends ThreadPoolExecutor implements RejectedEx * only allow one thread in the thread pool. However, we want to be prepared for a future * with truely concurrent validation. */ - private void checkPool(EntityValidationThread pendingThread, EntityValidationTask pendingTask){ + private void checkPool(EntityValidationThread pendingThread, EntityValidationTaskBase pendingTask){ boolean found = false; Iterator> iterator = threads.iterator(); while (iterator.hasNext()) { -- 2.34.1