Project

General

Profile

« Previous | Next » 

Revision 62117

merge from eosc_services

View differences:

modules/dnet-data-transformation-service/trunk/pom.xml
9 9
	<groupId>eu.dnetlib</groupId>
10 10
	<artifactId>dnet-data-transformation-service</artifactId>
11 11
	<packaging>jar</packaging>
12
	<version>3.0.5-SNAPSHOT</version>
12
	<version>4.0.0-SNAPSHOT</version>
13 13
	<scm>
14 14
	  <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/dnet-data-transformation-service/trunk</developerConnection>
15 15
	</scm>
......
37 37
		<dependency>
38 38
			<groupId>eu.dnetlib</groupId>
39 39
			<artifactId>unibi-data-collective-transformation-common</artifactId>
40
			<version>[2.0.0,3.0.0)</version>
40
			<version>[3.0.0,4.0.0)</version>
41 41
		</dependency>
42 42
		<dependency>
43 43
			<groupId>eu.dnetlib</groupId>
modules/dnet-data-transformation-service/trunk/src/main/java/eu/dnetlib/data/transformation/service/DataTransformerFactory.java
2 2

  
3 3
import javax.annotation.Resource;
4 4

  
5
import org.springframework.beans.factory.annotation.Autowired;
6

  
5 7
import eu.dnetlib.common.profile.ResourceDao;
6 8
import eu.dnetlib.data.collective.transformation.VocabularyRegistry;
7 9
import eu.dnetlib.data.collective.transformation.utils.TransformationRulesImportTool;
10
import eu.dnetlib.enabling.datasources.common.Api;
11
import eu.dnetlib.enabling.datasources.common.Datasource;
12
import eu.dnetlib.enabling.datasources.common.LocalDatasourceManager;
8 13
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpDocumentNotFoundException;
9 14
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
10 15

  
......
24 29

  
25 30
	@Resource(name = "resourceDao")
26 31
	private ResourceDao resourceDao;
27
	
32

  
28 33
	@Resource(name = "blacklistApi")
29 34
	private org.springframework.core.io.Resource blacklistApi;
30 35

  
36
	@Autowired
37
	private LocalDatasourceManager<Datasource<?, ?, ?>, Api<?>> dsManager;
38

  
31 39
	public SimpleDataTransformer createTransformer(final String ruleid) throws ISLookUpDocumentNotFoundException, ISLookUpException {
32 40
		// String profile = lookupLocator.getService().getResourceProfile(ruleid);
33
		SimpleDataTransformer transformer = new SimpleDataTransformer(ruleid);
41
		final SimpleDataTransformer transformer = new SimpleDataTransformer(ruleid);
34 42
		try {
35
			transformer.setupEngine(vocabularyRegistry, transformationTemplate, defaultSchema, transformationRuleProfileUtil, resourceDao, blacklistApi);
36
		} catch (Exception e) {
43
			transformer
44
				.setupEngine(vocabularyRegistry, transformationTemplate, defaultSchema, transformationRuleProfileUtil, resourceDao, blacklistApi, dsManager);
45
		} catch (final Exception e) {
37 46
			throw new IllegalStateException(e);
38 47
		}
39 48
		return transformer;
modules/dnet-data-transformation-service/trunk/src/main/java/eu/dnetlib/data/transformation/service/SimpleDataTransformer.java
12 12
import eu.dnetlib.data.collective.transformation.engine.SimpleTransformationEngine;
13 13
import eu.dnetlib.data.collective.transformation.engine.core.TransformationImpl;
14 14
import eu.dnetlib.data.collective.transformation.utils.TransformationRulesImportTool;
15
import eu.dnetlib.enabling.datasources.common.Api;
16
import eu.dnetlib.enabling.datasources.common.Datasource;
17
import eu.dnetlib.enabling.datasources.common.LocalDatasourceManager;
15 18
import eu.dnetlib.miscutils.functional.UnaryFunction;
16 19

  
17 20
public class SimpleDataTransformer implements UnaryFunction<String, String> {
......
42 45
	}
43 46

  
44 47
	@Override
45
	public String evaluate(String record) {
48
	public String evaluate(final String record) {
46 49
		if (log.isDebugEnabled()) {
47 50
			log.debug("************************************************************");
48 51
			log.debug("INPUT: " + record);
......
60 63
		return output;
61 64
	}
62 65

  
63
	private String transform(String record) {
66
	private String transform(final String record) {
64 67
		// use here the xml transformer
65 68
		return transformationEngine.transform(record);
66 69
	}
67 70

  
68
	protected void setupEngine(VocabularyRegistry vocabularyRegistry, Resource transformationTemplate, 
69
			Resource defaultSchema, TransformationRulesImportTool rulesProfileUtil, ResourceDao resourceDao, Resource blacklistApi)throws TransformerConfigurationException, ProfileNotFoundException{
71
	protected void setupEngine(final VocabularyRegistry vocabularyRegistry,
72
		final Resource transformationTemplate,
73
		final Resource defaultSchema,
74
		final TransformationRulesImportTool rulesProfileUtil,
75
		final ResourceDao resourceDao,
76
		final Resource blacklistApi,
77
		final LocalDatasourceManager<Datasource<?, ?, ?>, Api<?>> dsManager) throws TransformerConfigurationException, ProfileNotFoundException {
70 78
		transformationEngine = new SimpleTransformationEngine();
71 79
		transformationEngine.setVocabularyRegistry(vocabularyRegistry);
72
		TransformationImpl transformation = new TransformationImpl();
80
		transformationEngine.setDsManager(dsManager);
81
		final TransformationImpl transformation = new TransformationImpl();
73 82
		transformation.setSchema(defaultSchema);
74 83
		transformation.setTemplate(transformationTemplate);
75 84
		transformation.init();
......
84 93
		transformationEngine.setResourceDao(resourceDao);
85 94
		transformationEngine.setBlacklistApi(blacklistApi);
86 95
	}
87
	
96

  
88 97
	public String getRuleProfile() {
89 98
		return ruleProfile;
90 99
	}
91 100

  
92
	public void setRuleProfile(String ruleProfile) {
101
	public void setRuleProfile(final String ruleProfile) {
93 102
		this.ruleProfile = ruleProfile;
94 103
	}
95 104

  

Also available in: Unified diff