Project

General

Profile

« Previous | Next » 

Revision 45196

codebase used to migrate to java8 the production system

View differences:

modules/dnet-modular-collector-service-rmi/trunk/deploy.info
1
{"type_source": "SVN", "goal": "package -U -T 4C source:jar", "url": "http://svn-public.driver.research-infrastructures.eu/driver/dnet40/modules/dnet-modular-collector-service-rmi/trunk/", "deploy_repository": "dnet4-snapshots", "version": "4", "mail": "sandro.labruzzo@isti.cnr.it,michele.artini@isti.cnr.it, claudio.atzori@isti.cnr.it, alessia.bardi@isti.cnr.it", "deploy_repository_url": "http://maven.research-infrastructures.eu/nexus/content/repositories/dnet4-snapshots", "name": "dnet-modular-collector-service-rmi"}
modules/dnet-modular-collector-service-rmi/trunk/src/main/java/eu/dnetlib/data/collector/rmi/InterfaceDescriptor.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import java.util.HashMap;
4

  
5
import javax.xml.bind.annotation.XmlRootElement;
6

  
7
import org.dom4j.Node;
8
import org.springframework.beans.factory.annotation.Required;
9

  
10
import com.google.common.collect.Maps;
11

  
12
@XmlRootElement
13
public class InterfaceDescriptor {
14

  
15
	private String id;
16

  
17
	private String baseUrl;
18

  
19
	private String protocol;
20

  
21
	private HashMap<String, String> params = Maps.newHashMap();
22

  
23
	public String getBaseUrl() {
24
		return baseUrl;
25
	}
26

  
27
	public void setBaseUrl(final String baseUrl) {
28
		this.baseUrl = baseUrl;
29
	}
30

  
31
	public String getId() {
32
		return id;
33
	}
34

  
35
	@Required
36
	public void setId(final String id) {
37
		this.id = id;
38
	}
39

  
40
	public HashMap<String, String> getParams() {
41
		return params;
42
	}
43

  
44
	public void setParams(final HashMap<String, String> params) {
45
		this.params = params;
46
	}
47

  
48
	public String getProtocol() {
49
		return protocol;
50
	}
51

  
52
	public void setProtocol(final String protocol) {
53
		this.protocol = protocol;
54
	}
55

  
56
	public static InterfaceDescriptor newInstance(final Node node) {
57
		final InterfaceDescriptor ifc = new InterfaceDescriptor();
58
		ifc.setId(node.valueOf("./@id"));
59
		ifc.setBaseUrl(node.valueOf("./BASE_URL"));
60
		ifc.setProtocol(node.valueOf("./ACCESS_PROTOCOL"));
61

  
62
		for (Object o : node.selectNodes("./ACCESS_PROTOCOL/@*")) {
63
			final Node n = (Node) o;
64
			ifc.getParams().put(n.getName(), n.getText());
65
		}
66

  
67
		return ifc;
68
	}
69

  
70
}
modules/dnet-modular-collector-service-rmi/trunk/src/main/java/eu/dnetlib/data/collector/rmi/ProtocolParameterValue.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import javax.xml.bind.annotation.XmlRootElement;
4

  
5
@XmlRootElement
6
public class ProtocolParameterValue {
7

  
8
	private String id;
9
	private String name;
10

  
11
	public ProtocolParameterValue() {}
12

  
13
	public ProtocolParameterValue(final String id, final String name) {
14
		this.id = id;
15
		this.name = name;
16
	}
17

  
18
	public String getId() {
19
		return id;
20
	}
21

  
22
	public void setId(final String id) {
23
		this.id = id;
24
	}
25

  
26
	public String getName() {
27
		return name;
28
	}
29

  
30
	public void setName(final String name) {
31
		this.name = name;
32
	}
33

  
34
}
modules/dnet-modular-collector-service-rmi/trunk/src/main/java/eu/dnetlib/data/collector/rmi/ProtocolDescriptor.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import java.util.ArrayList;
4
import java.util.List;
5

  
6
import javax.xml.bind.annotation.XmlRootElement;
7

  
8
import org.springframework.beans.factory.annotation.Required;
9

  
10
@XmlRootElement
11
public class ProtocolDescriptor {
12

  
13
	private String name;
14
	private List<ProtocolParameter> params = new ArrayList<ProtocolParameter>();
15

  
16
	public ProtocolDescriptor() {}
17

  
18
	public ProtocolDescriptor(final String name, final List<ProtocolParameter> params) {
19
		this.name = name;
20
		this.params = params;
21
	}
22

  
23
	public String getName() {
24
		return name;
25
	}
26

  
27
	@Required
28
	public void setName(final String name) {
29
		this.name = name;
30
	}
31

  
32
	public List<ProtocolParameter> getParams() {
33
		return params;
34
	}
35

  
36
	public void setParams(final List<ProtocolParameter> params) {
37
		this.params = params;
38
	}
39
}
modules/dnet-modular-collector-service-rmi/trunk/src/main/java/eu/dnetlib/data/collector/rmi/ProtocolParameter.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import javax.xml.bind.annotation.XmlRootElement;
4
import javax.xml.bind.annotation.XmlTransient;
5

  
6
import org.springframework.beans.factory.annotation.Required;
7

  
8
import eu.dnetlib.data.collector.functions.ParamValuesFunction;
9

  
10
@XmlRootElement
11
public class ProtocolParameter {
12

  
13
	private String name;
14
	private boolean optional = false;
15
	private ProtocolParameterType type = ProtocolParameterType.TEXT;
16
	private String regex = null;
17
	private transient ParamValuesFunction populateFunction = null;
18
	private boolean functionPopulated = false;
19

  
20
	public ProtocolParameter() {}
21

  
22
	public ProtocolParameter(final String name, final boolean optional, final ProtocolParameterType type, final String regex) {
23
		this(name, optional, type, regex, null);
24
	}
25

  
26
	public ProtocolParameter(final String name, final boolean optional, final ProtocolParameterType type, final String regex,
27
			final ParamValuesFunction populateFunction) {
28
		this.name = name;
29
		this.optional = optional;
30
		this.type = type;
31
		this.regex = regex;
32
		this.populateFunction = populateFunction;
33
		this.functionPopulated = this.populateFunction != null;
34
	}
35

  
36
	public String getName() {
37
		return name;
38
	}
39

  
40
	@Required
41
	public void setName(final String name) {
42
		this.name = name;
43
	}
44

  
45
	public boolean isOptional() {
46
		return optional;
47
	}
48

  
49
	public void setOptional(final boolean optional) {
50
		this.optional = optional;
51
	}
52

  
53
	public ProtocolParameterType getType() {
54
		return type;
55
	}
56

  
57
	public void setType(final ProtocolParameterType type) {
58
		this.type = type;
59
	}
60

  
61
	public String getRegex() {
62
		return regex;
63
	}
64

  
65
	public void setRegex(final String regex) {
66
		this.regex = regex;
67
	}
68

  
69
	@XmlTransient
70
	public ParamValuesFunction getPopulateFunction() {
71
		return populateFunction;
72
	}
73

  
74
	public void setPopulateFunction(final ParamValuesFunction populateFunction) {
75
		this.populateFunction = populateFunction;
76
		this.functionPopulated = this.populateFunction != null;
77
	}
78

  
79
	public boolean isFunctionPopulated() {
80
		return functionPopulated;
81
	}
82

  
83
	public void setFunctionPopulated(final boolean functionPopulated) {
84
		this.functionPopulated = functionPopulated;
85
	}
86

  
87
}
modules/dnet-modular-collector-service-rmi/trunk/src/main/java/eu/dnetlib/data/collector/rmi/ProtocolParameterType.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import javax.xml.bind.annotation.XmlEnum;
4

  
5
@XmlEnum
6
public enum ProtocolParameterType {
7
	TEXT, NUMBER, LIST, BOOLEAN
8
}
modules/dnet-modular-collector-service-rmi/trunk/src/main/java/eu/dnetlib/data/collector/rmi/CollectorServiceException.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import eu.dnetlib.common.rmi.RMIException;
4

  
5
public class CollectorServiceException extends RMIException {
6

  
7
	/**
8
	 * 
9
	 */
10
	private static final long serialVersionUID = 7523999812098059764L;
11

  
12
	public CollectorServiceException(String string) {
13
		super(string);
14
	}
15
	
16
	
17
	public CollectorServiceException(String string, Throwable exception) {
18
		super(string, exception);
19
	}
20

  
21
	public CollectorServiceException(Throwable exception) {
22
		super(exception);
23
	}
24

  
25
}
modules/dnet-modular-collector-service-rmi/trunk/src/main/java/eu/dnetlib/data/collector/rmi/CollectorService.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import java.util.List;
4
import java.util.Map;
5

  
6
import javax.jws.WebParam;
7
import javax.jws.WebService;
8
import javax.xml.ws.wsaddressing.W3CEndpointReference;
9

  
10
import eu.dnetlib.common.rmi.BaseService;
11

  
12
@WebService(targetNamespace = "http://services.dnetlib.eu/")
13
public interface CollectorService extends BaseService {
14

  
15
	W3CEndpointReference collect(@WebParam(name = "interface") final InterfaceDescriptor interfaceDescriptor) throws CollectorServiceException;
16

  
17
	W3CEndpointReference dateRangeCollect(
18
			@WebParam(name = "interface") final InterfaceDescriptor interfaceDescriptor,
19
			@WebParam(name = "from") final String from,
20
			@WebParam(name = "until") final String until) throws CollectorServiceException;
21

  
22
	List<ProtocolDescriptor> listProtocols();
23

  
24
	List<ProtocolParameterValue> listValidValuesForParam(
25
			@WebParam(name = "protocol") String protocol,
26
			@WebParam(name = "baseUrl") String baseUrl,
27
			@WebParam(name = "param") String param,
28
			@WebParam(name = "otherParams") Map<String, String> otherParams) throws CollectorServiceException;
29

  
30
}
modules/dnet-modular-collector-service-rmi/trunk/src/main/java/eu/dnetlib/data/collector/rmi/CollectorServiceRuntimeException.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
public class CollectorServiceRuntimeException extends RuntimeException {
4

  
5
	/**
6
	 *
7
	 */
8
	private static final long serialVersionUID = 6317717870955037359L;
9

  
10
	public CollectorServiceRuntimeException(final String string) {
11
		super(string);
12
	}
13

  
14
	public CollectorServiceRuntimeException(final String string, final Throwable exception) {
15
		super(string, exception);
16
	}
17

  
18
	public CollectorServiceRuntimeException(final Throwable exception) {
19
		super(exception);
20
	}
21

  
22
}
modules/dnet-modular-collector-service-rmi/trunk/src/main/java/eu/dnetlib/data/collector/functions/ParamValuesFunction.java
1
package eu.dnetlib.data.collector.functions;
2

  
3
import java.util.List;
4
import java.util.Map;
5

  
6
import eu.dnetlib.data.collector.rmi.ProtocolParameterValue;
7

  
8
public interface ParamValuesFunction {
9

  
10
	List<ProtocolParameterValue> findValues(String baseUrl, Map<String, String> params);
11

  
12
}
modules/dnet-modular-collector-service-rmi/trunk/src/main/java/eu/dnetlib/data/collector/plugin/CollectorPlugin.java
1
package eu.dnetlib.data.collector.plugin;
2

  
3
import java.util.List;
4

  
5
import eu.dnetlib.data.collector.rmi.CollectorServiceException;
6
import eu.dnetlib.data.collector.rmi.InterfaceDescriptor;
7
import eu.dnetlib.data.collector.rmi.ProtocolDescriptor;
8

  
9
public interface CollectorPlugin {
10

  
11
	Iterable<String> collect(InterfaceDescriptor interfaceDescriptor, String fromDate, String untilDate) throws CollectorServiceException;
12

  
13
	ProtocolDescriptor getProtocolDescriptor();
14

  
15
	String getProtocol();
16

  
17
	List<String> listNameParameters();
18
}
modules/dnet-modular-collector-service-rmi/trunk/src/main/java/eu/dnetlib/data/collector/plugin/AbstractCollectorPlugin.java
1
package eu.dnetlib.data.collector.plugin;
2

  
3
import java.util.List;
4

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

  
7
import com.google.common.base.Function;
8
import com.google.common.collect.Lists;
9

  
10
import eu.dnetlib.data.collector.plugin.CollectorPlugin;
11
import eu.dnetlib.data.collector.rmi.ProtocolDescriptor;
12
import eu.dnetlib.data.collector.rmi.ProtocolParameter;
13

  
14
public abstract class AbstractCollectorPlugin implements CollectorPlugin {
15

  
16
	private ProtocolDescriptor protocolDescriptor;
17

  
18
	@Override
19
	public final String getProtocol() {
20
		return getProtocolDescriptor().getName();
21
	}
22

  
23
	@Override
24
	public final List<String> listNameParameters() {
25
		return Lists.newArrayList(Lists.transform(getProtocolDescriptor().getParams(), new Function<ProtocolParameter, String>() {
26

  
27
			@Override
28
			public String apply(final ProtocolParameter p) {
29
				return p.getName();
30
			}
31
		}));
32
	}
33

  
34
	@Override
35
	public final ProtocolDescriptor getProtocolDescriptor() {
36
		return protocolDescriptor;
37
	}
38

  
39
	@Required
40
	public void setProtocolDescriptor(final ProtocolDescriptor protocolDescriptor) {
41
		this.protocolDescriptor = protocolDescriptor;
42
	}
43
}
modules/dnet-modular-collector-service-rmi/trunk/src/main/java/eu/dnetlib/data/collector/plugin/CollectorPluginErrorLogList.java
1
package eu.dnetlib.data.collector.plugin;
2

  
3
import java.util.LinkedList;
4

  
5
public class CollectorPluginErrorLogList extends LinkedList<String> {
6

  
7
	private static final long serialVersionUID = -6925786561303289704L;
8

  
9
	@Override
10
	public String toString() {
11
		String log = new String();
12
		int index = 0;
13
		for (String errorMessage : this) {
14
			log += String.format("Retry #%s: %s / ", index++, errorMessage);
15
		}
16
		return log;
17
	}
18

  
19
}
modules/dnet-modular-collector-service-rmi/trunk/pom.xml
1
<?xml version="1.0" encoding="UTF-8"?>
2
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
	<parent>
4
		<groupId>eu.dnetlib</groupId>
5
		<artifactId>dnet-parent</artifactId>
6
		<version>1.0.0</version>
7
		<relativePath />
8
	</parent>
9
	<modelVersion>4.0.0</modelVersion>
10
	<groupId>eu.dnetlib</groupId>
11
	<artifactId>dnet-modular-collector-service-rmi</artifactId>
12
	<packaging>jar</packaging>
13
	<version>1.4.1-SNAPSHOT</version>
14
	<scm>
15
		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/dnet-modular-collector-service-rmi/trunk</developerConnection>
16
	</scm>
17

  
18
	<dependencies>
19
		<dependency>
20
			<groupId>eu.dnetlib</groupId>
21
			<artifactId>cnr-rmi-api</artifactId>
22
			<version>[2.0.0,3.0.0)</version>
23
		</dependency>
24
		<dependency>
25
			<groupId>com.google.guava</groupId>
26
			<artifactId>guava</artifactId>
27
			<version>${google.guava.version}</version>
28
		</dependency>
29
		<dependency>
30
			<groupId>dom4j</groupId>
31
			<artifactId>dom4j</artifactId>
32
			<version>${dom4j.version}</version>
33
		</dependency>
34
		<dependency>
35
			<groupId>org.springframework</groupId>
36
			<artifactId>spring-beans</artifactId>
37
			<version>${spring.version}</version>
38
		</dependency>
39
	</dependencies>
40
</project>
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0/deploy.info
1
{"type_source": "SVN", "goal": "package -U -T 4C source:jar", "url": "http://svn-public.driver.research-infrastructures.eu/driver/dnet40/modules/dnet-modular-collector-service-rmi/trunk/", "deploy_repository": "dnet4-snapshots", "version": "4", "mail": "sandro.labruzzo@isti.cnr.it,michele.artini@isti.cnr.it, claudio.atzori@isti.cnr.it, alessia.bardi@isti.cnr.it", "deploy_repository_url": "http://maven.research-infrastructures.eu/nexus/content/repositories/dnet4-snapshots", "name": "dnet-modular-collector-service-rmi"}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0/src/main/java/eu/dnetlib/data/collector/rmi/InterfaceDescriptor.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import java.util.HashMap;
4

  
5
import javax.xml.bind.annotation.XmlRootElement;
6

  
7
import org.dom4j.Node;
8
import org.springframework.beans.factory.annotation.Required;
9

  
10
import com.google.common.collect.Maps;
11

  
12
@XmlRootElement
13
public class InterfaceDescriptor {
14

  
15
	private String id;
16

  
17
	private String baseUrl;
18

  
19
	private String protocol;
20

  
21
	private HashMap<String, String> params = Maps.newHashMap();
22

  
23
	public String getBaseUrl() {
24
		return baseUrl;
25
	}
26

  
27
	public void setBaseUrl(final String baseUrl) {
28
		this.baseUrl = baseUrl;
29
	}
30

  
31
	public String getId() {
32
		return id;
33
	}
34

  
35
	@Required
36
	public void setId(final String id) {
37
		this.id = id;
38
	}
39

  
40
	public HashMap<String, String> getParams() {
41
		return params;
42
	}
43

  
44
	public void setParams(final HashMap<String, String> params) {
45
		this.params = params;
46
	}
47

  
48
	public String getProtocol() {
49
		return protocol;
50
	}
51

  
52
	public void setProtocol(final String protocol) {
53
		this.protocol = protocol;
54
	}
55

  
56
	public static InterfaceDescriptor newInstance(final Node node) {
57
		final InterfaceDescriptor ifc = new InterfaceDescriptor();
58
		ifc.setId(node.valueOf("./@id"));
59
		ifc.setBaseUrl(node.valueOf("./BASE_URL"));
60
		ifc.setProtocol(node.valueOf("./ACCESS_PROTOCOL"));
61

  
62
		for (Object o : node.selectNodes("./ACCESS_PROTOCOL/@*")) {
63
			final Node n = (Node) o;
64
			ifc.getParams().put(n.getName(), n.getText());
65
		}
66

  
67
		return ifc;
68
	}
69

  
70
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0/src/main/java/eu/dnetlib/data/collector/rmi/ProtocolParameterValue.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import javax.xml.bind.annotation.XmlRootElement;
4

  
5
@XmlRootElement
6
public class ProtocolParameterValue {
7

  
8
	private String id;
9
	private String name;
10

  
11
	public ProtocolParameterValue() {}
12

  
13
	public ProtocolParameterValue(final String id, final String name) {
14
		this.id = id;
15
		this.name = name;
16
	}
17

  
18
	public String getId() {
19
		return id;
20
	}
21

  
22
	public void setId(final String id) {
23
		this.id = id;
24
	}
25

  
26
	public String getName() {
27
		return name;
28
	}
29

  
30
	public void setName(final String name) {
31
		this.name = name;
32
	}
33

  
34
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0/src/main/java/eu/dnetlib/data/collector/rmi/ProtocolDescriptor.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import java.util.ArrayList;
4
import java.util.List;
5

  
6
import javax.xml.bind.annotation.XmlRootElement;
7

  
8
import org.springframework.beans.factory.annotation.Required;
9

  
10
@XmlRootElement
11
public class ProtocolDescriptor {
12

  
13
	private String name;
14
	private List<ProtocolParameter> params = new ArrayList<ProtocolParameter>();
15

  
16
	public ProtocolDescriptor() {}
17

  
18
	public ProtocolDescriptor(final String name, final List<ProtocolParameter> params) {
19
		this.name = name;
20
		this.params = params;
21
	}
22

  
23
	public String getName() {
24
		return name;
25
	}
26

  
27
	@Required
28
	public void setName(final String name) {
29
		this.name = name;
30
	}
31

  
32
	public List<ProtocolParameter> getParams() {
33
		return params;
34
	}
35

  
36
	public void setParams(final List<ProtocolParameter> params) {
37
		this.params = params;
38
	}
39
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0/src/main/java/eu/dnetlib/data/collector/rmi/ProtocolParameter.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import javax.xml.bind.annotation.XmlRootElement;
4
import javax.xml.bind.annotation.XmlTransient;
5

  
6
import org.springframework.beans.factory.annotation.Required;
7

  
8
import eu.dnetlib.data.collector.functions.ParamValuesFunction;
9

  
10
@XmlRootElement
11
public class ProtocolParameter {
12

  
13
	private String name;
14
	private boolean optional = false;
15
	private ProtocolParameterType type = ProtocolParameterType.TEXT;
16
	private String regex = null;
17
	private transient ParamValuesFunction populateFunction = null;
18
	private boolean functionPopulated = false;
19

  
20
	public ProtocolParameter() {}
21

  
22
	public ProtocolParameter(final String name, final boolean optional, final ProtocolParameterType type, final String regex) {
23
		this(name, optional, type, regex, null);
24
	}
25

  
26
	public ProtocolParameter(final String name, final boolean optional, final ProtocolParameterType type, final String regex,
27
			final ParamValuesFunction populateFunction) {
28
		this.name = name;
29
		this.optional = optional;
30
		this.type = type;
31
		this.regex = regex;
32
		this.populateFunction = populateFunction;
33
		this.functionPopulated = this.populateFunction != null;
34
	}
35

  
36
	public String getName() {
37
		return name;
38
	}
39

  
40
	@Required
41
	public void setName(final String name) {
42
		this.name = name;
43
	}
44

  
45
	public boolean isOptional() {
46
		return optional;
47
	}
48

  
49
	public void setOptional(final boolean optional) {
50
		this.optional = optional;
51
	}
52

  
53
	public ProtocolParameterType getType() {
54
		return type;
55
	}
56

  
57
	public void setType(final ProtocolParameterType type) {
58
		this.type = type;
59
	}
60

  
61
	public String getRegex() {
62
		return regex;
63
	}
64

  
65
	public void setRegex(final String regex) {
66
		this.regex = regex;
67
	}
68

  
69
	@XmlTransient
70
	public ParamValuesFunction getPopulateFunction() {
71
		return populateFunction;
72
	}
73

  
74
	public void setPopulateFunction(final ParamValuesFunction populateFunction) {
75
		this.populateFunction = populateFunction;
76
		this.functionPopulated = this.populateFunction != null;
77
	}
78

  
79
	public boolean isFunctionPopulated() {
80
		return functionPopulated;
81
	}
82

  
83
	public void setFunctionPopulated(final boolean functionPopulated) {
84
		this.functionPopulated = functionPopulated;
85
	}
86

  
87
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0/src/main/java/eu/dnetlib/data/collector/rmi/ProtocolParameterType.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import javax.xml.bind.annotation.XmlEnum;
4

  
5
@XmlEnum
6
public enum ProtocolParameterType {
7
	TEXT, NUMBER, LIST, BOOLEAN
8
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0/src/main/java/eu/dnetlib/data/collector/rmi/CollectorServiceException.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import eu.dnetlib.common.rmi.RMIException;
4

  
5
public class CollectorServiceException extends RMIException {
6

  
7
	/**
8
	 * 
9
	 */
10
	private static final long serialVersionUID = 7523999812098059764L;
11

  
12
	public CollectorServiceException(String string) {
13
		super(string);
14
	}
15
	
16
	
17
	public CollectorServiceException(String string, Throwable exception) {
18
		super(string, exception);
19
	}
20

  
21
	public CollectorServiceException(Throwable exception) {
22
		super(exception);
23
	}
24

  
25
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0/src/main/java/eu/dnetlib/data/collector/rmi/CollectorService.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import java.util.List;
4
import java.util.Map;
5

  
6
import javax.jws.WebParam;
7
import javax.jws.WebService;
8
import javax.xml.ws.wsaddressing.W3CEndpointReference;
9

  
10
import eu.dnetlib.common.rmi.BaseService;
11

  
12
@WebService(targetNamespace = "http://services.dnetlib.eu/")
13
public interface CollectorService extends BaseService {
14

  
15
	W3CEndpointReference collect(@WebParam(name = "interface") final InterfaceDescriptor interfaceDescriptor) throws CollectorServiceException;
16

  
17
	W3CEndpointReference dateRangeCollect(
18
			@WebParam(name = "interface") final InterfaceDescriptor interfaceDescriptor,
19
			@WebParam(name = "from") final String from,
20
			@WebParam(name = "until") final String until) throws CollectorServiceException;
21

  
22
	List<ProtocolDescriptor> listProtocols();
23

  
24
	List<ProtocolParameterValue> listValidValuesForParam(
25
			@WebParam(name = "protocol") String protocol,
26
			@WebParam(name = "baseUrl") String baseUrl,
27
			@WebParam(name = "param") String param,
28
			@WebParam(name = "otherParams") Map<String, String> otherParams) throws CollectorServiceException;
29

  
30
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0/src/main/java/eu/dnetlib/data/collector/functions/ParamValuesFunction.java
1
package eu.dnetlib.data.collector.functions;
2

  
3
import java.util.List;
4
import java.util.Map;
5

  
6
import eu.dnetlib.data.collector.rmi.ProtocolParameterValue;
7

  
8
public interface ParamValuesFunction {
9

  
10
	List<ProtocolParameterValue> findValues(String baseUrl, Map<String, String> params);
11

  
12
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0/src/main/java/eu/dnetlib/data/collector/plugin/CollectorPlugin.java
1
package eu.dnetlib.data.collector.plugin;
2

  
3
import java.util.List;
4

  
5
import eu.dnetlib.data.collector.rmi.CollectorServiceException;
6
import eu.dnetlib.data.collector.rmi.InterfaceDescriptor;
7
import eu.dnetlib.data.collector.rmi.ProtocolDescriptor;
8

  
9
public interface CollectorPlugin {
10

  
11
	Iterable<String> collect(InterfaceDescriptor interfaceDescriptor, String fromDate, String untilDate) throws CollectorServiceException;
12

  
13
	ProtocolDescriptor getProtocolDescriptor();
14

  
15
	String getProtocol();
16

  
17
	List<String> listNameParameters();
18
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0/src/main/java/eu/dnetlib/data/collector/plugin/AbstractCollectorPlugin.java
1
package eu.dnetlib.data.collector.plugin;
2

  
3
import java.util.List;
4

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

  
7
import com.google.common.base.Function;
8
import com.google.common.collect.Lists;
9

  
10
import eu.dnetlib.data.collector.plugin.CollectorPlugin;
11
import eu.dnetlib.data.collector.rmi.ProtocolDescriptor;
12
import eu.dnetlib.data.collector.rmi.ProtocolParameter;
13

  
14
public abstract class AbstractCollectorPlugin implements CollectorPlugin {
15

  
16
	private ProtocolDescriptor protocolDescriptor;
17

  
18
	@Override
19
	public final String getProtocol() {
20
		return getProtocolDescriptor().getName();
21
	}
22

  
23
	@Override
24
	public final List<String> listNameParameters() {
25
		return Lists.newArrayList(Lists.transform(getProtocolDescriptor().getParams(), new Function<ProtocolParameter, String>() {
26

  
27
			@Override
28
			public String apply(final ProtocolParameter p) {
29
				return p.getName();
30
			}
31
		}));
32
	}
33

  
34
	@Override
35
	public final ProtocolDescriptor getProtocolDescriptor() {
36
		return protocolDescriptor;
37
	}
38

  
39
	@Required
40
	public void setProtocolDescriptor(final ProtocolDescriptor protocolDescriptor) {
41
		this.protocolDescriptor = protocolDescriptor;
42
	}
43
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0/pom.xml
1
<?xml version="1.0" encoding="UTF-8"?>
2
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
	<parent>
4
		<groupId>eu.dnetlib</groupId>
5
		<artifactId>dnet-parent</artifactId>
6
		<version>1.0.0</version>
7
		<relativePath />
8
	</parent>
9
	<modelVersion>4.0.0</modelVersion>
10
	<groupId>eu.dnetlib</groupId>
11
	<artifactId>dnet-modular-collector-service-rmi</artifactId>
12
	<packaging>jar</packaging>
13
	<version>1.3.0</version>
14
	<scm>
15
		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.0</developerConnection>
16
	</scm>
17

  
18
	<dependencies>
19
		<dependency>
20
			<groupId>eu.dnetlib</groupId>
21
			<artifactId>cnr-rmi-api</artifactId>
22
			<version>[2.0.0,3.0.0)</version>
23
		</dependency>
24
		<dependency>
25
			<groupId>com.google.guava</groupId>
26
			<artifactId>guava</artifactId>
27
			<version>${google.guava.version}</version>
28
		</dependency>
29
		<dependency>
30
			<groupId>dom4j</groupId>
31
			<artifactId>dom4j</artifactId>
32
			<version>${dom4j.version}</version>
33
		</dependency>
34
		<dependency>
35
			<groupId>org.springframework</groupId>
36
			<artifactId>spring-beans</artifactId>
37
			<version>${spring.version}</version>
38
		</dependency>
39
	</dependencies>
40
</project>
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/deploy.info
1
{"type_source": "SVN", "goal": "package -U -T 4C source:jar", "url": "http://svn-public.driver.research-infrastructures.eu/driver/dnet40/modules/dnet-modular-collector-service-rmi/trunk/", "deploy_repository": "dnet4-snapshots", "version": "4", "mail": "sandro.labruzzo@isti.cnr.it,michele.artini@isti.cnr.it, claudio.atzori@isti.cnr.it, alessia.bardi@isti.cnr.it", "deploy_repository_url": "http://maven.research-infrastructures.eu/nexus/content/repositories/dnet4-snapshots", "name": "dnet-modular-collector-service-rmi"}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/src/main/java/eu/dnetlib/data/collector/rmi/InterfaceDescriptor.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import java.util.HashMap;
4

  
5
import javax.xml.bind.annotation.XmlRootElement;
6

  
7
import org.dom4j.Node;
8
import org.springframework.beans.factory.annotation.Required;
9

  
10
import com.google.common.collect.Maps;
11

  
12
@XmlRootElement
13
public class InterfaceDescriptor {
14

  
15
	private String id;
16

  
17
	private String baseUrl;
18

  
19
	private String protocol;
20

  
21
	private HashMap<String, String> params = Maps.newHashMap();
22

  
23
	public String getBaseUrl() {
24
		return baseUrl;
25
	}
26

  
27
	public void setBaseUrl(final String baseUrl) {
28
		this.baseUrl = baseUrl;
29
	}
30

  
31
	public String getId() {
32
		return id;
33
	}
34

  
35
	@Required
36
	public void setId(final String id) {
37
		this.id = id;
38
	}
39

  
40
	public HashMap<String, String> getParams() {
41
		return params;
42
	}
43

  
44
	public void setParams(final HashMap<String, String> params) {
45
		this.params = params;
46
	}
47

  
48
	public String getProtocol() {
49
		return protocol;
50
	}
51

  
52
	public void setProtocol(final String protocol) {
53
		this.protocol = protocol;
54
	}
55

  
56
	public static InterfaceDescriptor newInstance(final Node node) {
57
		final InterfaceDescriptor ifc = new InterfaceDescriptor();
58
		ifc.setId(node.valueOf("./@id"));
59
		ifc.setBaseUrl(node.valueOf("./BASE_URL"));
60
		ifc.setProtocol(node.valueOf("./ACCESS_PROTOCOL"));
61

  
62
		for (Object o : node.selectNodes("./ACCESS_PROTOCOL/@*")) {
63
			final Node n = (Node) o;
64
			ifc.getParams().put(n.getName(), n.getText());
65
		}
66

  
67
		return ifc;
68
	}
69

  
70
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/src/main/java/eu/dnetlib/data/collector/rmi/ProtocolParameterValue.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import javax.xml.bind.annotation.XmlRootElement;
4

  
5
@XmlRootElement
6
public class ProtocolParameterValue {
7

  
8
	private String id;
9
	private String name;
10

  
11
	public ProtocolParameterValue() {}
12

  
13
	public ProtocolParameterValue(final String id, final String name) {
14
		this.id = id;
15
		this.name = name;
16
	}
17

  
18
	public String getId() {
19
		return id;
20
	}
21

  
22
	public void setId(final String id) {
23
		this.id = id;
24
	}
25

  
26
	public String getName() {
27
		return name;
28
	}
29

  
30
	public void setName(final String name) {
31
		this.name = name;
32
	}
33

  
34
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/src/main/java/eu/dnetlib/data/collector/rmi/ProtocolDescriptor.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import java.util.ArrayList;
4
import java.util.List;
5

  
6
import javax.xml.bind.annotation.XmlRootElement;
7

  
8
import org.springframework.beans.factory.annotation.Required;
9

  
10
@XmlRootElement
11
public class ProtocolDescriptor {
12

  
13
	private String name;
14
	private List<ProtocolParameter> params = new ArrayList<ProtocolParameter>();
15

  
16
	public ProtocolDescriptor() {}
17

  
18
	public ProtocolDescriptor(final String name, final List<ProtocolParameter> params) {
19
		this.name = name;
20
		this.params = params;
21
	}
22

  
23
	public String getName() {
24
		return name;
25
	}
26

  
27
	@Required
28
	public void setName(final String name) {
29
		this.name = name;
30
	}
31

  
32
	public List<ProtocolParameter> getParams() {
33
		return params;
34
	}
35

  
36
	public void setParams(final List<ProtocolParameter> params) {
37
		this.params = params;
38
	}
39
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/src/main/java/eu/dnetlib/data/collector/rmi/ProtocolParameter.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import javax.xml.bind.annotation.XmlRootElement;
4
import javax.xml.bind.annotation.XmlTransient;
5

  
6
import org.springframework.beans.factory.annotation.Required;
7

  
8
import eu.dnetlib.data.collector.functions.ParamValuesFunction;
9

  
10
@XmlRootElement
11
public class ProtocolParameter {
12

  
13
	private String name;
14
	private boolean optional = false;
15
	private ProtocolParameterType type = ProtocolParameterType.TEXT;
16
	private String regex = null;
17
	private transient ParamValuesFunction populateFunction = null;
18
	private boolean functionPopulated = false;
19

  
20
	public ProtocolParameter() {}
21

  
22
	public ProtocolParameter(final String name, final boolean optional, final ProtocolParameterType type, final String regex) {
23
		this(name, optional, type, regex, null);
24
	}
25

  
26
	public ProtocolParameter(final String name, final boolean optional, final ProtocolParameterType type, final String regex,
27
			final ParamValuesFunction populateFunction) {
28
		this.name = name;
29
		this.optional = optional;
30
		this.type = type;
31
		this.regex = regex;
32
		this.populateFunction = populateFunction;
33
		this.functionPopulated = this.populateFunction != null;
34
	}
35

  
36
	public String getName() {
37
		return name;
38
	}
39

  
40
	@Required
41
	public void setName(final String name) {
42
		this.name = name;
43
	}
44

  
45
	public boolean isOptional() {
46
		return optional;
47
	}
48

  
49
	public void setOptional(final boolean optional) {
50
		this.optional = optional;
51
	}
52

  
53
	public ProtocolParameterType getType() {
54
		return type;
55
	}
56

  
57
	public void setType(final ProtocolParameterType type) {
58
		this.type = type;
59
	}
60

  
61
	public String getRegex() {
62
		return regex;
63
	}
64

  
65
	public void setRegex(final String regex) {
66
		this.regex = regex;
67
	}
68

  
69
	@XmlTransient
70
	public ParamValuesFunction getPopulateFunction() {
71
		return populateFunction;
72
	}
73

  
74
	public void setPopulateFunction(final ParamValuesFunction populateFunction) {
75
		this.populateFunction = populateFunction;
76
		this.functionPopulated = this.populateFunction != null;
77
	}
78

  
79
	public boolean isFunctionPopulated() {
80
		return functionPopulated;
81
	}
82

  
83
	public void setFunctionPopulated(final boolean functionPopulated) {
84
		this.functionPopulated = functionPopulated;
85
	}
86

  
87
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/src/main/java/eu/dnetlib/data/collector/rmi/ProtocolParameterType.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import javax.xml.bind.annotation.XmlEnum;
4

  
5
@XmlEnum
6
public enum ProtocolParameterType {
7
	TEXT, NUMBER, LIST, BOOLEAN
8
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/src/main/java/eu/dnetlib/data/collector/rmi/CollectorServiceException.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import eu.dnetlib.common.rmi.RMIException;
4

  
5
public class CollectorServiceException extends RMIException {
6

  
7
	/**
8
	 * 
9
	 */
10
	private static final long serialVersionUID = 7523999812098059764L;
11

  
12
	public CollectorServiceException(String string) {
13
		super(string);
14
	}
15
	
16
	
17
	public CollectorServiceException(String string, Throwable exception) {
18
		super(string, exception);
19
	}
20

  
21
	public CollectorServiceException(Throwable exception) {
22
		super(exception);
23
	}
24

  
25
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/src/main/java/eu/dnetlib/data/collector/rmi/CollectorService.java
1
package eu.dnetlib.data.collector.rmi;
2

  
3
import java.util.List;
4
import java.util.Map;
5

  
6
import javax.jws.WebParam;
7
import javax.jws.WebService;
8
import javax.xml.ws.wsaddressing.W3CEndpointReference;
9

  
10
import eu.dnetlib.common.rmi.BaseService;
11

  
12
@WebService(targetNamespace = "http://services.dnetlib.eu/")
13
public interface CollectorService extends BaseService {
14

  
15
	W3CEndpointReference collect(@WebParam(name = "interface") final InterfaceDescriptor interfaceDescriptor) throws CollectorServiceException;
16

  
17
	W3CEndpointReference dateRangeCollect(
18
			@WebParam(name = "interface") final InterfaceDescriptor interfaceDescriptor,
19
			@WebParam(name = "from") final String from,
20
			@WebParam(name = "until") final String until) throws CollectorServiceException;
21

  
22
	List<ProtocolDescriptor> listProtocols();
23

  
24
	List<ProtocolParameterValue> listValidValuesForParam(
25
			@WebParam(name = "protocol") String protocol,
26
			@WebParam(name = "baseUrl") String baseUrl,
27
			@WebParam(name = "param") String param,
28
			@WebParam(name = "otherParams") Map<String, String> otherParams) throws CollectorServiceException;
29

  
30
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/src/main/java/eu/dnetlib/data/collector/functions/ParamValuesFunction.java
1
package eu.dnetlib.data.collector.functions;
2

  
3
import java.util.List;
4
import java.util.Map;
5

  
6
import eu.dnetlib.data.collector.rmi.ProtocolParameterValue;
7

  
8
public interface ParamValuesFunction {
9

  
10
	List<ProtocolParameterValue> findValues(String baseUrl, Map<String, String> params);
11

  
12
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/src/main/java/eu/dnetlib/data/collector/plugin/CollectorPlugin.java
1
package eu.dnetlib.data.collector.plugin;
2

  
3
import java.util.List;
4

  
5
import eu.dnetlib.data.collector.rmi.CollectorServiceException;
6
import eu.dnetlib.data.collector.rmi.InterfaceDescriptor;
7
import eu.dnetlib.data.collector.rmi.ProtocolDescriptor;
8

  
9
public interface CollectorPlugin {
10

  
11
	Iterable<String> collect(InterfaceDescriptor interfaceDescriptor, String fromDate, String untilDate) throws CollectorServiceException;
12

  
13
	ProtocolDescriptor getProtocolDescriptor();
14

  
15
	String getProtocol();
16

  
17
	List<String> listNameParameters();
18
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/src/main/java/eu/dnetlib/data/collector/plugin/AbstractCollectorPlugin.java
1
package eu.dnetlib.data.collector.plugin;
2

  
3
import java.util.List;
4

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

  
7
import com.google.common.base.Function;
8
import com.google.common.collect.Lists;
9

  
10
import eu.dnetlib.data.collector.plugin.CollectorPlugin;
11
import eu.dnetlib.data.collector.rmi.ProtocolDescriptor;
12
import eu.dnetlib.data.collector.rmi.ProtocolParameter;
13

  
14
public abstract class AbstractCollectorPlugin implements CollectorPlugin {
15

  
16
	private ProtocolDescriptor protocolDescriptor;
17

  
18
	@Override
19
	public final String getProtocol() {
20
		return getProtocolDescriptor().getName();
21
	}
22

  
23
	@Override
24
	public final List<String> listNameParameters() {
25
		return Lists.newArrayList(Lists.transform(getProtocolDescriptor().getParams(), new Function<ProtocolParameter, String>() {
26

  
27
			@Override
28
			public String apply(final ProtocolParameter p) {
29
				return p.getName();
30
			}
31
		}));
32
	}
33

  
34
	@Override
35
	public final ProtocolDescriptor getProtocolDescriptor() {
36
		return protocolDescriptor;
37
	}
38

  
39
	@Required
40
	public void setProtocolDescriptor(final ProtocolDescriptor protocolDescriptor) {
41
		this.protocolDescriptor = protocolDescriptor;
42
	}
43
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/src/main/java/eu/dnetlib/data/collector/plugin/CollectorPluginErrorLogList.java
1
package eu.dnetlib.data.collector.plugin;
2

  
3
import java.util.LinkedList;
4

  
5
public class CollectorPluginErrorLogList extends LinkedList<String> {
6

  
7
	private static final long serialVersionUID = -6925786561303289704L;
8

  
9
	@Override
10
	public String toString() {
11
		String log = new String();
12
		int index = 0;
13
		for (String errorMessage : this) {
14
			log += String.format("Retry #%s: %s / ", index++, errorMessage);
15
		}
16
		return log;
17
	}
18

  
19
}
modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1/pom.xml
1
<?xml version="1.0" encoding="UTF-8"?>
2
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
	<parent>
4
		<groupId>eu.dnetlib</groupId>
5
		<artifactId>dnet-parent</artifactId>
6
		<version>1.0.0</version>
7
		<relativePath />
8
	</parent>
9
	<modelVersion>4.0.0</modelVersion>
10
	<groupId>eu.dnetlib</groupId>
11
	<artifactId>dnet-modular-collector-service-rmi</artifactId>
12
	<packaging>jar</packaging>
13
	<version>1.3.1</version>
14
	<scm>
15
		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/dnet-modular-collector-service-rmi/tags/dnet-modular-collector-service-rmi-1.3.1</developerConnection>
16
	</scm>
17

  
18
	<dependencies>
19
		<dependency>
20
			<groupId>eu.dnetlib</groupId>
21
			<artifactId>cnr-rmi-api</artifactId>
22
			<version>[2.0.0,3.0.0)</version>
23
		</dependency>
24
		<dependency>
25
			<groupId>com.google.guava</groupId>
26
			<artifactId>guava</artifactId>
27
			<version>${google.guava.version}</version>
28
		</dependency>
29
		<dependency>
30
			<groupId>dom4j</groupId>
31
			<artifactId>dom4j</artifactId>
32
			<version>${dom4j.version}</version>
33
		</dependency>
34
		<dependency>
35
			<groupId>org.springframework</groupId>
36
			<artifactId>spring-beans</artifactId>
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff