Revision 3e1a98dd
Added by Andreas Müller about 1 year ago
| app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/EuroMedActivator.java | ||
|---|---|---|
| 34 | 34 |
import eu.etaxonomy.cdm.api.service.description.AggregationMode; |
| 35 | 35 |
import eu.etaxonomy.cdm.api.service.description.DistributionAggregation; |
| 36 | 36 |
import eu.etaxonomy.cdm.api.service.description.DistributionAggregationConfiguration; |
| 37 |
import eu.etaxonomy.cdm.api.service.geo.IDistributionService; |
|
| 37 | 38 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
| 38 | 39 |
import eu.etaxonomy.cdm.app.common.CdmDestinations; |
| 39 | 40 |
import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor; |
| 40 | 41 |
import eu.etaxonomy.cdm.database.DbSchemaValidation; |
| 41 | 42 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
| 42 |
import eu.etaxonomy.cdm.ext.geo.IEditGeoService; |
|
| 43 | 43 |
import eu.etaxonomy.cdm.filter.TaxonNodeFilter; |
| 44 | 44 |
import eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer; |
| 45 | 45 |
import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator; |
| ... | ... | |
| 544 | 544 |
Set<UUID> areaUuidSet = null; |
| 545 | 545 |
|
| 546 | 546 |
ICdmApplication app = bmImport.getCdmAppController(); |
| 547 |
IEditGeoService geoService = (IEditGeoService)app.getBean("editGeoService");
|
|
| 547 |
IDistributionService geoService = (IDistributionService)app.getBean("distributionService");
|
|
| 548 | 548 |
|
| 549 | 549 |
Map<NamedArea, String> resultMap; |
| 550 | 550 |
try {
|
| app-import/src/main/java/eu/etaxonomy/cdm/app/salvador/TestSalvadorAreaMapping.java | ||
|---|---|---|
| 18 | 18 |
import org.springframework.aop.framework.Advised; |
| 19 | 19 |
import org.springframework.aop.support.AopUtils; |
| 20 | 20 |
|
| 21 |
import eu.etaxonomy.cdm.api.service.dto.DistributionInfoDTO.InfoPart; |
|
| 21 |
import eu.etaxonomy.cdm.api.dto.portal.DistributionInfoDto.InfoPart; |
|
| 22 |
import eu.etaxonomy.cdm.api.dto.portal.config.DistributionInfoConfiguration; |
|
| 23 |
import eu.etaxonomy.cdm.api.service.geo.DistributionService; |
|
| 22 | 24 |
import eu.etaxonomy.cdm.app.common.CdmDestinations; |
| 23 | 25 |
import eu.etaxonomy.cdm.database.DbSchemaValidation; |
| 24 | 26 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
| 25 |
import eu.etaxonomy.cdm.ext.geo.EditGeoService; |
|
| 26 | 27 |
import eu.etaxonomy.cdm.io.api.application.CdmIoApplicationController; |
| 27 | 28 |
|
| 28 | 29 |
/** |
| ... | ... | |
| 54 | 55 |
private void doTest2(CdmIoApplicationController app) {
|
| 55 | 56 |
UUID taxonUuid = UUID.fromString("eae896f0-3194-4b7b-a502-ad1d54ec36e6");
|
| 56 | 57 |
// Taxon taxon = (Taxon)app.getTaxonService().find(taxonUuid); |
| 57 |
Object geoServiceObj = app.getBean("editGeoService");
|
|
| 58 |
EditGeoService geoService;
|
|
| 58 |
Object distributionServiceObj = app.getBean("distributionService");
|
|
| 59 |
DistributionService distributionService;
|
|
| 59 | 60 |
try {
|
| 60 |
geoService = getTargetObject(geoServiceObj);
|
|
| 61 |
distributionService = getTargetObject(distributionServiceObj);
|
|
| 61 | 62 |
|
| 62 | 63 |
|
| 63 | 64 |
Set<InfoPart> partSet = new HashSet<>(); |
| 64 | 65 |
partSet.add(InfoPart.mapUriParams); |
| 65 | 66 |
|
| 66 | 67 |
EnumSet<InfoPart> parts = EnumSet.copyOf(partSet); |
| 67 |
geoService.composeDistributionInfoFor(parts, taxonUuid, false, false, null, true, |
|
| 68 |
null, null, |
|
| 69 |
null, null, null, null, false); |
|
| 68 |
DistributionInfoConfiguration distConfig = new DistributionInfoConfiguration(); |
|
| 69 |
distConfig.setInfoParts(parts); |
|
| 70 |
distributionService.composeDistributionInfoFor(distConfig, taxonUuid, false, null, |
|
| 71 |
null, null); |
|
| 70 | 72 |
} catch (Exception e) {
|
| 71 | 73 |
e.printStackTrace(); |
| 72 | 74 |
} |
| 73 | 75 |
} |
| 74 | 76 |
|
| 77 |
@SuppressWarnings("unchecked")
|
|
| 75 | 78 |
protected <T> T getTargetObject(Object proxy) throws Exception {
|
| 76 | 79 |
while( (AopUtils.isJdkDynamicProxy(proxy))) {
|
| 77 | 80 |
return (T) getTargetObject(((Advised)proxy).getTargetSource().getTarget()); |
| ... | ... | |
| 79 | 82 |
return (T) proxy; // expected to be cglib proxy then, which is simply a specialized class |
| 80 | 83 |
} |
| 81 | 84 |
|
| 82 |
|
|
| 83 |
/** |
|
| 84 |
* @param args |
|
| 85 |
*/ |
|
| 86 | 85 |
public static void main(String[] args) {
|
| 87 | 86 |
TestSalvadorAreaMapping me = new TestSalvadorAreaMapping(); |
| 88 | 87 |
me.doTest(cdmDestination); |
| 89 | 88 |
|
| 90 | 89 |
System.exit(0); |
| 91 | 90 |
} |
| 92 |
} |
|
| 91 |
} |
|
| app-import/src/main/java/eu/etaxonomy/cdm/app/viennaImport/ViennaActivator.java | ||
|---|---|---|
| 17 | 17 |
import org.apache.logging.log4j.Logger; |
| 18 | 18 |
|
| 19 | 19 |
import eu.etaxonomy.cdm.api.application.CdmApplicationController; |
| 20 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
|
| 21 | 20 |
import eu.etaxonomy.cdm.app.common.CdmDestinations; |
| 22 | 21 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 23 | 22 |
import eu.etaxonomy.cdm.common.URI; |
| 24 | 23 |
import eu.etaxonomy.cdm.config.AccountStore; |
| 24 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacade; |
|
| 25 | 25 |
import eu.etaxonomy.cdm.io.common.Source; |
| 26 | 26 |
import eu.etaxonomy.cdm.model.agent.Person; |
| 27 | 27 |
import eu.etaxonomy.cdm.model.common.Annotation; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraEcoFactImport.java | ||
|---|---|---|
| 22 | 22 |
import org.apache.logging.log4j.Logger; |
| 23 | 23 |
import org.springframework.stereotype.Component; |
| 24 | 24 |
|
| 25 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
|
|
| 25 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacade; |
|
| 26 | 26 |
import eu.etaxonomy.cdm.io.algaterra.validation.AlgaTerraSpecimenImportValidator; |
| 27 | 27 |
import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator; |
| 28 | 28 |
import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportState; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraFactEcologyImport.java | ||
|---|---|---|
| 22 | 22 |
import org.apache.logging.log4j.Logger; |
| 23 | 23 |
import org.springframework.stereotype.Component; |
| 24 | 24 |
|
| 25 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
|
| 26 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; |
|
| 27 | 25 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 26 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacade; |
|
| 27 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacadeNotSupportedException; |
|
| 28 | 28 |
import eu.etaxonomy.cdm.io.algaterra.validation.AlgaTerraSpecimenImportValidator; |
| 29 | 29 |
import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator; |
| 30 | 30 |
import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportState; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraPictureImport.java | ||
|---|---|---|
| 19 | 19 |
import org.apache.logging.log4j.Logger; |
| 20 | 20 |
import org.springframework.stereotype.Component; |
| 21 | 21 |
|
| 22 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
|
|
| 23 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
|
|
| 22 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacade; |
|
| 23 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacadeNotSupportedException; |
|
| 24 | 24 |
import eu.etaxonomy.cdm.io.algaterra.validation.AlgaTerraTypeImportValidator; |
| 25 | 25 |
import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator; |
| 26 | 26 |
import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportState; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraSpecimenImportBase.java | ||
|---|---|---|
| 22 | 22 |
import org.apache.logging.log4j.Logger; |
| 23 | 23 |
import org.springframework.transaction.TransactionStatus; |
| 24 | 24 |
|
| 25 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
|
| 26 | 25 |
import eu.etaxonomy.cdm.common.URI; |
| 26 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacade; |
|
| 27 | 27 |
import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase; |
| 28 | 28 |
import eu.etaxonomy.cdm.io.common.ResultSetPartitioner; |
| 29 | 29 |
import eu.etaxonomy.cdm.io.common.Source; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraTypeImport.java | ||
|---|---|---|
| 23 | 23 |
import org.joda.time.DateTime; |
| 24 | 24 |
import org.springframework.stereotype.Component; |
| 25 | 25 |
|
| 26 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
|
|
| 27 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
|
|
| 26 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacade; |
|
| 27 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacadeNotSupportedException; |
|
| 28 | 28 |
import eu.etaxonomy.cdm.io.algaterra.validation.AlgaTerraTypeImportValidator; |
| 29 | 29 |
import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase; |
| 30 | 30 |
import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/bogota/BogotaSpecimenImport.java | ||
|---|---|---|
| 19 | 19 |
import org.joda.time.Partial; |
| 20 | 20 |
import org.springframework.stereotype.Component; |
| 21 | 21 |
|
| 22 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
|
| 23 | 22 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 23 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacade; |
|
| 24 | 24 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
| 25 | 25 |
import eu.etaxonomy.cdm.model.agent.Institution; |
| 26 | 26 |
import eu.etaxonomy.cdm.model.agent.Person; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/cuba/CubaVocabularyImport.java | ||
|---|---|---|
| 15 | 15 |
import org.springframework.stereotype.Component; |
| 16 | 16 |
import org.springframework.transaction.TransactionStatus; |
| 17 | 17 |
|
| 18 |
import eu.etaxonomy.cdm.api.service.geo.GeoServiceArea; |
|
| 19 |
import eu.etaxonomy.cdm.api.service.geo.GeoServiceAreaAnnotatedMapping; |
|
| 18 | 20 |
import eu.etaxonomy.cdm.common.DOI; |
| 19 | 21 |
import eu.etaxonomy.cdm.common.URI; |
| 20 |
import eu.etaxonomy.cdm.ext.geo.GeoServiceArea; |
|
| 21 |
import eu.etaxonomy.cdm.ext.geo.GeoServiceAreaAnnotatedMapping; |
|
| 22 | 22 |
import eu.etaxonomy.cdm.io.common.CdmImportBase; |
| 23 | 23 |
import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer; |
| 24 | 24 |
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException; |
| ... | ... | |
| 482 | 482 |
return true; |
| 483 | 483 |
} |
| 484 | 484 |
|
| 485 |
|
|
| 486 |
/** |
|
| 487 |
* @param cuba |
|
| 488 |
* @param mapping_layer |
|
| 489 |
* @param mapping_field |
|
| 490 |
* @param abbrev |
|
| 491 |
*/ |
|
| 492 | 485 |
private void addMapping(NamedArea area, String mapping_layer, String mapping_field, String abbrev) {
|
| 493 | 486 |
GeoServiceAreaAnnotatedMapping mapping = (GeoServiceAreaAnnotatedMapping)this.getBean("geoServiceAreaAnnotatedMapping");
|
| 494 | 487 |
GeoServiceArea geoServiceArea = new GeoServiceArea(); |
| app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImageImport.java | ||
|---|---|---|
| 26 | 26 |
import org.apache.logging.log4j.Logger; |
| 27 | 27 |
import org.springframework.stereotype.Component; |
| 28 | 28 |
|
| 29 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
|
| 30 | 29 |
import eu.etaxonomy.cdm.common.URI; |
| 31 | 30 |
import eu.etaxonomy.cdm.common.UriUtils; |
| 31 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacade; |
|
| 32 | 32 |
import eu.etaxonomy.cdm.io.common.IOValidator; |
| 33 | 33 |
import eu.etaxonomy.cdm.io.common.ResultSetPartitioner; |
| 34 | 34 |
import eu.etaxonomy.cdm.io.globis.validation.GlobisImageImportValidator; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisSpecTaxImport.java | ||
|---|---|---|
| 23 | 23 |
import org.apache.logging.log4j.Logger; |
| 24 | 24 |
import org.springframework.stereotype.Component; |
| 25 | 25 |
|
| 26 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
|
| 27 | 26 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 27 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacade; |
|
| 28 | 28 |
import eu.etaxonomy.cdm.io.common.IOValidator; |
| 29 | 29 |
import eu.etaxonomy.cdm.io.common.ResultSetPartitioner; |
| 30 | 30 |
import eu.etaxonomy.cdm.io.common.mapping.IMappingImport; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaTermImport.java | ||
|---|---|---|
| 17 | 17 |
import org.springframework.transaction.TransactionStatus; |
| 18 | 18 |
|
| 19 | 19 |
import eu.etaxonomy.cdm.api.service.ITermService; |
| 20 |
import eu.etaxonomy.cdm.api.service.geo.GeoServiceArea; |
|
| 21 |
import eu.etaxonomy.cdm.api.service.geo.GeoServiceAreaAnnotatedMapping; |
|
| 20 | 22 |
import eu.etaxonomy.cdm.common.URI; |
| 21 |
import eu.etaxonomy.cdm.ext.geo.GeoServiceArea; |
|
| 22 |
import eu.etaxonomy.cdm.ext.geo.GeoServiceAreaAnnotatedMapping; |
|
| 23 | 23 |
import eu.etaxonomy.cdm.io.common.CdmImportBase; |
| 24 | 24 |
import eu.etaxonomy.cdm.io.mexico.SimpleExcelTaxonImportState; |
| 25 | 25 |
import eu.etaxonomy.cdm.model.description.Feature; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/greece/GreeceWillingImport.java | ||
|---|---|---|
| 18 | 18 |
import org.apache.logging.log4j.Logger; |
| 19 | 19 |
import org.springframework.stereotype.Component; |
| 20 | 20 |
|
| 21 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
|
| 22 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; |
|
| 23 | 21 |
import eu.etaxonomy.cdm.api.service.config.MatchingTaxonConfigurator; |
| 24 | 22 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 25 | 23 |
import eu.etaxonomy.cdm.common.URI; |
| 24 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacade; |
|
| 25 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacadeNotSupportedException; |
|
| 26 | 26 |
import eu.etaxonomy.cdm.io.mexico.SimpleExcelTaxonImport; |
| 27 | 27 |
import eu.etaxonomy.cdm.io.mexico.SimpleExcelTaxonImportState; |
| 28 | 28 |
import eu.etaxonomy.cdm.model.agent.Person; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioDistributionImport.java | ||
|---|---|---|
| 17 | 17 |
import org.apache.logging.log4j.Logger; |
| 18 | 18 |
import org.springframework.stereotype.Component; |
| 19 | 19 |
|
| 20 |
import eu.etaxonomy.cdm.api.service.geo.GeoServiceArea; |
|
| 21 |
import eu.etaxonomy.cdm.api.service.geo.GeoServiceAreaAnnotatedMapping; |
|
| 20 | 22 |
import eu.etaxonomy.cdm.common.URI; |
| 21 |
import eu.etaxonomy.cdm.ext.geo.GeoServiceArea; |
|
| 22 |
import eu.etaxonomy.cdm.ext.geo.GeoServiceAreaAnnotatedMapping; |
|
| 23 | 23 |
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException; |
| 24 | 24 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 25 | 25 |
import eu.etaxonomy.cdm.model.common.Language; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRegionImport.java | ||
|---|---|---|
| 17 | 17 |
import org.apache.logging.log4j.Logger; |
| 18 | 18 |
import org.springframework.stereotype.Component; |
| 19 | 19 |
|
| 20 |
import eu.etaxonomy.cdm.api.service.geo.GeoServiceArea; |
|
| 21 |
import eu.etaxonomy.cdm.api.service.geo.GeoServiceAreaAnnotatedMapping; |
|
| 20 | 22 |
import eu.etaxonomy.cdm.common.URI; |
| 21 |
import eu.etaxonomy.cdm.ext.geo.GeoServiceArea; |
|
| 22 |
import eu.etaxonomy.cdm.ext.geo.GeoServiceAreaAnnotatedMapping; |
|
| 23 | 23 |
import eu.etaxonomy.cdm.io.common.ResultSetPartitioner; |
| 24 | 24 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 25 | 25 |
import eu.etaxonomy.cdm.model.common.Language; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/phycobank/IAPTExcelImport.java | ||
|---|---|---|
| 35 | 35 |
import com.fasterxml.jackson.core.JsonProcessingException; |
| 36 | 36 |
import com.fasterxml.jackson.databind.ObjectMapper; |
| 37 | 37 |
|
| 38 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
|
| 39 | 38 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 40 | 39 |
import eu.etaxonomy.cdm.common.LogUtils; |
| 40 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacade; |
|
| 41 | 41 |
import eu.etaxonomy.cdm.io.mexico.SimpleExcelTaxonImport; |
| 42 | 42 |
import eu.etaxonomy.cdm.io.mexico.SimpleExcelTaxonImportState; |
| 43 | 43 |
import eu.etaxonomy.cdm.model.agent.Institution; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/salvador/SalvadorSpecimenImport.java | ||
|---|---|---|
| 23 | 23 |
import org.joda.time.format.DateTimeFormatter; |
| 24 | 24 |
import org.springframework.stereotype.Component; |
| 25 | 25 |
|
| 26 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
|
| 27 | 26 |
import eu.etaxonomy.cdm.common.URI; |
| 27 |
import eu.etaxonomy.cdm.facade.DerivedUnitFacade; |
|
| 28 | 28 |
import eu.etaxonomy.cdm.io.csv.in.CsvImportBase; |
| 29 | 29 |
import eu.etaxonomy.cdm.model.agent.Person; |
| 30 | 30 |
import eu.etaxonomy.cdm.model.agent.Team; |
Also available in: Unified diff
ref #10222 adapt cdmlib-import to new facade and distribution service locations