Project

General

Profile

« Previous | Next » 

Revision 49878

Deleted PiwikInfo class and using the one from uoa-domain

View differences:

modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/service/controllers/PiWiApi.java
1 1
package eu.dnetlib.repo.manager.service.controllers;
2 2

  
3 3

  
4
import eu.dnetlib.repo.manager.shared.PiwikInfo;
4
import eu.dnetlib.domain.data.PiwikInfo;
5 5
import org.springframework.http.MediaType;
6 6
import org.springframework.web.bind.annotation.*;
7 7

  
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/service/controllers/PiWiApiImpl.java
1 1
package eu.dnetlib.repo.manager.service.controllers;
2 2

  
3
import eu.dnetlib.repo.manager.shared.PiwikInfo;
3
import eu.dnetlib.domain.data.PiwikInfo;
4 4
import eu.dnetlib.utils.md5.MD5;
5 5
import org.springframework.beans.factory.annotation.Autowired;
6 6
import org.springframework.beans.factory.annotation.Qualifier;
......
58 58
    public PiwikInfo savePiwikInfo(PiwikInfo piwikInfo) {
59 59
        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
60 60
        jdbcTemplate.update(INSERT_PIWIK_INFO, new Object[]{piwikInfo.getRepositoryId(), piwikInfo.getSiteId(), piwikInfo.getRequestorName(),
61
                        piwikInfo.getRequestorEmail(), piwikInfo.isApproved(), piwikInfo.getRepositoryName(), piwikInfo.getCountry(), piwikInfo.getAuthenticationToken()},
61
                        piwikInfo.getRequestorEmail(), piwikInfo.isValidated(), piwikInfo.getRepositoryName(), piwikInfo.getCountry(), piwikInfo.getAuthenticationToken()},
62 62
                new int[]{Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.BOOLEAN, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR});
63 63
        return piwikInfo;
64 64
    }
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/PiwikInfo.java
1
package eu.dnetlib.repo.manager.shared;
2

  
3
import com.google.gwt.user.client.rpc.IsSerializable;
4

  
5
import java.util.Date;
6

  
7
/**
8
 * Created by stefania on 12/19/16.
9
 */
10
public class PiwikInfo implements IsSerializable {
11

  
12
    private String repositoryId;
13
    private String openaireId;
14
    private String repositoryName;
15
    private String country;
16
    private String siteId;
17
    private String authenticationToken;
18
    private Date creationDate;
19
    private String requestorName;
20
    private String requestorEmail;
21
    private boolean approved;
22
    private Date approvalDate;
23
    private String comment;
24

  
25
    public PiwikInfo() {
26

  
27
    }
28

  
29
    public PiwikInfo(String repositoryId, String openaireId, String repositoryName, String country, String siteId,
30
                     String authenticationToken, Date creationDate, String requestorName, String requestorEmail,
31
                     boolean approved, Date approvalDate, String comment) {
32
        this.repositoryId = repositoryId;
33
        this.openaireId = openaireId;
34
        this.repositoryName = repositoryName;
35
        this.country = country;
36
        this.siteId = siteId;
37
        this.authenticationToken = authenticationToken;
38
        this.creationDate = creationDate;
39
        this.requestorName = requestorName;
40
        this.requestorEmail = requestorEmail;
41
        this.approved = approved;
42
        this.approvalDate = approvalDate;
43
        this.comment = comment;
44
    }
45

  
46
    public String getRepositoryId() {
47
        return repositoryId;
48
    }
49

  
50
    public void setRepositoryId(String repositoryId) {
51
        this.repositoryId = repositoryId;
52
    }
53

  
54
    public String getOpenaireId() {
55
        return openaireId;
56
    }
57

  
58
    public void setOpenaireId(String openaireId) {
59
        this.openaireId = openaireId;
60
    }
61

  
62
    public String getRepositoryName() {
63
        return repositoryName;
64
    }
65

  
66
    public void setRepositoryName(String repositoryName) {
67
        this.repositoryName = repositoryName;
68
    }
69

  
70
    public String getCountry() {
71
        return country;
72
    }
73

  
74
    public void setCountry(String country) {
75
        this.country = country;
76
    }
77

  
78
    public String getSiteId() {
79
        return siteId;
80
    }
81

  
82
    public void setSiteId(String siteId) {
83
        this.siteId = siteId;
84
    }
85

  
86
    public String getAuthenticationToken() {
87
        return authenticationToken;
88
    }
89

  
90
    public void setAuthenticationToken(String authenticationToken) {
91
        this.authenticationToken = authenticationToken;
92
    }
93

  
94
    public Date getCreationDate() {
95
        return creationDate;
96
    }
97

  
98
    public void setCreationDate(Date creationDate) {
99
        this.creationDate = creationDate;
100
    }
101

  
102
    public String getRequestorName() {
103
        return requestorName;
104
    }
105

  
106
    public void setRequestorName(String requestorName) {
107
        this.requestorName = requestorName;
108
    }
109

  
110
    public String getRequestorEmail() {
111
        return requestorEmail;
112
    }
113

  
114
    public void setRequestorEmail(String requestorEmail) {
115
        this.requestorEmail = requestorEmail;
116
    }
117

  
118
    public boolean isApproved() {
119
        return approved;
120
    }
121

  
122
    public void setApproved(boolean approved) {
123
        this.approved = approved;
124
    }
125

  
126
    public Date getApprovalDate() {
127
        return approvalDate;
128
    }
129

  
130
    public void setApprovalDate(Date approvalDate) {
131
        this.approvalDate = approvalDate;
132
    }
133

  
134
    public String getComment() {
135
        return comment;
136
    }
137

  
138
    public void setComment(String comment) {
139
        this.comment = comment;
140
    }
141
}

Also available in: Unified diff