Project

General

Profile

« Previous | Next » 

Revision 50381

using timestamp instead of date type

View differences:

modules/dnet-openaire-datasource-manager/trunk/src/main/java/eu/dnetlib/enabling/datasources/DatasourceFunctions.java
4 4
import java.sql.Array;
5 5
import java.sql.Date;
6 6
import java.sql.SQLException;
7
import java.util.Arrays;
8
import java.util.HashMap;
9
import java.util.List;
10
import java.util.Map;
11
import java.util.Objects;
7
import java.sql.Timestamp;
8
import java.util.*;
12 9
import java.util.stream.Collectors;
13 10

  
11
import eu.dnetlib.enabling.datasources.common.*;
12
import eu.dnetlib.miscutils.datetime.DateUtils;
14 13
import org.apache.commons.lang.BooleanUtils;
15 14
import org.apache.commons.lang.StringUtils;
16 15
import org.apache.commons.logging.Log;
......
22 21
import org.springframework.core.io.ClassPathResource;
23 22
import org.springframework.core.io.Resource;
24 23

  
25
import eu.dnetlib.enabling.datasources.common.Api;
26
import eu.dnetlib.enabling.datasources.common.ApiParam;
27
import eu.dnetlib.enabling.datasources.common.ApiParamImpl;
28
import eu.dnetlib.enabling.datasources.common.Datasource;
29
import eu.dnetlib.enabling.datasources.common.Identity;
30
import eu.dnetlib.enabling.datasources.common.Organization;
31
import eu.dnetlib.enabling.datasources.common.SearchApisEntry;
32
import eu.dnetlib.enabling.datasources.common.SimpleDatasource;
33
import eu.dnetlib.miscutils.datetime.DateUtils;
34

  
35 24
public class DatasourceFunctions {
36 25

  
37 26
	private static final Log log = LogFactory.getLog(DatasourceFunctions.class);
......
158 147
		a.setCompatibilityOverrided(castObject(map.get("isCompatibilityOverrided"), Boolean.class));
159 148
		a.setMetadataIdentifierPath(castObject(map.get("metadataIdentifierPath"), String.class));
160 149
		a.setLastCollectionTotal(castObject(map.get("lastCollectionTotal"), Integer.class));
161
		a.setLastCollectionDate(castObject(map.get("lastCollectionDate"), Date.class));
150
		a.setLastCollectionDate(castObject(map.get("lastCollectionDate"), Timestamp.class));
162 151
		a.setLastCollectionMdid(castObject(map.get("lastCollectionMdid"), String.class));
163 152
		a.setLastAggregationTotal(castObject(map.get("lastAggregationTotal"), Integer.class));
164
		a.setLastAggregationDate(castObject(map.get("lastAggregationDate"), Date.class));
153
		a.setLastAggregationDate(castObject(map.get("lastAggregationDate"), Timestamp.class));
165 154
		a.setLastAggregationMdid(castObject(map.get("lastAggregationMdid"), String.class));
166 155
		a.setLastDownloadTotal(castObject(map.get("lastDownloadTotal"), Integer.class));
167
		a.setLastDownloadDate(castObject(map.get("lastDownloadDate"), Date.class));
156
		a.setLastDownloadDate(castObject(map.get("lastDownloadDate"), Timestamp.class));
168 157
		a.setLastDownloadObjid(castObject(map.get("lastDownloadObjid"), String.class));
169 158
		a.setLastValidationJob(castObject(map.get("lastValidationJob"), String.class));
170 159
		a.setBaseurl(castObject(map.get("baseUrl"), String.class));
modules/dnet-openaire-datasource-manager/trunk/src/main/java/eu/dnetlib/enabling/datasources/LocalOpenaireDatasourceManager.java
1 1
package eu.dnetlib.enabling.datasources;
2 2

  
3 3
import java.io.StringWriter;
4
import java.util.ArrayList;
5
import java.util.Date;
6
import java.util.HashMap;
7
import java.util.List;
8
import java.util.Map;
9
import java.util.Optional;
4
import java.util.*;
10 5
import java.util.stream.Collectors;
11 6

  
7
import com.google.common.collect.ImmutableMap;
8
import eu.dnetlib.enabling.datasources.DatasourceManagerClients.AfterSqlUpdate;
9
import eu.dnetlib.enabling.datasources.common.*;
12 10
import org.apache.commons.io.IOUtils;
13 11
import org.apache.commons.lang.StringUtils;
14 12
import org.apache.commons.lang.math.NumberUtils;
......
18 16
import org.springframework.core.io.ClassPathResource;
19 17
import org.springframework.core.io.Resource;
20 18

  
21
import com.google.common.collect.ImmutableMap;
22

  
23
import eu.dnetlib.enabling.datasources.DatasourceManagerClients.AfterSqlUpdate;
24
import eu.dnetlib.enabling.datasources.common.Api;
25
import eu.dnetlib.enabling.datasources.common.ApiParam;
26
import eu.dnetlib.enabling.datasources.common.BrowsableField;
27
import eu.dnetlib.enabling.datasources.common.BrowseTerm;
28
import eu.dnetlib.enabling.datasources.common.BrowseTermImpl;
29
import eu.dnetlib.enabling.datasources.common.Datasource;
30
import eu.dnetlib.enabling.datasources.common.DsmException;
31
import eu.dnetlib.enabling.datasources.common.Identity;
32
import eu.dnetlib.enabling.datasources.common.LocalDatasourceManager;
33
import eu.dnetlib.enabling.datasources.common.Organization;
34
import eu.dnetlib.enabling.datasources.common.SearchApisEntry;
35
import eu.dnetlib.enabling.datasources.common.SimpleDatasource;
36

  
37 19
public class LocalOpenaireDatasourceManager implements LocalDatasourceManager<Datasource<Organization<?>, Identity>, Api<ApiParam>> {
38 20

  
39 21
	private DatasourceManagerClients datasourceManagerClients;
......
222 204
		params.put("apiId", apiId);
223 205
		params.put("mdId", mdId);
224 206
		params.put("total", size);
225
		params.put("date", date);
207
		params.put("date", new java.sql.Timestamp(date.getTime()));
226 208
		datasourceManagerClients.updateSQL(dsId, sqlResource, AfterSqlUpdate.UPDATE_DS_PROFILE, params);
227 209
	}
228 210

  
modules/dnet-datasource-manager-common/trunk/src/main/java/eu/dnetlib/enabling/datasources/common/Api.java
1 1
package eu.dnetlib.enabling.datasources.common;
2 2

  
3
import java.sql.Date;
3
import java.sql.Timestamp;
4 4
import java.util.Objects;
5 5
import java.util.Set;
6
import javax.persistence.*;
6 7

  
7
import javax.persistence.CascadeType;
8
import javax.persistence.Column;
9
import javax.persistence.FetchType;
10
import javax.persistence.Id;
11
import javax.persistence.MappedSuperclass;
12
import javax.persistence.OneToMany;
13
import javax.persistence.Transient;
14

  
15 8
import com.google.common.collect.ComparisonChain;
16 9
import com.google.gson.Gson;
17 10

  
......
41 34
	protected Integer lastCollectionTotal;
42 35

  
43 36
	@Column(name = "last_collection_date")
44
	protected Date lastCollectionDate;
37
	protected Timestamp lastCollectionDate;
45 38

  
46 39
	@Column(name = "last_collection_mdid")
47 40
	protected String lastCollectionMdid;
......
50 43
	protected Integer lastAggregationTotal;
51 44

  
52 45
	@Column(name = "last_aggregation_date")
53
	protected Date lastAggregationDate;
46
	protected Timestamp lastAggregationDate;
54 47

  
55 48
	@Column(name = "last_aggregation_mdid")
56 49
	protected String lastAggregationMdid;
......
59 52
	protected Integer lastDownloadTotal;
60 53

  
61 54
	@Column(name = "last_download_date")
62
	protected Date lastDownloadDate;
55
	protected Timestamp lastDownloadDate;
63 56

  
64 57
	@Column(name = "last_download_objid")
65 58
	protected String lastDownloadObjid;
......
117 110
		return lastCollectionTotal;
118 111
	}
119 112

  
120
	public Date getLastCollectionDate() {
113
	public Timestamp getLastCollectionDate() {
121 114
		return lastCollectionDate;
122 115
	}
123 116

  
......
129 122
		return lastAggregationTotal;
130 123
	}
131 124

  
132
	public Date getLastAggregationDate() {
125
	public Timestamp getLastAggregationDate() {
133 126
		return lastAggregationDate;
134 127
	}
135 128

  
......
141 134
		return lastDownloadTotal;
142 135
	}
143 136

  
144
	public Date getLastDownloadDate() {
137
	public Timestamp getLastDownloadDate() {
145 138
		return lastDownloadDate;
146 139
	}
147 140

  
......
216 209
		return this;
217 210
	}
218 211

  
219
	public Api<AP> setLastCollectionDate(final Date lastCollectionDate) {
212
	public Api<AP> setLastCollectionDate(final Timestamp lastCollectionDate) {
220 213
		this.lastCollectionDate = lastCollectionDate;
221 214
		return this;
222 215
	}
......
231 224
		return this;
232 225
	}
233 226

  
234
	public Api<AP> setLastAggregationDate(final Date lastAggregationDate) {
227
	public Api<AP> setLastAggregationDate(final Timestamp lastAggregationDate) {
235 228
		this.lastAggregationDate = lastAggregationDate;
236 229
		return this;
237 230
	}
......
246 239
		return this;
247 240
	}
248 241

  
249
	public Api<AP> setLastDownloadDate(final Date lastDownloadDate) {
242
	public Api<AP> setLastDownloadDate(final Timestamp lastDownloadDate) {
250 243
		this.lastDownloadDate = lastDownloadDate;
251 244
		return this;
252 245
	}

Also available in: Unified diff