Merge branch 'release/5.45.0'

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / TestServiceImpl.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TestServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TestServiceImpl.java
index 42077fea67bcca032a983ef7ec354aa7fb2a6e8f..1398857de8b5dcaec1c07d420a1b19b02d2678ce 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TestServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TestServiceImpl.java
@@ -12,7 +12,8 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
@@ -28,47 +29,34 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 /**
  * @author cmathew
  * @since 26 Jun 2015
- *
  */
 @Service
 public class TestServiceImpl implements ITestService {
 
-    private static final Logger logger = Logger.getLogger(TestServiceImpl.class);
+    private static final Logger logger = LogManager.getLogger();
 
     @Autowired
-    ITaxonNodeService taxonNodeService;
+    private ITaxonNodeService taxonNodeService;
 
     @Autowired
-    IProgressMonitorService progressMonitorService;
+    private IProgressMonitorService progressMonitorService;
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.service.ITestService#wait(int)
-     */
     @Override
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     public void waitFor(long timeToWaitInMs) throws InterruptedException {
         Thread.sleep(timeToWaitInMs);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.service.ITestService#returnResult(eu.etaxonomy.cdm.api.service.UpdateResult)
-     */
     @Override
     public UpdateResult returnResult(UpdateResult result) {
         return result;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.service.ITestService#throwException(java.lang.Exception)
-     */
     @Override
     public UpdateResult throwException(Exception ex) {
         throw new RuntimeException(ex);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.service.ITestService#addChild(eu.etaxonomy.cdm.api.service.dto.CdmEntityIdentifier)
-     */
     @Override
     @Transactional(readOnly = false)
     public UpdateResult addChild(CdmEntityIdentifier taxonNodeCei) {
@@ -81,7 +69,6 @@ public class TestServiceImpl implements ITestService {
         return result;
     }
 
-
     @Override
     public UUID monitLongRunningMethod(final RuntimeException ex, final List<String> feedbacks, final long feedbackWaitTimeout) {
 
@@ -107,6 +94,7 @@ public class TestServiceImpl implements ITestService {
             RuntimeException ex,
             List<String> feedbacks,
             long feedbackWaitTimeout) {
+
         int noOfSteps = 10;
         int stepToThrowException = noOfSteps / 2;
         int stepToWaitForFeedback = noOfSteps / 2;
@@ -140,5 +128,4 @@ public class TestServiceImpl implements ITestService {
         monitor.done();
         return "Success";
     }
-
-}
+}
\ No newline at end of file