Project

General

Profile

« Previous | Next » 

Revision 7c1862cd

Added by Andreas Müller over 9 years ago

update Transient services

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
43 43
import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge;
44 44
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
45 45
import eu.etaxonomy.cdm.model.common.Annotation;
46
import eu.etaxonomy.cdm.model.common.DefinedTerm;
46 47
import eu.etaxonomy.cdm.model.common.ISourceable;
47 48
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
48 49
import eu.etaxonomy.cdm.model.common.IdentifiableSource;
......
91 92
 */
92 93
public class TransientTaxonService implements ITaxonService {
93 94

  
94
    private final ITaxonService defaultTaxonService;
95
    private final ITaxonService defaultService;
95 96

  
96 97
    /**
97 98
     * @param defaultTaxonService
98 99
     */
99 100
    public TransientTaxonService(ITaxonService defaultTaxonService) {
100
        this.defaultTaxonService = defaultTaxonService;
101
        this.defaultService = defaultTaxonService;
101 102
    }
102 103

  
103 104
    /**
......
111 112
     */
112 113
    @Override
113 114
    public Pager<AuditEventRecord<TaxonBase>> pageAuditEvents(TaxonBase t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List<String> propertyPaths) {
114
        return defaultTaxonService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
115
        return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
115 116
    }
116 117

  
117 118
    /**
......
126 127
     */
127 128
    @Override
128 129
    public Pager<Annotation> getAnnotations(TaxonBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
129
        return defaultTaxonService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
130
        return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
130 131
    }
131 132

  
132 133
    /**
......
135 136
     */
136 137
    @Override
137 138
    public void clear() {
138
        defaultTaxonService.clear();
139
        defaultService.clear();
139 140
    }
140 141

  
141 142
    /**
......
145 146
     */
146 147
    @Override
147 148
    public void lock(TaxonBase t, LockOptions lockOptions) {
148
        defaultTaxonService.lock(t, lockOptions);
149
        defaultService.lock(t, lockOptions);
149 150
    }
150 151

  
151 152
    /**
......
156 157
     */
157 158
    @Override
158 159
    public void refresh(TaxonBase t, LockOptions lockOptions, List<String> propertyPaths) {
159
        defaultTaxonService.refresh(t, lockOptions, propertyPaths);
160
        defaultService.refresh(t, lockOptions, propertyPaths);
160 161
    }
161 162

  
162 163
    /**
......
165 166
     */
166 167
    @Override
167 168
    public void updateTitleCache() {
168
        defaultTaxonService.updateTitleCache();
169
        defaultService.updateTitleCache();
169 170
    }
170 171

  
171 172
    /**
......
175 176
     */
176 177
    @Override
177 178
    public AuditEventRecord<TaxonBase> getNextAuditEvent(TaxonBase t) {
178
        return defaultTaxonService.getNextAuditEvent(t);
179
        return defaultService.getNextAuditEvent(t);
179 180
    }
180 181

  
181 182
    /**
......
190 191
     */
191 192
    @Override
192 193
    public Pager<Marker> getMarkers(TaxonBase annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
193
        return defaultTaxonService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
194
        return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
194 195
    }
195 196

  
196 197
    /**
......
202 203
     */
203 204
    @Override
204 205
    public void updateTitleCache(Class<? extends TaxonBase> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<TaxonBase> cacheStrategy, IProgressMonitor monitor) {
205
        defaultTaxonService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
206
        defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
206 207
    }
207 208

  
208 209
    /**
......
212 213
     */
213 214
    @Override
214 215
    public AuditEventRecord<TaxonBase> getPreviousAuditEvent(TaxonBase t) {
215
        return defaultTaxonService.getPreviousAuditEvent(t);
216
        return defaultService.getPreviousAuditEvent(t);
216 217
    }
217 218

  
218 219
    /**
......
222 223
     */
223 224
    @Override
224 225
    public int count(Class<? extends TaxonBase> clazz) {
225
        return defaultTaxonService.count(clazz);
226
        return defaultService.count(clazz);
226 227
    }
227 228

  
228 229
    /**
......
239 240
     */
240 241
    @Override
241 242
    public Pager<AuditEventRecord<TaxonBase>> pageAuditEvents(Class<? extends TaxonBase> clazz, AuditEvent from, AuditEvent to, List<AuditCriterion> criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List<String> propertyPaths) {
242
        return defaultTaxonService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
243
        return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
243 244
    }
244 245

  
245 246
    /**
......
249 250
     */
250 251
    @Override
251 252
    public TaxonBase find(LSID lsid) {
252
        return defaultTaxonService.find(lsid);
253
        return defaultService.find(lsid);
253 254
    }
254 255

  
255 256
    /**
......
259 260
     */
260 261
    @Override
261 262
    public DeleteResult delete(TaxonBase persistentObject) {
262
        return defaultTaxonService.delete(persistentObject);
263
        return defaultService.delete(persistentObject);
263 264
    }
264 265

  
265 266
    /**
......
273 274
     */
274 275
    @Override
275 276
    public List<Object[]> groupMarkers(Class<? extends TaxonBase> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
276
        return defaultTaxonService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
277
        return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
277 278
    }
278 279

  
279 280
    /**
......
283 284
     */
284 285
    @Override
285 286
    public boolean exists(UUID uuid) {
286
        return defaultTaxonService.exists(uuid);
287
        return defaultService.exists(uuid);
287 288
    }
288 289

  
289 290

  
......
295 296
     */
296 297
    @Override
297 298
    public TaxonBase replace(TaxonBase x, TaxonBase y) {
298
        return defaultTaxonService.replace(x, y);
299
        return defaultService.replace(x, y);
299 300
    }
300 301

  
301 302
    /**
......
305 306
     */
306 307
    @Override
307 308
    public List<TaxonBase> find(Set<UUID> uuidSet) {
308
        return defaultTaxonService.find(uuidSet);
309
        return defaultService.find(uuidSet);
309 310
    }
310 311

  
311 312
    /**
......
318 319
     */
319 320
    @Override
320 321
    public Pager<IdentifiableSource> getSources(TaxonBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
321
        return defaultTaxonService.getSources(t, pageSize, pageNumber, propertyPaths);
322
        return defaultService.getSources(t, pageSize, pageNumber, propertyPaths);
322 323
    }
323 324

  
324 325
    /**
......
332 333
    @Deprecated
333 334
    @Override
334 335
    public List<Taxon> getRootTaxa(Reference sec, CdmFetch cdmFetch, boolean onlyWithChildren) {
335
        return defaultTaxonService.getRootTaxa(sec, cdmFetch, onlyWithChildren);
336
        return defaultService.getRootTaxa(sec, cdmFetch, onlyWithChildren);
336 337
    }
337 338

  
338 339
    /**
......
342 343
     */
343 344
    @Override
344 345
    public TaxonBase find(UUID uuid) {
345
        return defaultTaxonService.find(uuid);
346
        return defaultService.find(uuid);
346 347
    }
347 348

  
348 349
    /**
......
358 359
    @Deprecated
359 360
    @Override
360 361
    public List<Taxon> getRootTaxa(Rank rank, Reference sec, boolean onlyWithChildren, boolean withMisapplications, List<String> propertyPaths) {
361
        return defaultTaxonService.getRootTaxa(rank, sec, onlyWithChildren, withMisapplications, propertyPaths);
362
        return defaultService.getRootTaxa(rank, sec, onlyWithChildren, withMisapplications, propertyPaths);
362 363
    }
363 364

  
364 365
    /**
......
368 369
     */
369 370
    @Override
370 371
    public TaxonBase find(int id) {
371
        return defaultTaxonService.find(id);
372
        return defaultService.find(id);
372 373
    }
373 374

  
374 375
    /**
......
381 382
     */
382 383
    @Override
383 384
    public Pager<Rights> getRights(TaxonBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
384
        return defaultTaxonService.getRights(t, pageSize, pageNumber, propertyPaths);
385
        return defaultService.getRights(t, pageSize, pageNumber, propertyPaths);
385 386
    }
386 387

  
387 388
    /**
......
392 393
     */
393 394
    @Override
394 395
    public int countMarkers(Class<? extends TaxonBase> clazz, Boolean technical) {
395
        return defaultTaxonService.countMarkers(clazz, technical);
396
        return defaultService.countMarkers(clazz, technical);
396 397
    }
397 398

  
398 399
    /**
......
402 403
     */
403 404
    @Override
404 405
    public List<TaxonBase> findById(Set<Integer> idSet) {
405
        return defaultTaxonService.findById(idSet);
406
        return defaultService.findById(idSet);
406 407
    }
407 408

  
408 409
    /**
......
414 415
     */
415 416
    @Override
416 417
    public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) {
417
        return defaultTaxonService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
418
        return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
418 419
    }
419 420

  
420 421
    /**
......
423 424
     */
424 425
    @Override
425 426
    public Session getSession() {
426
        return defaultTaxonService.getSession();
427
        return defaultService.getSession();
427 428
    }
428 429

  
429 430
    /**
......
432 433
     */
433 434
    @Override
434 435
    public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCache() {
435
        return defaultTaxonService.getUuidAndTitleCache();
436
        return defaultService.getUuidAndTitleCache();
436 437
    }
437 438

  
438 439
    /**
......
446 447
     */
447 448
    @Override
448 449
    public List<Object[]> group(Class<? extends TaxonBase> clazz, Integer limit, Integer start, List<Grouping> groups, List<String> propertyPaths) {
449
        return defaultTaxonService.group(clazz, limit, start, groups, propertyPaths);
450
        return defaultService.group(clazz, limit, start, groups, propertyPaths);
450 451
    }
451 452

  
452 453
    /**
......
457 458
     */
458 459
    @Override
459 460
    public List<RelationshipBase> getAllRelationships(int limit, int start) {
460
        return defaultTaxonService.getAllRelationships(limit, start);
461
        return defaultService.getAllRelationships(limit, start);
461 462
    }
462 463

  
463 464
    /**
......
474 475
     */
475 476
    @Override
476 477
    public Pager<TaxonBase> findByTitle(Class<? extends TaxonBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
477
        return defaultTaxonService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
478
        return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
478 479
    }
479 480

  
480 481
    /**
......
485 486
    @Deprecated
486 487
    @Override
487 488
    public OrderedTermVocabulary<TaxonRelationshipType> getTaxonRelationshipTypeVocabulary() {
488
        return defaultTaxonService.getTaxonRelationshipTypeVocabulary();
489
        return defaultService.getTaxonRelationshipTypeVocabulary();
489 490
    }
490 491

  
491 492
    /**
......
496 497
     */
497 498
    @Override
498 499
    public List<TaxonBase> searchTaxaByName(String name, Reference sec) {
499
        return defaultTaxonService.searchTaxaByName(name, sec);
500
        return defaultService.searchTaxaByName(name, sec);
500 501
    }
501 502

  
502 503
    /**
......
506 507
     */
507 508
    @Override
508 509
    public void swapSynonymAndAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon) {
509
        defaultTaxonService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon);
510
        defaultService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon);
510 511
    }
511 512

  
512 513
    /**
......
520 521
     */
521 522
    @Override
522 523
    public <S extends TaxonBase> List<S> list(Class<S> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
523
        return defaultTaxonService.list(type, limit, start, orderHints, propertyPaths);
524
        return defaultService.list(type, limit, start, orderHints, propertyPaths);
524 525
    }
525 526

  
526 527
    /**
......
530 531
     */
531 532
    @Override
532 533
    public Pager<TaxonBase> findByTitle(IIdentifiableEntityServiceConfigurator<TaxonBase> configurator) {
533
        return defaultTaxonService.findByTitle(configurator);
534
        return defaultService.findByTitle(configurator);
534 535
    }
535 536

  
536 537
    /**
......
546 547
     */
547 548
    @Override
548 549
    public Taxon changeSynonymToAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon, boolean deleteSynonym, boolean copyCitationInfo, Reference citation, String microCitation) throws HomotypicalGroupChangeException {
549
        return defaultTaxonService.changeSynonymToAcceptedTaxon(synonym, acceptedTaxon, deleteSynonym, copyCitationInfo, citation, microCitation);
550
        return defaultService.changeSynonymToAcceptedTaxon(synonym, acceptedTaxon, deleteSynonym, copyCitationInfo, citation, microCitation);
550 551
    }
551 552

  
552 553
    /**
......
559 560
     */
560 561
    @Override
561 562
    public Integer countByTitle(Class<? extends TaxonBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria) {
562
        return defaultTaxonService.countByTitle(clazz, queryString, matchmode, criteria);
563
        return defaultService.countByTitle(clazz, queryString, matchmode, criteria);
563 564
    }
564 565

  
565 566
    /**
......
569 570
     */
570 571
    @Override
571 572
    public TaxonBase load(UUID uuid) {
572
        return defaultTaxonService.load(uuid);
573
        return defaultService.load(uuid);
573 574
    }
574 575

  
575 576
    /**
......
580 581
     */
581 582
    @Override
582 583
    public TaxonBase load(UUID uuid, List<String> propertyPaths) {
583
        return defaultTaxonService.load(uuid, propertyPaths);
584
        return defaultService.load(uuid, propertyPaths);
584 585
    }
585 586

  
586 587
    /**
......
590 591
     */
591 592
    @Override
592 593
    public Integer countByTitle(IIdentifiableEntityServiceConfigurator<TaxonBase> configurator) {
593
        return defaultTaxonService.countByTitle(configurator);
594
        return defaultService.countByTitle(configurator);
594 595
    }
595 596

  
596 597
    /**
......
600 601
     */
601 602
    @Override
602 603
    public TaxonBase merge(TaxonBase transientObject) {
603
        return defaultTaxonService.merge(transientObject);
604
        return defaultService.merge(transientObject);
604 605
    }
605 606

  
606 607
    /**
......
617 618
     */
618 619
    @Override
619 620
    public List<TaxonBase> listByTitle(Class<? extends TaxonBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
620
        return defaultTaxonService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
621
        return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
621 622
    }
622 623

  
623 624
    /**
......
631 632
     */
632 633
    @Override
633 634
    public  <S extends TaxonBase> Pager<S> page(Class<S> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
634
        return defaultTaxonService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
635
        return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
635 636
    }
636 637

  
637 638
    /**
......
641 642
     */
642 643
    @Override
643 644
    public UUID refresh(TaxonBase persistentObject) {
644
        return defaultTaxonService.refresh(persistentObject);
645
        return defaultService.refresh(persistentObject);
645 646
    }
646 647

  
647 648
    /**
......
655 656
     */
656 657
    @Override
657 658
    public Taxon changeSynonymToRelatedTaxon(Synonym synonym, Taxon toTaxon, TaxonRelationshipType taxonRelationshipType, Reference reference, String microReference) {
658
        return defaultTaxonService.changeSynonymToRelatedTaxon(synonym, toTaxon, taxonRelationshipType, reference, microReference);
659
        return defaultService.changeSynonymToRelatedTaxon(synonym, toTaxon, taxonRelationshipType, reference, microReference);
659 660
    }
660 661

  
661 662
    /**
......
672 673
     */
673 674
    @Override
674 675
    public List<TaxonBase> listByReferenceTitle(Class<? extends TaxonBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
675
        return defaultTaxonService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
676
        return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
676 677
    }
677 678

  
678 679
    /**
......
684 685
     */
685 686
    @Override
686 687
    public List<TaxonBase> rows(String tableName, int limit, int start) {
687
        return defaultTaxonService.rows(tableName, limit, start);
688
        return defaultService.rows(tableName, limit, start);
688 689
    }
689 690

  
690 691
    /**
......
705 706
     */
706 707
    @Override
707 708
    public long deleteSynonymRelationships(Synonym syn, Taxon taxon) {
708
        return defaultTaxonService.deleteSynonymRelationships(syn, taxon);
709
        return defaultService.deleteSynonymRelationships(syn, taxon);
709 710
    }
710 711

  
711 712
    /**
......
738 739
     */
739 740
    @Override
740 741
    public void changeHomotypicalGroupOfSynonym(Synonym synonym, HomotypicalGroup newHomotypicalGroup, Taxon targetTaxon, boolean removeFromOtherTaxa, boolean setBasionymRelationIfApplicable) {
741
        defaultTaxonService.changeHomotypicalGroupOfSynonym(synonym, newHomotypicalGroup, targetTaxon, removeFromOtherTaxa, setBasionymRelationIfApplicable);
742
        defaultService.changeHomotypicalGroupOfSynonym(synonym, newHomotypicalGroup, targetTaxon, removeFromOtherTaxa, setBasionymRelationIfApplicable);
742 743
    }
743 744

  
744 745
    /**
......
758 759
     */
759 760
    @Override
760 761
    public UUID update(TaxonBase transientObject) {
761
        return defaultTaxonService.update(transientObject);
762
        return defaultService.update(transientObject);
762 763
    }
763 764

  
764 765
    /**
......
773 774
     */
774 775
    @Override
775 776
    public List<TaxonBase> list(TaxonBase example, Set<String> includeProperties, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
776
        return defaultTaxonService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
777
        return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
777 778
    }
778 779

  
779 780
    /**
......
790 791
     */
791 792
    @Override
792 793
    public SynonymRelationship moveSynonymToAnotherTaxon(SynonymRelationship oldSynonymRelation, Taxon newTaxon, boolean moveHomotypicGroup, SynonymRelationshipType newSynonymRelationshipType, Reference newReference, String newReferenceDetail, boolean keepReference) throws HomotypicalGroupChangeException {
793
        return defaultTaxonService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxon, moveHomotypicGroup, newSynonymRelationshipType, newReference, newReferenceDetail, keepReference);
794
        return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxon, moveHomotypicGroup, newSynonymRelationshipType, newReference, newReferenceDetail, keepReference);
794 795
    }
795 796

  
796 797
    /**
......
802 803
     */
803 804
    @Override
804 805
    public int deduplicate(Class<? extends TaxonBase> clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) {
805
        return defaultTaxonService.deduplicate(clazz, matchStrategy, mergeStrategy);
806
        return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy);
806 807
    }
807 808

  
808 809
    /**
......
817 818
     */
818 819
    @Override
819 820
    public Pager<TaxonBase> findTitleCache(Class<? extends TaxonBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, MatchMode matchMode) {
820
        return defaultTaxonService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
821
        return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
821 822
    }
822 823

  
823 824
    /**
......
832 833
     */
833 834
    @Override
834 835
    public List<TaxonRelationship> listToTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
835
        return defaultTaxonService.listToTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
836
        return defaultService.listToTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
836 837
    }
837 838

  
838 839
    /**
......
847 848
     */
848 849
    @Override
849 850
    public Pager<TaxonRelationship> pageToTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
850
        return defaultTaxonService.pageToTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
851
        return defaultService.pageToTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
851 852
    }
852 853

  
853 854
    /**
......
862 863
     */
863 864
    @Override
864 865
    public List<TaxonRelationship> listFromTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
865
        return defaultTaxonService.listFromTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
866
        return defaultService.listFromTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
866 867
    }
867 868

  
868 869
    /**
......
877 878
     */
878 879
    @Override
879 880
    public Pager<TaxonRelationship> pageFromTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
880
        return defaultTaxonService.pageFromTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
881
        return defaultService.pageFromTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
881 882
    }
882 883

  
883 884
    /**
......
892 893
     */
893 894
    @Override
894 895
    public Set<Taxon> listRelatedTaxa(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships, Integer maxDepth, Integer limit, Integer start, List<String> propertyPaths) {
895
        return defaultTaxonService.listRelatedTaxa(taxon, includeRelationships, maxDepth, limit, start, propertyPaths);
896
        return defaultService.listRelatedTaxa(taxon, includeRelationships, maxDepth, limit, start, propertyPaths);
896 897
    }
897 898

  
898 899
    /**
......
905 906
     */
906 907
    @Override
907 908
    public List<Classification> listClassifications(TaxonBase taxonBase, Integer limit, Integer start, List<String> propertyPaths) {
908
        return defaultTaxonService.listClassifications(taxonBase, limit, start, propertyPaths);
909
        return defaultService.listClassifications(taxonBase, limit, start, propertyPaths);
909 910
    }
910 911

  
911 912
    /**
......
920 921
     */
921 922
    @Override
922 923
    public Pager<SynonymRelationship> getSynonyms(Synonym synonym, SynonymRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
923
        return defaultTaxonService.getSynonyms(synonym, type, pageSize, pageNumber, orderHints, propertyPaths);
924
        return defaultService.getSynonyms(synonym, type, pageSize, pageNumber, orderHints, propertyPaths);
924 925
    }
925 926

  
926 927
    /**
......
935 936
     */
936 937
    @Override
937 938
    public Pager<SynonymRelationship> getSynonyms(Taxon taxon, SynonymRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
938
        return defaultTaxonService.getSynonyms(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
939
        return defaultService.getSynonyms(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
939 940
    }
940 941

  
941 942
    /**
......
946 947
     */
947 948
    @Override
948 949
    public List<Synonym> getHomotypicSynonymsByHomotypicGroup(Taxon taxon, List<String> propertyPaths) {
949
        return defaultTaxonService.getHomotypicSynonymsByHomotypicGroup(taxon, propertyPaths);
950
        return defaultService.getHomotypicSynonymsByHomotypicGroup(taxon, propertyPaths);
950 951
    }
951 952

  
952 953
    /**
......
957 958
     */
958 959
    @Override
959 960
    public List<List<Synonym>> getHeterotypicSynonymyGroups(Taxon taxon, List<String> propertyPaths) {
960
        return defaultTaxonService.getHeterotypicSynonymyGroups(taxon, propertyPaths);
961
        return defaultService.getHeterotypicSynonymyGroups(taxon, propertyPaths);
961 962
    }
962 963

  
963 964
    /**
......
972 973
     */
973 974
    @Override
974 975
    public Pager<TaxonBase> search(Class<? extends TaxonBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
975
        return defaultTaxonService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
976
        return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
976 977
    }
977 978

  
978 979
    /**
......
989 990
     */
990 991
    @Override
991 992
    public Pager<TaxonBase> findTaxaByName(Class<? extends TaxonBase> clazz, String uninomial, String infragenericEpithet, String specificEpithet, String infraspecificEpithet, Rank rank, Integer pageSize, Integer pageNumber) {
992
        return defaultTaxonService.findTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber);
993
        return defaultService.findTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber);
993 994
    }
994 995

  
995 996
    /**
......
1006 1007
     */
1007 1008
    @Override
1008 1009
    public List<TaxonBase> listTaxaByName(Class<? extends TaxonBase> clazz, String uninomial, String infragenericEpithet, String specificEpithet, String infraspecificEpithet, Rank rank, Integer pageSize, Integer pageNumber) {
1009
        return defaultTaxonService.listTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber);
1010
        return defaultService.listTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber);
1010 1011
    }
1011 1012

  
1012 1013
    /**
......
1016 1017
     */
1017 1018
    @Override
1018 1019
    public Pager<IdentifiableEntity> findTaxaAndNames(IFindTaxaAndNamesConfigurator configurator) {
1019
        return defaultTaxonService.findTaxaAndNames(configurator);
1020
        return defaultService.findTaxaAndNames(configurator);
1020 1021
    }
1021 1022

  
1022 1023
    /**
......
1039 1040
    @Deprecated
1040 1041
    @Override
1041 1042
    public Pager<SearchResult<TaxonBase>> findByEverythingFullText(String queryString, Classification classification, List<Language> languages, boolean highlightFragments, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {
1042
        return defaultTaxonService.findByEverythingFullText(queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
1043
        return defaultService.findByEverythingFullText(queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
1043 1044
    }
1044 1045

  
1045 1046
    /**
......
1060 1061
     */
1061 1062
    @Override
1062 1063
    public Pager<SearchResult<TaxonBase>> findByFullText(Class<? extends TaxonBase> clazz, String queryString, Classification classification, List<Language> languages, boolean highlightFragments, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws CorruptIndexException, IOException, ParseException {
1063
        return defaultTaxonService.findByFullText(clazz, queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
1064
        return defaultService.findByFullText(clazz, queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
1064 1065
    }
1065 1066

  
1066 1067

  
......
1072 1073
            List<PresenceAbsenceTerm> statusFilter, Classification classification, Integer pageSize,
1073 1074
            Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws IOException,
1074 1075
            ParseException {
1075
        return defaultTaxonService.findByDistribution(areaFilter, statusFilter, classification, pageSize, pageNumber, orderHints, propertyPaths);
1076
        return defaultService.findByDistribution(areaFilter, statusFilter, classification, pageSize, pageNumber, orderHints, propertyPaths);
1076 1077
    }
1077 1078

  
1078 1079

  
......
1085 1086
            Set<PresenceAbsenceTerm> distributionStatus, List<Language> languages, boolean highlightFragments,
1086 1087
            Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths)
1087 1088
            throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {
1088
        return defaultTaxonService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
1089
        return defaultService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
1089 1090
    }
1090 1091

  
1091 1092
    /**
......
1107 1108
     */
1108 1109
    @Override
1109 1110
    public Pager<SearchResult<TaxonBase>> findByDescriptionElementFullText(Class<? extends DescriptionElementBase> clazz, String queryString, Classification classification, List<Feature> features, List<Language> languages, boolean highlightFragments, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws CorruptIndexException, IOException, ParseException {
1110
        return defaultTaxonService.findByDescriptionElementFullText(clazz, queryString, classification, features, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
1111
        return defaultService.findByDescriptionElementFullText(clazz, queryString, classification, features, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
1111 1112
    }
1112 1113

  
1113 1114
    /**
......
1123 1124
    @Deprecated
1124 1125
    @Override
1125 1126
    public List<MediaRepresentation> getAllMedia(Taxon taxon, int size, int height, int widthOrDuration, String[] mimeTypes) {
1126
        return defaultTaxonService.getAllMedia(taxon, size, height, widthOrDuration, mimeTypes);
1127
        return defaultService.getAllMedia(taxon, size, height, widthOrDuration, mimeTypes);
1127 1128
    }
1128 1129

  
1129 1130
    /**
......
1138 1139
    @Deprecated
1139 1140
    @Override
1140 1141
    public List<Media> listTaxonDescriptionMedia(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships, boolean limitToGalleries, List<String> propertyPath) {
1141
        return defaultTaxonService.listTaxonDescriptionMedia(taxon, includeRelationships, limitToGalleries, propertyPath);
1142
        return defaultService.listTaxonDescriptionMedia(taxon, includeRelationships, limitToGalleries, propertyPath);
1142 1143
    }
1143 1144

  
1144 1145
    /**
......
1154 1155
     */
1155 1156
    @Override
1156 1157
    public List<Media> listMedia(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships, Boolean limitToGalleries, Boolean includeTaxonDescriptions, Boolean includeOccurrences, Boolean includeTaxonNameDescriptions, List<String> propertyPath) {
1157
        return defaultTaxonService.listMedia(taxon, includeRelationships, limitToGalleries, includeTaxonDescriptions, includeOccurrences, includeTaxonNameDescriptions, propertyPath);
1158
        return defaultService.listMedia(taxon, includeRelationships, limitToGalleries, includeTaxonDescriptions, includeOccurrences, includeTaxonNameDescriptions, propertyPath);
1158 1159
    }
1159 1160

  
1160 1161
    /**
......
1164 1165
     */
1165 1166
    @Override
1166 1167
    public List<TaxonBase> findTaxaByID(Set<Integer> listOfIDs) {
1167
        return defaultTaxonService.findTaxaByID(listOfIDs);
1168
        return defaultService.findTaxaByID(listOfIDs);
1168 1169
    }
1169 1170

  
1170 1171
    /**
......
1175 1176
     */
1176 1177
    @Override
1177 1178
    public TaxonBase findTaxonByUuid(UUID uuid, List<String> propertyPaths) {
1178
        return defaultTaxonService.findTaxonByUuid(uuid, propertyPaths);
1179
        return defaultService.findTaxonByUuid(uuid, propertyPaths);
1179 1180
    }
1180 1181

  
1181 1182
    /**
......
1184 1185
     */
1185 1186
    @Override
1186 1187
    public int countAllRelationships() {
1187
        return defaultTaxonService.countAllRelationships();
1188
        return defaultService.countAllRelationships();
1188 1189
    }
1189 1190

  
1190 1191
    /**
......
1194 1195
     */
1195 1196
    @Override
1196 1197
    public List<TaxonNameBase> findIdenticalTaxonNames(List<String> propertyPath) {
1197
        return defaultTaxonService.findIdenticalTaxonNames(propertyPath);
1198
        return defaultService.findIdenticalTaxonNames(propertyPath);
1198 1199
    }
1199 1200

  
1200 1201
    /**
......
1204 1205
     */
1205 1206
    @Override
1206 1207
    public List<TaxonNameBase> findIdenticalTaxonNameIds(List<String> propertyPath) {
1207
        return defaultTaxonService.findIdenticalTaxonNameIds(propertyPath);
1208
        return defaultService.findIdenticalTaxonNameIds(propertyPath);
1208 1209
    }
1209 1210

  
1210 1211
    /**
......
1214 1215
     */
1215 1216
    @Override
1216 1217
    public String getPhylumName(TaxonNameBase name) {
1217
        return defaultTaxonService.getPhylumName(name);
1218
        return defaultService.getPhylumName(name);
1218 1219
    }
1219 1220

  
1220 1221
    /**
......
1224 1225
     */
1225 1226
    @Override
1226 1227
    public long deleteSynonymRelationships(Synonym syn) {
1227
        return defaultTaxonService.deleteSynonymRelationships(syn);
1228
        return defaultService.deleteSynonymRelationships(syn);
1228 1229
    }
1229 1230

  
1230 1231
    /**
......
1240 1241
     */
1241 1242
    @Override
1242 1243
    public List<SynonymRelationship> listSynonymRelationships(TaxonBase taxonBase, SynonymRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths, Direction direction) {
1243
        return defaultTaxonService.listSynonymRelationships(taxonBase, type, pageSize, pageNumber, orderHints, propertyPaths, direction);
1244
        return defaultService.listSynonymRelationships(taxonBase, type, pageSize, pageNumber, orderHints, propertyPaths, direction);
1244 1245
    }
1245 1246

  
1246 1247
    /**
......
1250 1251
     */
1251 1252
    @Override
1252 1253
    public Taxon findBestMatchingTaxon(String taxonName) {
1253
        return defaultTaxonService.findBestMatchingTaxon(taxonName);
1254
        return defaultService.findBestMatchingTaxon(taxonName);
1254 1255
    }
1255 1256

  
1256 1257
    /**
......
1260 1261
     */
1261 1262
    @Override
1262 1263
    public Taxon findBestMatchingTaxon(MatchingTaxonConfigurator config) {
1263
        return defaultTaxonService.findBestMatchingTaxon(config);
1264
        return defaultService.findBestMatchingTaxon(config);
1264 1265
    }
1265 1266

  
1266 1267
    /**
......
1270 1271
     */
1271 1272
    @Override
1272 1273
    public Synonym findBestMatchingSynonym(String taxonName) {
1273
        return defaultTaxonService.findBestMatchingSynonym(taxonName);
1274
        return defaultService.findBestMatchingSynonym(taxonName);
1274 1275
    }
1275 1276

  
1276 1277
    /**
......
1279 1280
     */
1280 1281
    @Override
1281 1282
    public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCacheTaxon() {
1282
        return defaultTaxonService.getUuidAndTitleCacheTaxon();
1283
        return defaultService.getUuidAndTitleCacheTaxon();
1283 1284
    }
1284 1285

  
1285 1286
    /**
......
1288 1289
     */
1289 1290
    @Override
1290 1291
    public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCacheSynonym() {
1291
        return defaultTaxonService.getUuidAndTitleCacheSynonym();
1292
        return defaultService.getUuidAndTitleCacheSynonym();
1292 1293
    }
1293 1294

  
1294 1295
    /**
......
1298 1299
     */
1299 1300
    @Override
1300 1301
    public List<UuidAndTitleCache<IdentifiableEntity>> findTaxaAndNamesForEditor(IFindTaxaAndNamesConfigurator configurator) {
1301
        return defaultTaxonService.findTaxaAndNamesForEditor(configurator);
1302
        return defaultService.findTaxaAndNamesForEditor(configurator);
1302 1303
    }
1303 1304

  
1304 1305
    /**
......
1311 1312
     */
1312 1313
    @Override
1313 1314
    public List<Synonym> createInferredSynonyms(Taxon taxon, Classification tree, SynonymRelationshipType type, boolean doWithMisappliedNames) {
1314
        return defaultTaxonService.createInferredSynonyms(taxon, tree, type, doWithMisappliedNames);
1315
        return defaultService.createInferredSynonyms(taxon, tree, type, doWithMisappliedNames);
1315 1316
    }
1316 1317

  
1317 1318
    /**
......
1323 1324
     */
1324 1325
    @Override
1325 1326
    public List<Synonym> createAllInferredSynonyms(Taxon taxon, Classification tree, boolean doWithMisappliedNames) {
1326
        return defaultTaxonService.createAllInferredSynonyms(taxon, tree, doWithMisappliedNames);
1327
        return defaultService.createAllInferredSynonyms(taxon, tree, doWithMisappliedNames);
1327 1328
    }
1328 1329

  
1329 1330
    @Override
1330 1331
    public DeleteResult deleteSynonym(Synonym arg0, SynonymDeletionConfigurator arg1) {
1331
        return defaultTaxonService.deleteSynonym(arg0, arg1);
1332
        return defaultService.deleteSynonym(arg0, arg1);
1332 1333
    }
1333 1334

  
1334 1335
    @Override
1335 1336
    public DeleteResult deleteSynonym(Synonym arg0, Taxon arg1, SynonymDeletionConfigurator arg2) {
1336
        return defaultTaxonService.deleteSynonym(arg0, arg1, arg2);
1337
        return defaultService.deleteSynonym(arg0, arg1, arg2);
1337 1338
    }
1338 1339

  
1339 1340
    @Override
1340 1341
    public DeleteResult deleteTaxon(Taxon arg0, TaxonDeletionConfigurator arg1, Classification arg2) {
1341
        return defaultTaxonService.deleteTaxon(arg0, arg1, arg2);
1342
        return defaultService.deleteTaxon(arg0, arg1, arg2);
1342 1343
    }
1343 1344

  
1344 1345
    @Override
1345 1346
    public List<List<Synonym>> getSynonymsByHomotypicGroup(Taxon taxon, List<String> propertyPaths) {
1346
        return defaultTaxonService.getSynonymsByHomotypicGroup(taxon, propertyPaths);
1347
        return defaultService.getSynonymsByHomotypicGroup(taxon, propertyPaths);
1347 1348
    }
1348 1349

  
1349 1350
	@Override
......
1352 1353
			SynonymRelationshipType synonymRelationshipType)
1353 1354
			throws DataChangeNoRollbackException {
1354 1355

  
1355
		return defaultTaxonService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
1356
		return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
1356 1357
	}
1357 1358

  
1358 1359
    /* (non-Javadoc)
......
1361 1362
    @Override
1362 1363
    public Pager<Taxon> pageAcceptedTaxaFor(UUID synonymUuid, UUID classificationUuid, Integer pageSize,
1363 1364
            Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
1364
        return defaultTaxonService.pageAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths);
1365
        return defaultService.pageAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths);
1365 1366
    }
1366 1367

  
1367 1368
    /* (non-Javadoc)
......
1370 1371
    @Override
1371 1372
    public List<Taxon> listAcceptedTaxaFor(UUID synonymUuid, UUID classificationUuid, Integer pageSize,
1372 1373
            Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
1373
        return defaultTaxonService.listAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths);
1374
        return defaultService.listAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths);
1374 1375
    }
1375 1376

  
1376 1377
	@Override
......
1389 1390

  
1390 1391
	@Override
1391 1392
	public TaxonBase findWithoutFlush(UUID uuid) {
1392
		return defaultTaxonService.findWithoutFlush(uuid);
1393
		return defaultService.findWithoutFlush(uuid);
1393 1394
	}
1394 1395

  
1395 1396
    /* (non-Javadoc)
......
1397 1398
     */
1398 1399
    @Override
1399 1400
    public List<TaxonBase> findTaxaByName(MatchingTaxonConfigurator config) {
1400
        return defaultTaxonService.findTaxaByName(config);
1401
        return defaultService.findTaxaByName(config);
1401 1402
    }
1402 1403

  
1403

  
1404
	
1405
	@Override
1406
	public <S extends TaxonBase> List<S> listByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
1407
		return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths);
1408
	}
1404 1409

  
1405 1410

  
1406 1411

  

Also available in: Unified diff