/ - Diff - D-Net - D-Net project tracking tool

     package eu.dnetlib.openaire.user;
     import junit.framework.Test;
     import junit.framework.TestCase;
     import junit.framework.TestSuite;
     /**
      * Unit test for simple App.
      */
     public class AppTest
         extends TestCase
+    {
         /**
          * Create the test case
+         *
          * @param testName name of the test case
          */
         public AppTest( String testName )
+        {
             super( testName );
+        }
         /**
          * @return the suite of tests being tested
          */
         public static Test suite()
+        {
             return new TestSuite( AppTest.class );
+        }
         /**
          * Rigourous Test :-)
          */
         public void testApp()
+        {
             assertTrue( true );
+        }
+    }

     package eu.dnetlib.openaire.user.ldap;
     import com.unboundid.ldap.sdk.*;
     import eu.dnetlib.openaire.user.pojos.migration.LDAPUser;
     import org.junit.Before;
     import org.junit.Test;
     /**
      * Created by kiatrop on 27/9/2017.
      */
     public class LDAPEnhancer {
         LDAPConnection ldapConnector;
         String ldapUsersDN;
         @Before
         public void init() throws LDAPException {
             ldapConnector = new LDAPConnection("esperos.di.uoa.gr", 389, "cn=admin,dc=openaire,dc=eu", "serenata");
             ldapUsersDN = "ou=users,dc=openaire,dc=eu";
+        }
         @Test
         public void enhance() throws LDAPSearchException {
             Filter filter = Filter.createEqualityFilter("ou", "users");
             SearchRequest searchRequest = new SearchRequest(ldapUsersDN, SearchScope.SUBORDINATE_SUBTREE, filter);
             SearchResult searchResult = ldapConnector.search(searchRequest);
             for (SearchResultEntry entry : searchResult.getSearchEntries()) {
                 System.out.println(entry.getAttribute("dn"));
+            }
+        }
         @Test
         public void getUserTest() throws LDAPSearchException {
                 String usersDN =  "ou=users,dc=openaire,dc=eu";
                     Filter filter = Filter.createEqualityFilter("cn","kiatrop");
                     SearchRequest searchRequest =
                             new SearchRequest(usersDN, SearchScope.SUB, filter, "mail", "displayName", "cn");
                     SearchResult searchResult = ldapConnector.search(searchRequest);
                     LDAPUser user = new LDAPUser();
                     for (SearchResultEntry entry : searchResult.getSearchEntries()) {
                         System.out.println(entry.getAttributeValue("cn"));
                         System.out.println(entry.getAttributeValue("mail"));
                         System.out.println(entry.getAttributeValue("displayName"));
+                    }
+            }
+    }

     openaire.users.db.driverClassName = org.postgresql.Driver
     openaire.users.db.url = jdbc:postgresql://mpagasas.di.uoa.gr:5433/MigrationUser
     openaire.users.db.username = postgres
     openaire.users.db.password = 1@3$56213980
     services.userman.ldap.address = esperos.di.uoa.gr
     services.userman.ldap.username = cn=admin,dc=openaire,dc=eu
     services.userman.ldap.usersDN = ou=users,dc=openaire,dc=eu
     services.userman.ldap.zombiesDN = ou=zombies,dc=openaire,dc=eu
     services.userman.ldap.password = serenata
     services.userman.ldap.port = 389
     #email sender properties
     mail.smtp.host = smtp.gmail.com
     mail.smtp.port = 587
     mail.smtp.auth = true
     mail.users.username = openaire.test@gmail.com
     #mail.users.password = P@ssw0rD
     mail.smtp.from = openaire.test@gmail.com
     mail.users.password = ^($*@$)*!$

     <?xml version="1.0" encoding="UTF-8"?>
     <beans xmlns="http://www.springframework.org/schema/beans"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xmlns:context="http://www.springframework.org/schema/context"
            xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
     		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
            default-autowire="byType">
         <bean id="ldapConnector" class="eu.dnetlib.openaire.user.store.LDAPConnector">
             <property name="address" value="${services.userman.ldap.address}"/>
             <property name="username" value="${services.userman.ldap.username}"/>
             <property name="usersDN" value="${services.userman.ldap.usersDN}" />
             <property name="zombiesDN" value="${services.userman.ldap.zombiesDN}" />
             <property name="password" value="${services.userman.ldap.password}" />
             <property name="port" value="${services.userman.ldap.port}" />
         </bean>
         <bean id="ldapActions" class="eu.dnetlib.openaire.user.utils.LDAPActions">
             <property name="ldapConnector" ref="ldapConnector"/>
         </bean>
         <bean id="emailSender" class="eu.dnetlib.openaire.user.utils.EmailSender" >
             <property name="username" value="${mail.users.username}"/>
             <property name="password" value="${mail.users.password}"/>
             <property name="host" value="${mail.smtp.host}" />
             <property name="port" value="${mail.smtp.port}" />
             <property name="from" value="${mail.smtp.from}" />
             <property name="auth" value="${mail.smtp.auth}" />
         </bean>
         <bean id="mUserActionsLDAP" class="eu.dnetlib.openaire.user.ldap.MUserActionsLDAP"/>
         <context:component-scan base-package="eu.dnetlib.openaire.user.*"/>
         <context:component-scan base-package="eu.dnetlib.openaire.usermanagement.*"/>
         <context:annotation-config></context:annotation-config>
     </beans>

     package eu.dnetlib.openaire.user.pojos;
     import java.io.Serializable;
     import java.sql.Timestamp;
     import java.util.Date;
     public class RegisteredService implements Serializable {
         private String id;
         private String client_id;
         private String name;
         private String owner;
         private Timestamp date;
         private String registration_access_token;
         private String keyType;
         public RegisteredService() {
+        }
         public RegisteredService(String client_id, String owner, String name, String registration_access_token) {
             this.client_id = client_id;
             this.owner = owner;
             this.name = name;
             this.date = new Timestamp(new Date().getTime());
             this.registration_access_token = registration_access_token;
             this.keyType = null;
+        }
         public RegisteredService(String client_id, String owner, String name, String registration_access_token, String keyType) {
             this.client_id = client_id;
             this.owner = owner;
             this.name = name;
             this.date = new Timestamp(new Date().getTime());
             this.registration_access_token = registration_access_token;
             this.keyType = keyType;
+        }
         public String getId() {
             return id;
+        }
         public void setId(String id) {
             this.id = id;
+        }
         public String getClientId() {
             return client_id;
+        }
         public void setClientId(String client_id) {
             this.client_id = client_id;
+        }
         public String getName() {
             return name;
+        }
         public void setName(String name) {
             this.name = name;
+        }
         public String getOwner() {
             return owner;
+        }
         public void setOwner(String owner) {
             this.owner = owner;
+        }
         public Timestamp getDate() {
             return date;
+        }
         public void setDate(Timestamp date) {
             this.date = date;
+        }
         public String getRegistrationAccessToken() {
             return registration_access_token;
+        }
         public void setRegistrationAccessToken(String registration_access_token) {
             this.registration_access_token = registration_access_token;
+        }
         public String getKeyType() {
             return keyType;
+        }
         public void setKeyType(String keyType) {
             this.keyType = keyType;
+        }
+    }

     package eu.dnetlib.openaire.user.pojos;
     import java.sql.Timestamp;
     /**
      * Created by sofia on 3/10/2017.
      */
     public class UserVerification {
         private int id;
         private String username;
         private String verificationCode;
         private Timestamp date;
         public UserVerification() {
+        }
         public UserVerification(String username) {
             this.username = username;
+        }
         public int getId(){
             return id;
+        }
         public void setId(int id){
             this.id = id;
+        }
         public String getUsername() {
             return username;
+        }
         public void setUsername(String username) {
             this.username = username;
+        }
         public String getVerificationCode() {
             return verificationCode;
+        }
         public void setVerificationCode(String verificationCode) {
             this.verificationCode = verificationCode;
+        }
         public Timestamp getDate() {
             return date;
+        }
         public void setDate(Timestamp date) {
             this.date = date;
+        }
+    }

     package eu.dnetlib.openaire.user.pojos;
     import java.sql.Timestamp;
     public class RoleVerification {
         private String id;
         private String email;
         private String verificationCode;
         private String verificationType;
         private String type;
         private String entity;
         private Timestamp date;
         public RoleVerification() { }
         public String getId() {
             return id;
+        }
         public void setId(String id) {
             this.id = id;
+        }
         public String getEmail() {
             return email;
+        }
         public void setEmail(String email) {
             this.email = email;
+        }
         public String getVerificationCode() {
             return verificationCode;
+        }
         public void setVerificationCode(String verificationCode) {
             this.verificationCode = verificationCode;
+        }
         public String getVerificationType() {
             return verificationType;
+        }
         public void setVerificationType(String verificationType) {
             this.verificationType = verificationType;
+        }
         public String getType() {
             return type;
+        }
         public void setType(String type) {
             this.type = type;
+        }
         public String getEntity() {
             return entity;
+        }
         public void setEntity(String entity) {
             this.entity = entity;
+        }
         public Timestamp getDate() {
             return date;
+        }
         public void setDate(Timestamp date) {
             this.date = date;
+        }
+    }

     package eu.dnetlib.openaire.user.pojos;
     /**
      * Created by sofia on 17/5/2018.
      */
     public class Email {
         String email;
         String type;
         String subject;
         String body;
         String signature;
         public String getEmail() {
             return email;
+        }
         public void setEmail(String email) {
             this.email = email;
+        }
         public String getType() {
             return type;
+        }
         public void setType(String type) {
             this.type = type;
+        }
         public String getSubject() {
             return subject;
+        }
         public void setSubject(String subject) {
             this.subject = subject;
+        }
         public String getBody() {
             return body;
+        }
         public void setBody(String body) {
             this.body = body;
+        }
         public String getSignature() {
             return signature;
+        }
         public void setSignature(String signature) {
             this.signature = signature;
+        }
+    }

     package eu.dnetlib.openaire.user.pojos.migration;
     import java.io.Serializable;
     /**
      * Created by sofia on 1/11/2016.
      */
     public class MigrationUser implements Serializable {
         private int id;
         private String username; // LDAP's cn, it is unique key
         private String fullname; // LDAP's display name
         private String email;
         private int roleId;
         public MigrationUser() {
+        }
         public MigrationUser(String username) {
             this.username = username;
+        }
         public MigrationUser(int id, String username, String fullname, String email, int roleId) {
             this.id = id;
             this.username = username;
             this.fullname = fullname;
             this.email = email;
             this.roleId = roleId;
+        }
         public int getId(){
             return id;
+        }
         public void setId(int id){
             this.id = id;
+        }
         public String getUsername(){
             return username;
+        }
         public void setUsername(String username){
             this.username = username;
+        }
         public String getFullname(){
             return fullname;
+        }
         public void setFullname(String fullname){
             this.fullname = fullname;
+        }
         public String getEmail(){
             return email;
+        }
         public void setEmail(String email){
             this.email = email;
+        }
         public int getRoleId(){
             return roleId;
+        }
         public void setRoleId(int roleId){
             this.roleId = roleId;
+        }
+    }

     package eu.dnetlib.openaire.user.pojos.migration;
     import java.io.Serializable;
     import java.util.List;
     import java.util.Map;
     /**
      * Created by sofia on 15/6/2016.
      */
     public class User implements Serializable{
         private String id;
         private String username;
         private String password;
         private String email;
         private String name;
         private String surname;
         private Map<String, List<String>> roles;
         //private int orcid;
         //private String affiliation;
         //private String profil_provenance;
     //Map<String, List<String>> roles = new HashMap<String, List<String>>();
         public User(){
+        }
         public User(String username) {
             this.username = username;
+        }
         public User(String id, String username, String password, String email, String name, String surname){
             this.id = id;
             this.username = username;
             this.password = password;
             this.email = email;
             this.name = name;
             this.surname = surname;
+        }
         public String getId(){
             return id;
+        }
         public void setId(String id){
             this.id = id;
+        }
         public String getUsername() {
             return username;
+        }
         public void setUsername(String username) {
             this.username = username;
+        }
         public String getPassword() {
             return password;
+        }
         public void setPassword(String password) {
             this.password = password;
+        }
         public String getEmail() {
             return email;
+        }
         public void setEmail(String email) {
             this.email = email;
+        }
         public String getName() {
             return name;
+        }
         public void setName(String name) {
             this.name = name;
+        }
         public String getSurname() {
             return surname;
+        }
         public void setSurname(String surname) {
             this.surname = surname;
+        }
         public void setRoles(Map<String, List<String>> map)
+        {
             this.roles = map;
+        }
         public Map<String, List<String>> getValue()
+        {
             return this.roles;
+        }
         public void register(){
+        }
         public void update(){
+        }
         public void login(){
+        }
+    }

     package eu.dnetlib.openaire.user.pojos.migration;
     /**
      * Created by sofia on 29/11/2016.
      */
     public class LDAPUser {
         private String cn;
         private String displayName;
         private String email;
         public LDAPUser(){
+        }
         public LDAPUser(String cn, String displayName, String email)
+        {
             this.cn = cn;
             this.displayName = displayName;
             this.email = email;
+        }
         public String getCn() {
             return cn;
+        }
         public void setCn(String cn) {
             this.cn = cn;
+        }
         public String getDisplayName() {
             return displayName;
+        }
         public void setDisplayName(String displayName) {
             this.displayName = displayName;
+        }
         public String getEmail() {
             return email;
+        }
         public void setEmail(String email) {
             this.email = email;
+        }
+    }

     package eu.dnetlib.openaire.user.pojos.migration;
     import java.io.Serializable;
     /**
      * Created by sofia on 8/11/2016.
      */
     public class Role implements Serializable
+    {
         private int id;
         private String role;
         public Role() {
+        }
         public Role(int id) {
             this.id = id;
+        }
         public Role(String role) {
             this.role = role;
+        }
         public Role(int id, String role){
             this.id = id;
             this.role = role;
+        }
         public int getId(){
             return id;
+        }
         public void setId(int id){
             this.id = id;
+        }
         public String getRole() {
             return role;
+        }
         public void setRole(String role) {
             this.role = role;
+        }
+    }

     package eu.dnetlib.openaire.user.store;
     import java.sql.PreparedStatement;
     import java.sql.SQLException;
     /**
      * Created by sofia on 28/6/2016.
      */
     public class Statement
+    {
         public interface Initializer {
             void prepare(PreparedStatement stmt) throws SQLException;
+        }
         private static final Initializer EMPTY = new Initializer() {
             @Override
             public void prepare(PreparedStatement stmt) throws SQLException {}
         };
         public static Initializer emptyInitializer() {
             return EMPTY;
+        }
+    }

     package eu.dnetlib.openaire.user.store;
     import org.apache.commons.dbcp.BasicDataSource;
     import org.apache.log4j.Logger;
     import org.springframework.beans.factory.annotation.Value;
     import org.springframework.stereotype.Component;
     import javax.annotation.PostConstruct;
     import javax.sql.DataSource;
     import java.sql.Connection;
     import java.sql.DriverManager;
     import java.sql.SQLException;
     /**
      * Created by sofia on 31/10/2016.
      */
     @Component(value = "dataSourceConnector")
     public class DataSourceConnector {
         @Value("${openaire.users.db.username}")
         private String username;
         @Value("${openaire.users.db.password}")
         private String password;
         @Value("${openaire.users.db.url}")
         private String dbUrl;
         @Value("${openaire.users.db.driverClassName}")
         private String driver;
         private static boolean driverLoad = false;
         private DataSource datasource;
         private static final Logger logger = Logger.getLogger(DataSourceConnector.class);
         @PostConstruct
         public void init() {
             logger.info("Initializing data source");
             try {
                 Class.forName(driver);
                 driverLoad = true;
                 BasicDataSource bds = new BasicDataSource();
                 bds.setDriverClassName(driver);
                 bds.setUrl(dbUrl);
                 bds.setUsername(username);
                 bds.setPassword(password);
                 bds.setMaxIdle(10);
                 bds.setMaxActive(100);
                 bds.setMaxWait(10000);
                 bds.setValidationQuery("select 1");
                 bds.setTestOnBorrow(true);
                 bds.setTestWhileIdle(true);
                 bds.setTimeBetweenEvictionRunsMillis(1200000);
                 bds.setMinEvictableIdleTimeMillis(1800000);
                 bds.setNumTestsPerEvictionRun(5);
                 bds.setDefaultAutoCommit(true);
                 this.datasource = bds;
                 // Test Connection
                 getConnection().close();
                 logger.info("Datasource " + datasource);
                 logger.info(datasource.getConnection());
             } catch (ClassNotFoundException | SQLException exc) {
                 logger.error("Unable to connenct to the DB. ", exc);
                 throw new RuntimeException(exc);
+            }
+        }
         public Connection getConnection() throws SQLException {
             logger.debug("dbUrl " + dbUrl);
             return DriverManager.getConnection(dbUrl, username, password);
             //return DriverManager.getConnection("jdbc:postgresql://localhost:5433/MigrationUser?user=postgres&password=mypassword");
+        }
         public String getUsername() {
             return username;
+        }
         public void setUsername(String username) {
             this.username = username;
+        }
         public String getPassword() {
             return password;
+        }
         public void setPassword(String password) {
             this.password = password;
+        }
         public String getDbUrl() {
             return dbUrl;
+        }
         public void setDbUrl(String dbUrl) {
             this.dbUrl = dbUrl;
+        }
         public String getDriver() {
             return driver;
+        }
         public void setDriver(String driver) {
             this.driver = driver;
+        }
         public DataSource getDatasource() {
             return datasource;
+        }
+    }

     package eu.dnetlib.openaire.user.store;
     /**
      * Created by sofia on 29/6/2016.
      */
     public class Connector
+    {
+    }

     package eu.dnetlib.openaire.user.store;
     import com.unboundid.ldap.sdk.LDAPConnection;
     import com.unboundid.ldap.sdk.LDAPException;
     import org.apache.log4j.Logger;
     /**
      * Created by sofia on 3/10/2016.
      */
     public class LDAPConnector
+    {
         private String address;
         private String username;
         private String usersDN;
         private String zombiesDN;
         private String password;
         private int port;
         private static Logger logger = Logger.getLogger(LDAPConnector.class);
         public LDAPConnection getConnection() throws LDAPException {
             logger.debug("Getting ldap connection");
             return new LDAPConnection(address, port, username, password);
+        }
         public String getAddress() {
             return address;
+        }
         public void setAddress(String address) {
             this.address = address;
+        }
         public String getUsername() {
             return username;
+        }
         public void setUsername(String username) {
             this.username = username;
+        }
         public String getUsersDN() {
             return usersDN;
+        }
         public void setUsersDN(String usersDN) {
             this.usersDN = usersDN;
+        }
         public String getZombiesDN() {
             return zombiesDN;
+        }
         public void setZombiesDN(String zombiesDN) {
             this.zombiesDN = zombiesDN;
+        }
         public String getPassword() {
             return password;
+        }
         public void setPassword(String password) {
             this.password = password;
+        }
         public int getPort() {
             return port;
+        }
         public void setPort(int port) {
             this.port = port;
+        }
+    }

     package eu.dnetlib.openaire.user.handler;
     import eu.dnetlib.openaire.user.pojos.migration.User;
     import java.util.List;
     /**
      * Created by sofia on 4/8/2016.
      */
     public interface  UserHandler {
         public List<User> fetchAllUsers(int limit, int offset, String keyword, String orderby, boolean descending, List<String> listTypes);
         public List<User> fetchAllUsers(int limit, int offset);
         public int countAllUsers(String s, List<String> strings);
         public User fetchUserById(String userId);
         public List<User> fetchUsersByResult(String userId, int limit, int offset, String keyword, String orderby, boolean descending, List<String> listTypes);
         public int countUsersByResult(String userId, String keyword, List<String> listTypes);
+    }

     package eu.dnetlib.openaire.user.queries;
     /**
      * Created by sofia on 8/11/2016.
      */
     public interface RoleQueries {
         // Queries (as prepared statements to avoid SQL-injection)
         String FETCH_ALL     = "SELECT * FROM roles";
         String FETCH_BY_ID   = "SELECT * FROM roles WHERE id = ?";
         String FETCH_BY_ROLE = "SELECT * FROM roles WHERE role = ?";
         String COUNT_ALL = "SELECT COUNT(*) FROM role";
         String INSERT = "INSERT INTO roles (" +
                 "role" +
                 ") VALUES (?)";
         String UPDATE = "UPDATE roles SET " +
                 "role = ? " +
                 "WHERE id = ?";
         String DELETE = "DELETE FROM roles WHERE id = ?";
+    }

     package eu.dnetlib.openaire.user.queries;
     /**
      * Created by sofia on 3/10/2017.
      */
     public interface UserVerificationQueries {
         String FETCH_ALL                  = "SELECT * FROM user_verification";
         String FETCH_BY_ID                = "SELECT * FROM user_verification WHERE id = ?";
         String FETCH_BY_USERNAME          = "SELECT * FROM user_verification WHERE username = ?";
         String FETCH_BY_VERIFICATION_CODE = "SELECT * FROM user_verification WHERE verification_code = ?";
         String FETCH_BY_DATE              = "SELECT * FROM user_verification WHERE date = ?";
         String COUNT_ALL = "SELECT COUNT(*) FROM user_verification";
         String INSERT = "INSERT INTO user_verification (" +
                 "username, " +
                 "verification_code, " +
                 "date " +
                 ") VALUES (?,?,?)";
         String UPDATE = "UPDATE user_verification SET " +
                 "username = ?, " +
                 "verification_code = ?, " +
                 "date = ? " +
                 "WHERE id = ?";
         String DELETE = "DELETE FROM user_verification WHERE username = ?";
+    }

     package eu.dnetlib.openaire.user.queries;
     public interface RoleVerificationQueries {
         String FETCH_ALL = "SELECT * FROM role_verification";
         String FETCH_BY_ID = "SELECT * FROM role_verification WHERE id = ?";
         String FETCH_BY_EMAIL_TYPE_ENTITY_VERIFICATION_TYPE = "SELECT * FROM role_verification " +
                 "WHERE email = ? AND type = ? AND entity = ? AND verification_type = ?";
         String FETCH_BY_TYPE_ENTITY_VERIFICATION_TYPE = "SELECT DISTINCT email FROM role_verification " +
                 "WHERE type = ? AND entity = ? AND verification_type = ?";
         String COUNT_ALL = "SELECT COUNT(*) FROM role_verification";
         String INSERT = "INSERT INTO role_verification (" +
                 "id, " +
                 "email, " +
                 "verification_code, " +
                 "verification_type, " +
                 "type, " +
                 "entity, " +
                 "date " +
                 ") VALUES (?,?,?,?,?,?,?)";
         String UPDATE = "UPDATE role_verification SET " +
                 "id = ?, " +
                 "username = ?, " +
                 "verification_code = ?, " +
                 "verification_type = ?, " +
                 "type = ?, " +
                 "entity = ?, " +
                 "date = ? " +
                 "WHERE id = ?";
         String DELETE = "DELETE FROM role_verification WHERE id = ?";
+    }

     package eu.dnetlib.openaire.user.queries;
     /**
      * Created by sofia on 1/11/2016.
      */
     public interface SQLMigrationUserQueries {
         // Queries (as prepared statements to avoid SQL-injection)
         String FETCH_ALL         = "SELECT * FROM users";
         String FETCH_BY_ID       = "SELECT * FROM users WHERE id = ?";
         String FETCH_BY_USERNAME = "SELECT * FROM users WHERE username = ?";
         String FETCH_BY_FULLNAME = "SELECT * FROM users WHERE fullname = ?";
         String FETCH_BY_EMAIL    = "SELECT * FROM users WHERE email = ?";
         String FETCH_BY_ROLE_ID  = "SELECT * FROM users WHERE role_id = ?";
         String COUNT_ALL = "SELECT COUNT(*) FROM users";
         String INSERT = "INSERT INTO users (" +
                 "username, " +
                 "fullname, " +
                 "email, " +
                 "role_id" +
                 ") VALUES (?,?,?,?)";
         String UPDATE = "UPDATE users SET " +
                 "username = ?, " +
                 "fullname = ?, " +
                 "email = ?, " +
                 "role_id = ? " +
                 "WHERE id = ?";
         String DELETE = "DELETE FROM users WHERE id = ?";
+    }

     package eu.dnetlib.openaire.user.registeredService;
     import eu.dnetlib.openaire.user.pojos.RegisteredService;
     import eu.dnetlib.openaire.user.store.DataSourceConnector;
     import eu.dnetlib.openaire.user.store.Statement;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.stereotype.Component;
     import java.sql.Connection;
     import java.sql.PreparedStatement;
     import java.sql.ResultSet;
     import java.sql.SQLException;
     import java.util.ArrayList;
     import java.util.List;
     @Component(value = "registeredServiceSQL")
     public class RegisteredServiceSQL implements RegisteredServiceDao {
         @Autowired
         DataSourceConnector dataSourceConnector;
         private final static String INSERT = "INSERT INTO registered_service (" +
                 "client_id, " +
                 "owner, " +
                 "name, " +
                 "creation_date, " +
                 "registration_access_token," +
                 "key_type" +
                 ") VALUES (?,?,?,?,?,?)";
         private final static String UPDATE = "UPDATE registered_service SET " +
                 "name = ?, key_type = ? " +
                 "WHERE client_id = ?";
         private final static String DELETE = "DELETE FROM registered_service WHERE id = ?";
         private final static String SELECT = "SELECT * FROM registered_service WHERE owner = ? ORDER BY creation_date DESC";
         private final static String COUNT = "SELECT COUNT(*) FROM registered_service WHERE owner = ?";
         @Override
         public int insertRegisteredService(final RegisteredService registeredService)
                 throws SQLException {
             return executeUpdate(INSERT, new Statement.Initializer() {
                 @Override
                 public void prepare(PreparedStatement stmt)
                         throws SQLException {
                     stmt.setString(1, registeredService.getClientId());
                     stmt.setString(2, registeredService.getOwner());
                     stmt.setString(3, registeredService.getName());
                     stmt.setTimestamp(4, registeredService.getDate());
                     stmt.setString(5, registeredService.getRegistrationAccessToken());
                     stmt.setString(6, registeredService.getKeyType());
+                }
             });
+        }
         @Override
         public boolean update(final RegisteredService registeredService) throws SQLException {
             System.out.println("UPDATE registered_service SET " +
                             "name = " + registeredService.getName() +
                             ", key_type = " + registeredService.getKeyType() +
                             " WHERE client_id = " +  registeredService.getClientId());
             return executeUpdate(UPDATE, new Statement.Initializer() {
                 @Override
                 public void prepare(PreparedStatement stmt)
                         throws SQLException {
                     stmt.setString(1, registeredService.getName());
                     stmt.setString(2, registeredService.getKeyType());
                     stmt.setString(3, registeredService.getClientId());
+                }
             }) > 0;
+        }
         @Override
         public boolean delete(final int id)
                 throws SQLException {
             System.out.println("DELETE FROM registered_service WHERE id = " + id);
             return executeUpdate(DELETE, new Statement.Initializer() {
                 @Override
                 public void prepare(PreparedStatement stmt)
                         throws SQLException {
                     stmt.setInt(1, id);
+                }
             }) > 0;
+        }
         @Override
         public RegisteredService fetchRegisteredServiceById(final int id) throws SQLException {
             System.out.println("SELECT * FROM registered_service WHERE id = " +id);
             List<RegisteredService> registeredServices = executeQuery("SELECT * FROM registered_service WHERE id = ? ", new Statement.Initializer() {
                 @Override
                 public void prepare(PreparedStatement stmt) throws SQLException {
                     stmt.setInt(1, id);
+                }
             });
             if (registeredServices.isEmpty()) {
                 return null;
+            }
             return registeredServices.get(0);
+        }
         @Override
         public List<RegisteredService> fetchAllRegisteredServicesByOwner(final String owner) throws SQLException {
             List<RegisteredService> registeredServices = executeQuery(SELECT, new Statement.Initializer() {
                 @Override
                 public void prepare(PreparedStatement stmt) throws SQLException {
                     stmt.setString(1, owner);
+                }
             });
             return registeredServices;
+        }
         protected List<RegisteredService> executeQuery(String sql, Statement.Initializer init)
                 throws SQLException {
             Connection connection = dataSourceConnector.getDatasource().getConnection();
             try {
                 PreparedStatement stmt = connection.prepareStatement(sql);
                 init.prepare(stmt);
                 ResultSet set = stmt.executeQuery();
                 try {
                     List<RegisteredService> results = new ArrayList<>();
                     while (set.next())
                         results.add(fromResultSet(set));
                     return results;
                 } finally {
                     set.close();
+                }
             } finally {
                 connection.close();
+            }
+        }
         protected List<RegisteredService> executeQuery(String sql)
                 throws SQLException {
             return executeQuery(sql, Statement.emptyInitializer());
+        }
         protected RegisteredService fromResultSet(ResultSet set) throws SQLException {
             RegisteredService registeredService = new RegisteredService();
             registeredService.setId(set.getString("id"));
             registeredService.setClientId(set.getString("client_id"));
             registeredService.setOwner(set.getString("owner"));
             registeredService.setName(set.getString("name"));
             registeredService.setDate(set.getTimestamp("creation_date"));
             registeredService.setRegistrationAccessToken(set.getString("registration_access_token"));
             registeredService.setKeyType(set.getString("key_type"));
             return registeredService;
+        }
         protected int executeUpdate(String sql, Statement.Initializer init)
                 throws SQLException {
             Connection connection = dataSourceConnector.getDatasource().getConnection();
             try {
                 PreparedStatement stmt = connection.prepareStatement(sql);
                 init.prepare(stmt);
                 return stmt.executeUpdate();
             } finally {
                 connection.close();
+            }
+        }
         public long countRegisteredServices(String owner) throws SQLException {
             long numberOfRegisteredServices = executeCount(COUNT, new Statement.Initializer() {
                 @Override
                 public void prepare(PreparedStatement stmt) throws SQLException {
                     stmt.setString(1, owner);
+                }
             });
             return numberOfRegisteredServices;
+        }
         public long executeCount(String sql, Statement.Initializer init) throws SQLException {
             Connection connection = dataSourceConnector.getDatasource().getConnection();
             try {
                 PreparedStatement stmt = connection.prepareStatement(sql);
                 init.prepare(stmt);
                 ResultSet set = stmt.executeQuery();
                 try {
                     if (set.next())
                         return set.getLong(1);
                     throw new IllegalArgumentException(stmt.toString());
                 } finally {
                     set.close();
+                }
             } finally {
                 connection.close();
+            }
+        }
+    }

modules/uoa-user-management/tags/uoa-user-management-2.0.2/trunk/src/main/java/eu/dnetlib/openaire/user/registeredService/RegisteredServiceActions.java
1		package eu.dnetlib.openaire.user.registeredService;
2
3		public class RegisteredServiceActions {
4
5		}

     package eu.dnetlib.openaire.user.registeredService;
     import eu.dnetlib.openaire.user.pojos.RegisteredService;
     import java.sql.SQLException;
     import java.util.List;
     public interface RegisteredServiceDao {
         public int insertRegisteredService(RegisteredService registeredService) throws SQLException;
         public boolean update(final RegisteredService registeredService) throws SQLException;
         public boolean delete(int id) throws SQLException;
         public RegisteredService fetchRegisteredServiceById(int id) throws SQLException;
         public List<RegisteredService> fetchAllRegisteredServicesByOwner(String owner) throws SQLException;
         public long countRegisteredServices(String owner) throws SQLException;
+    }

     package eu.dnetlib.openaire.user.actions;
     /**
      * Created by sofia on 31/10/2016.
      */
     public interface IUserActions {
         public String addUser(String email, String password) throws Exception;
         public boolean activateUser(String activationId) throws Exception;
         public boolean isUserActivated(String email) throws Exception;
         public boolean userExists(String email) throws Exception;
         public boolean usernameExists(String username) throws Exception;
         public boolean correctCreds(String email, String password) throws Exception;
         public String prepareResetPassword(String email) throws Exception;
         public void resetPassword(String uuid, String password) throws Exception;
         public boolean isAdmin(String email) throws Exception;
         public void editUser(String email, String fname, String lname, String inst)
                 throws Exception;
         public String addUser(String username, String email, String password,
                               String firstName, String lastName) throws Exception;
         public String getEmailFromUsername(String username) throws Exception;
         //public UserProfile getUser(String userIdentifier) throws Exception;
+    }

     package eu.dnetlib.openaire.user.ldap;
     import com.unboundid.ldap.sdk.*;
     import eu.dnetlib.openaire.user.dao.RoleDAO;
     import eu.dnetlib.openaire.user.dao.SQLMigrationUserDAO;
     import eu.dnetlib.openaire.user.pojos.migration.LDAPUser;
     import eu.dnetlib.openaire.user.pojos.migration.MigrationUser;
     import eu.dnetlib.openaire.user.pojos.migration.Role;
     import eu.dnetlib.openaire.user.store.LDAPConnector;
     import org.apache.log4j.Logger;
     import org.springframework.beans.factory.annotation.Autowired;
     import java.sql.SQLException;
     /**
      * Created by sofia on 7/11/2016.
      */
     public class MUserActionsLDAP {
         @Autowired
         private LDAPConnector ldapConnector;

Project

General

Profile

D-Net

Revision 60080

Added by Katerina Iatropoulou over 3 years ago