cleanup

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java
index dd2ede25d59492bf259068b707b92c7a2b0752e1..1ee21507430c956e690aafe64931fb739da89e4f 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java
@@ -52,6 +52,7 @@ import net.sf.json.JSONObject;
 /**
  * Utility class which provides the functionality to convert a JSON response
  * resulting from a GBIF query for occurrences to the corresponding CDM entities.
+ *
  * @author pplitzner
  * @since 22.05.2014
  */

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
index baf1343c71ac1b275ebee0e664b37e16db27245a..721e1294b18fd03f107e54ebe01c52b6d9df051e 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
@@ -103,7 +103,7 @@ public class TaxonNodeServiceImpl
            extends AnnotatableServiceBase<TaxonNode, ITaxonNodeDao>
            implements ITaxonNodeService{
 
-    private static final Logger logger = LogManager.getLogger(TaxonNodeServiceImpl.class);
+    private static final Logger logger = LogManager.getLogger();
 
     @Autowired
     private IBeanInitializer defaultBeanInitializer;

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java
index 9e07ac83d7ba9bf07bf4cbe393cdf5b59b3a0827..487e3d0e1661dd3383534a957603e55556dc6b9d 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java
@@ -258,66 +258,62 @@ public class TermServiceImplTest extends CdmTransactionalIntegrationTest{
         @DataSet(value="/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml")
     })
     public void testMoveTerm(){
-       final String[] tableNames = new String[]{
-                "DefinedTermBase","Representation"};
-
-       commitAndStartNewTransaction(tableNames);
-       TermVocabulary<OrderedTerm> vocTest = OrderedTermVocabulary.NewOrderedInstance(TermType.DnaMarker,
-               OrderedTerm.class, "Test Term Vocabulary", null, null, null);
-       vocTest.addTerm(OrderedTerm.NewInstance(TermType.DnaMarker, "test1", "marker1", "t1"));
-       vocTest = vocabularyService.save(vocTest);
-
-       OrderedTermVocabulary<OrderedTerm> vocDna = OrderedTermVocabulary.NewOrderedInstance(TermType.DnaMarker,
-               OrderedTerm.class, "Test DNA marker", null, null, null);
-       vocDna.addTerm(OrderedTerm.NewInstance(TermType.DnaMarker, "test", "marker", "t"));
-       vocDna.addTerm(OrderedTerm.NewInstance(TermType.DnaMarker, "test2", "marker2", "t2"));
-       vocDna.addTerm(OrderedTerm.NewInstance(TermType.DnaMarker, "test3", "marker3", "t3"));
-       vocDna = vocabularyService.save(vocDna);
-       /*
-        *                                      vocDna
-        *   marker        marker2         marker3
-        *
-        */
-
-
-       Iterator<OrderedTerm> termsTest = vocTest.getTerms().iterator();
-       Iterator<OrderedTerm> termsDna = vocDna.getTerms().iterator();
-
-       TermDto termToMove = TermDto.fromTerm(termsTest.next());
-       OrderedTerm termBase =  (OrderedTerm)termService.load(termToMove.getUuid());
-       assertTrue(termBase.getOrderIndex() == 1);
-       TermDto parentTerm = TermDto.fromTerm(termsDna.next());
-       TermDto secondTerm = TermDto.fromTerm(termsDna.next());
-       //move to other vocabulary
-       termService.moveTerm(termToMove, vocDna.getUuid());
-
-       /*
-        *              vocDna
-        * marker               marker2         marker3         marker1
-        *
-        *
-        */
-       //commitAndStartNewTransaction(tableNames);
-       termBase =  (OrderedTerm)termService.load(termToMove.getUuid());
-       assertNotNull(termBase);
-       assertTrue(termBase.getVocabulary().getUuid().equals(vocDna.getUuid()));
-       vocTest = vocabularyService.load(vocDna.getUuid());
-       //include marker1
-       termService.moveTerm(termToMove,parentTerm.getUuid());
-       //commitAndStartNewTransaction(tableNames);
-       termBase =  (OrderedTerm)termService.load(termToMove.getUuid());
-       OrderedTerm parent = (OrderedTerm) termService.load(parentTerm.getUuid());
-       assertTrue(parent.getIncludes().size() == 1);
-       assertNotNull(termBase);
-       //termToMove is included in and fourth term of vocabulary -> orderIndex == 4
-       assertTrue(termBase.getOrderIndex() == 4);
-       //marker2 should be moved behind marker3
-       termService.moveTerm(secondTerm,parentTerm.getUuid(), TermMovePosition.AFTER);
-       termBase =  (OrderedTerm)termService.load(secondTerm.getUuid());
-       parent = (OrderedTerm) termService.load(parentTerm.getUuid());
-       //secondTerm should be before termToMove
-       assertTrue(termBase.getOrderIndex() == parent.getOrderIndex() - 1);
-
+    // final String[] tableNames = new String[]{
+    //                "DefinedTermBase","Representation"};
+
+       commitAndStartNewTransaction();
+       TermVocabulary<OrderedTerm> vocTest = OrderedTermVocabulary.NewOrderedInstance(TermType.DnaMarker,
+               OrderedTerm.class, "Test Term Vocabulary", null, null, null);
+       vocTest.addTerm(OrderedTerm.NewInstance(TermType.DnaMarker, "test1", "marker1", "t1"));
+       vocTest = vocabularyService.save(vocTest);
+
+       OrderedTermVocabulary<OrderedTerm> vocDna = OrderedTermVocabulary.NewOrderedInstance(TermType.DnaMarker,
+               OrderedTerm.class, "Test DNA marker", null, null, null);
+       vocDna.addTerm(OrderedTerm.NewInstance(TermType.DnaMarker, "test", "marker", "t"));
+       vocDna.addTerm(OrderedTerm.NewInstance(TermType.DnaMarker, "test2", "marker2", "t2"));
+       vocDna.addTerm(OrderedTerm.NewInstance(TermType.DnaMarker, "test3", "marker3", "t3"));
+       vocDna = vocabularyService.save(vocDna);
+       /*
+        *                                      vocDna
+        *   marker        marker2         marker3
+        *
+        */
+
+       Iterator<OrderedTerm> termsTest = vocTest.getTerms().iterator();
+       Iterator<OrderedTerm> termsDna = vocDna.getTerms().iterator();
+
+       TermDto termToMove = TermDto.fromTerm(termsTest.next());
+       OrderedTerm termBase =  (OrderedTerm)termService.load(termToMove.getUuid());
+       assertTrue(termBase.getOrderIndex() == 1);
+       TermDto parentTerm = TermDto.fromTerm(termsDna.next());
+       TermDto secondTerm = TermDto.fromTerm(termsDna.next());
+       //move to other vocabulary
+       termService.moveTerm(termToMove, vocDna.getUuid());
+
+       /*
+        *              vocDna
+        * marker               marker2         marker3         marker1
+        */
+       //commitAndStartNewTransaction(tableNames);
+       termBase =  (OrderedTerm)termService.load(termToMove.getUuid());
+       assertNotNull(termBase);
+       assertTrue(termBase.getVocabulary().getUuid().equals(vocDna.getUuid()));
+       vocTest = vocabularyService.load(vocDna.getUuid());
+       //include marker1
+       termService.moveTerm(termToMove,parentTerm.getUuid());
+       //commitAndStartNewTransaction(tableNames);
+       termBase =  (OrderedTerm)termService.load(termToMove.getUuid());
+       OrderedTerm parent = (OrderedTerm) termService.load(parentTerm.getUuid());
+       assertTrue(parent.getIncludes().size() == 1);
+       assertNotNull(termBase);
+       //termToMove is included in and fourth term of vocabulary -> orderIndex == 4
+       assertTrue(termBase.getOrderIndex() == 4);
+       //marker2 should be moved behind marker3
+       termService.moveTerm(secondTerm,parentTerm.getUuid(), TermMovePosition.AFTER);
+       termBase =  (OrderedTerm)termService.load(secondTerm.getUuid());
+       parent = (OrderedTerm) termService.load(parentTerm.getUuid());
+       //secondTerm should be before termToMove
+       assertTrue(termBase.getOrderIndex() == parent.getOrderIndex() - 1);
     }
 
     /**