Project

General

Profile

« Previous | Next » 

Revision 59805

[User Management]: Update registered service table and methods

View differences:

modules/uoa-user-management/trunk/src/main/java/eu/dnetlib/openaire/user/utils/EmailSender.java
29 29
        properties.put("mail.transport.protocol", "smtp");
30 30
        properties.put("mail.smtp.host", host);
31 31
        properties.put("mail.smtp.port", port);
32
        properties.put("mail.smtp.auth", "false"); //enable authentication
33
        //properties.put("mail.smtp.starttls.enable", "true");
34
        //properties.put("mail.smtp.ssl.trust", "*");
35

  
36 32
        //Dev for sending email from gmail
37
        /*
38
        properties.put("mail.smtp.auth", "true"); //enable authentication
39
        properties.put("mail.smtp.starttls.enable", "true");
40
        properties.put("mail.smtp.ssl.trust", "*");
41
        */
33
        if(host.equals("smtp.gmail.com")) {
34
            properties.put("mail.smtp.auth", "true"); //enable authentication
35
            properties.put("mail.smtp.starttls.enable", "true");
36
            properties.put("mail.smtp.ssl.trust", "*");
37
        } else {
38
            properties.put("mail.smtp.auth", "false");
39
        }
42 40
        Session session = javax.mail.Session.getInstance(properties,
43
            new Authenticator() {
44
                protected PasswordAuthentication getPasswordAuthentication() {
45
                    return new PasswordAuthentication(username, password);
46
                }
47
            });
41
                new Authenticator() {
42
                    protected PasswordAuthentication getPasswordAuthentication() {
43
                        return new PasswordAuthentication(username, password);
44
                    }
45
                });
48 46

  
49
            // Create a default MimeMessage object.
50
            MimeMessage message = new MimeMessage(session);
47
        // Create a default MimeMessage object.
48
        MimeMessage message = new MimeMessage(session);
51 49

  
52
            // Set From: header field of the header.
53
            message.setFrom(new InternetAddress(from));
50
        // Set From: header field of the header.
51
        message.setFrom(new InternetAddress(from));
54 52

  
55
            // Set To: header field of the header.
56
            message.addRecipient(Message.RecipientType.TO, new InternetAddress(recipient));
53
        // Set To: header field of the header.
54
        message.addRecipient(Message.RecipientType.TO, new InternetAddress(recipient));
57 55

  
58
            // Set Subject: header field
59
            message.setSubject(subject, "UTF-8");
56
        // Set Subject: header field
57
        message.setSubject(subject, "UTF-8");
60 58

  
61
            // For simple text setText() can be used instead of setContent()
59
        // For simple text setText() can be used instead of setContent()
62 60

  
63
            // Send the actual HTML message, as big as you like
64
            message.setContent(body, "text/html;charset=UTF-8");
61
        // Send the actual HTML message, as big as you like
62
        message.setContent(body, "text/html;charset=UTF-8");
65 63

  
66
            // Send message
67
            Transport.send(message);
68
            logger.debug("Sent message successfully....\n");
64
        // Send message
65
        Transport.send(message);
66
        logger.debug("Sent message successfully....\n");
69 67

  
70 68
    }
71 69

  
modules/uoa-user-management/trunk/src/main/java/eu/dnetlib/openaire/user/pojos/RegisteredService.java
6 6

  
7 7
public class RegisteredService implements Serializable {
8 8
    private String id;
9
    private String aai_id;
9
    private String client_id;
10 10
    private String name;
11 11
    private String owner;
12 12
    private Timestamp date;
13
    private String registration_access_token;
13 14

  
14
    public RegisteredService(){}
15
    
16
    public RegisteredService(String aai_id, String owner, String name) {
17
        this.aai_id = aai_id;
15
    public RegisteredService() {
16
    }
17

  
18
    public RegisteredService(String client_id, String owner, String name, String registration_access_token) {
19
        this.client_id = client_id;
18 20
        this.owner = owner;
19 21
        this.name = name;
20 22
        this.date = new Timestamp(new Date().getTime());
23
        this.registration_access_token = registration_access_token;
21 24
    }
25

  
22 26
    public String getId() {
23 27
        return id;
24 28
    }
......
27 31
        this.id = id;
28 32
    }
29 33

  
30
    public String getAai_id() {
31
        return aai_id;
34
    public String getClientId() {
35
        return client_id;
32 36
    }
33 37

  
34
    public void setAai_id(String aai_id) {
35
        this.aai_id = aai_id;
38
    public void setClientId(String client_id) {
39
        this.client_id = client_id;
36 40
    }
37 41

  
38 42
    public String getName() {
......
58 62
    public void setDate(Timestamp date) {
59 63
        this.date = date;
60 64
    }
65

  
66
    public String getRegistrationAccessToken() {
67
        return registration_access_token;
68
    }
69

  
70
    public void setRegistrationAccessToken(String registration_access_token) {
71
        this.registration_access_token = registration_access_token;
72
    }
61 73
}
modules/uoa-user-management/trunk/src/main/java/eu/dnetlib/openaire/user/registeredService/RegisteredServiceDao.java
7 7

  
8 8
public interface RegisteredServiceDao {
9 9

  
10
    public int insertRegisteredService(RegisteredService registeredService) throws SQLException ;
11
    public boolean update (final RegisteredService registeredService) throws SQLException;
12
    public boolean delete (int id) throws SQLException;
10
    public int insertRegisteredService(RegisteredService registeredService) throws SQLException;
11

  
12
    public boolean update(final RegisteredService registeredService) throws SQLException;
13

  
14
    public boolean delete(int id) throws SQLException;
15

  
13 16
    public RegisteredService fetchRegisteredServiceById(int id) throws SQLException;
17

  
14 18
    public List<RegisteredService> fetchAllRegisteredServicesByOwner(String owner) throws SQLException;
19

  
15 20
    public long countRegisteredServices(String owner) throws SQLException;
16 21

  
17
    }
22
}
modules/uoa-user-management/trunk/src/main/java/eu/dnetlib/openaire/user/registeredService/RegisteredServiceSQL.java
20 20
    DataSourceConnector dataSourceConnector;
21 21

  
22 22
    private final static String INSERT = "INSERT INTO registered_service (" +
23
            "aai_id, " +
23
            "client_id, " +
24 24
            "owner, " +
25 25
            "name, " +
26
            "creation_date " +
27
            ") VALUES (?,?,?,?)";
26
            "creation_date, " +
27
            "registration_access_token" +
28
            ") VALUES (?,?,?,?,?)";
28 29

  
29 30
    private final static String UPDATE = "UPDATE registered_service SET " +
30 31
            "name = ? " +
31
            " WHERE aai_id = ?";
32
            "WHERE client_id = ?";
32 33

  
33 34
    private final static String DELETE = "DELETE FROM registered_service WHERE id = ?";
34 35

  
......
42 43
            @Override
43 44
            public void prepare(PreparedStatement stmt)
44 45
                    throws SQLException {
45
                stmt.setString(1, registeredService.getAai_id());
46
                stmt.setString(1, registeredService.getClientId());
46 47
                stmt.setString(2, registeredService.getOwner());
47 48
                stmt.setString(3, registeredService.getName());
48 49
                stmt.setTimestamp(4, registeredService.getDate());
50
                stmt.setString(5, registeredService.getRegistrationAccessToken());
49 51
            }
50 52
        });
51 53
    }
......
53 55
    @Override
54 56
    public boolean update(final RegisteredService registeredService) throws SQLException {
55 57
        System.out.println("UPDATE registered_service SET " +
56
                        " name = " + registeredService.getName() +
57
                        " WHERE aai_id = " +  registeredService.getAai_id());
58
                        "name = " + registeredService.getName() +
59
                        "WHERE client_id = " +  registeredService.getClientId());
58 60
        return executeUpdate(UPDATE, new Statement.Initializer() {
59 61

  
60 62
            @Override
61 63
            public void prepare(PreparedStatement stmt)
62 64
                    throws SQLException {
63 65
                stmt.setString(1, registeredService.getName());
64
                stmt.setString(2, registeredService.getAai_id());
66
                stmt.setString(2, registeredService.getClientId());
65 67
            }
66 68
        }) > 0;
67 69
    }
......
144 146
        RegisteredService registeredService = new RegisteredService();
145 147

  
146 148
        registeredService.setId(set.getString("id"));
147
        registeredService.setAai_id(set.getString("aai_id"));
149
        registeredService.setClientId(set.getString("client_id"));
148 150
        registeredService.setOwner(set.getString("owner"));
149 151
        registeredService.setName(set.getString("name"));
150 152
        registeredService.setDate(set.getTimestamp("creation_date"));
153
        registeredService.setRegistrationAccessToken(set.getString("registration_access_token"));
151 154

  
152 155
        return registeredService;
153 156
    }
modules/uoa-user-management/trunk/create-table
12 12

  
13 13
CREATE TABLE registered_service (
14 14
 id SERIAL PRIMARY KEY,
15
 aai_id VARCHAR(255) NOT NULL,
15
 client_id VARCHAR(255) NOT NULL,
16 16
 owner VARCHAR(255) NOT NULL,
17 17
 name VARCHAR(255) NOT NULL,
18
 creation_date TIMESTAMP NOT NULL
18
 creation_date TIMESTAMP NOT NULL,
19
 registration_access_token TEXT NOT NULL
19 20
);
20 21

  
21 22
GRANT ALL PRIVILEGES ON TABLE registered_service TO postgresi2;

Also available in: Unified diff