From e4c92f8d353412ab29ac956963d72daf267eac35 Mon Sep 17 00:00:00 2001 From: SaraLavanchyUTNMDP Date: Fri, 4 May 2018 10:44:02 -0300 Subject: [PATCH 1/4] topic0 version 2 --- src/AbstractFactory/ConnectionFactory.java | 24 ++++++++++ src/AbstractFactory/ConnectionProducer.java | 26 +++++++++++ .../ConnectionsAbstractFactory.java | 7 +++ src/Builder/Builder.java | 9 ++++ src/Builder/Director.java | 14 ++++++ src/Builder/MySQLBuilder.java | 19 ++++++++ src/Connections/Connection.java | 18 ++++++++ src/Connections/DataBaseConnection.java | 45 +++++++++++++++++++ src/Drivers/DriverConnection.java | 7 +++ src/Drivers/MySQLDriverManager.java | 13 ++++++ src/Drivers/SQLDriverManager.java | 14 ++++++ src/Main.java | 13 ++++++ src/Proxy.java | 28 ++++++++++++ 13 files changed, 237 insertions(+) create mode 100644 src/AbstractFactory/ConnectionFactory.java create mode 100644 src/AbstractFactory/ConnectionProducer.java create mode 100644 src/AbstractFactory/ConnectionsAbstractFactory.java create mode 100644 src/Builder/Builder.java create mode 100644 src/Builder/Director.java create mode 100644 src/Builder/MySQLBuilder.java create mode 100644 src/Connections/Connection.java create mode 100644 src/Connections/DataBaseConnection.java create mode 100644 src/Drivers/DriverConnection.java create mode 100644 src/Drivers/MySQLDriverManager.java create mode 100644 src/Drivers/SQLDriverManager.java create mode 100644 src/Main.java create mode 100644 src/Proxy.java diff --git a/src/AbstractFactory/ConnectionFactory.java b/src/AbstractFactory/ConnectionFactory.java new file mode 100644 index 0000000..c17fe74 --- /dev/null +++ b/src/AbstractFactory/ConnectionFactory.java @@ -0,0 +1,24 @@ +package AbstractFactory; + +import Drivers.DriverConnection; +import Drivers.MySQLDriverManager; +import Drivers.SQLDriverManager; + +public class ConnectionFactory extends ConnectionsAbstractFactory { + @Override + public DriverConnection getConnection(String SQL) { + if( SQL == null) { + return null; + } + + if(SQL.equalsIgnoreCase("MySql")) { + return new MySQLDriverManager(); + + } else if(SQL.equalsIgnoreCase("SqlServer")) { + return new SQLDriverManager(); + } + + return null; + + } +} diff --git a/src/AbstractFactory/ConnectionProducer.java b/src/AbstractFactory/ConnectionProducer.java new file mode 100644 index 0000000..b284dc4 --- /dev/null +++ b/src/AbstractFactory/ConnectionProducer.java @@ -0,0 +1,26 @@ +package AbstractFactory; + +import Connections.Connection; +import Drivers.MySQLDriverManager; +import Drivers.SQLDriverManager; + +public class ConnectionProducer { + private static Connection connection; + + public static Connection getConnection(String choise, String dataBase, String user, String password) { + if( choise == null) { + connection = null; + } + + if(choise.equalsIgnoreCase("MySql")) { + MySQLDriverManager mySql= new MySQLDriverManager(); + connection = mySql.getConnection(dataBase, user, password); + + } else if(choise.equalsIgnoreCase("SqlServer")) { + SQLDriverManager sqlServer = new SQLDriverManager(); + connection = sqlServer.getConnection(dataBase, user, password); + } + + return connection; + } +} diff --git a/src/AbstractFactory/ConnectionsAbstractFactory.java b/src/AbstractFactory/ConnectionsAbstractFactory.java new file mode 100644 index 0000000..e4b923f --- /dev/null +++ b/src/AbstractFactory/ConnectionsAbstractFactory.java @@ -0,0 +1,7 @@ +package AbstractFactory; + +import Drivers.DriverConnection; + +public abstract class ConnectionsAbstractFactory { + abstract DriverConnection getConnection(String SQL); +} diff --git a/src/Builder/Builder.java b/src/Builder/Builder.java new file mode 100644 index 0000000..87acee8 --- /dev/null +++ b/src/Builder/Builder.java @@ -0,0 +1,9 @@ +package Builder; + +import Connections.DataBaseConnection; + +public interface Builder { + + public DataBaseConnection getConnection(); + +} diff --git a/src/Builder/Director.java b/src/Builder/Director.java new file mode 100644 index 0000000..3c79f76 --- /dev/null +++ b/src/Builder/Director.java @@ -0,0 +1,14 @@ +package Builder; + +public class Director { + private Builder connectionBuilder = null; + + public Director(Builder mealBuilder) { + this.connectionBuilder = mealBuilder; + } + + public void constructConnection() { + connectionBuilder.getConnection(); + } + +} diff --git a/src/Builder/MySQLBuilder.java b/src/Builder/MySQLBuilder.java new file mode 100644 index 0000000..a6d735b --- /dev/null +++ b/src/Builder/MySQLBuilder.java @@ -0,0 +1,19 @@ +package Builder; + +import Connections.DataBaseConnection; + +public class MySQLBuilder implements Builder{ + + private DataBaseConnection myConnection; + + public MySQLBuilder(String dataBase) { + myConnection.getInstance("MySql", dataBase , "sara", "myConnection"); + } + + @Override + public DataBaseConnection getConnection() { + return myConnection; + } + + +} diff --git a/src/Connections/Connection.java b/src/Connections/Connection.java new file mode 100644 index 0000000..451b0ce --- /dev/null +++ b/src/Connections/Connection.java @@ -0,0 +1,18 @@ +package Connections; + +public class Connection { + + private static Boolean connect = false; + private String dataBase = "testingDataBase"; + private String user = "sara"; + private String password = "myConnection"; + + public Connection(String database, String user, String password) { + if(this.dataBase.equals(database) && this.user.equals(user) && this.password.equals(password) ) { + connect = true; + }else { + System.out.print("You have an error in your connection. Please, try again later"); + } + } + +} diff --git a/src/Connections/DataBaseConnection.java b/src/Connections/DataBaseConnection.java new file mode 100644 index 0000000..1a76e80 --- /dev/null +++ b/src/Connections/DataBaseConnection.java @@ -0,0 +1,45 @@ +package Connections; + +import AbstractFactory.ConnectionProducer; + +public class DataBaseConnection { + + private Connection myConnection; + private static DataBaseConnection dataBaseConnection = null; + + private DataBaseConnection(){ + try { + myConnection = ConnectionProducer.getConnection("MySql","testingDataBase", "sara", "myConnection"); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + public static DataBaseConnection getInstance() { + if(dataBaseConnection == null) { + dataBaseConnection = new DataBaseConnection(); + } + return dataBaseConnection; + } + + //Builder Patron methods + private DataBaseConnection(String odbc, String dataBase, String user, String password) { + try { + myConnection = ConnectionProducer.getConnection(odbc, dataBase, user, password); + }catch(Exception e) { + e.printStackTrace();} + } + + public static DataBaseConnection getInstance(String odbc, String dataBase, String user, String password) { + if(dataBaseConnection == null) { + dataBaseConnection = new DataBaseConnection(odbc, dataBase, user, password); + } + return dataBaseConnection; + } + + public Connection getConnection() { + return myConnection; + } + +} diff --git a/src/Drivers/DriverConnection.java b/src/Drivers/DriverConnection.java new file mode 100644 index 0000000..0cf0431 --- /dev/null +++ b/src/Drivers/DriverConnection.java @@ -0,0 +1,7 @@ +package Drivers; + +import Connections.Connection; + +public interface DriverConnection { + public Connection getConnection(String dataBase, String u, String p); +} diff --git a/src/Drivers/MySQLDriverManager.java b/src/Drivers/MySQLDriverManager.java new file mode 100644 index 0000000..153bf1f --- /dev/null +++ b/src/Drivers/MySQLDriverManager.java @@ -0,0 +1,13 @@ +package Drivers; + +import Connections.Connection; + +public class MySQLDriverManager implements DriverConnection{ + public MySQLDriverManager() { + } + + public Connection getConnection(String dataBase, String user, String password) { + return new Connection(dataBase, user, password); + } + +} diff --git a/src/Drivers/SQLDriverManager.java b/src/Drivers/SQLDriverManager.java new file mode 100644 index 0000000..889df1b --- /dev/null +++ b/src/Drivers/SQLDriverManager.java @@ -0,0 +1,14 @@ +package Drivers; + +import Connections.Connection; + +public class SQLDriverManager implements DriverConnection{ + + public SQLDriverManager() { + } + + public Connection getConnection(String dataBase, String user, String password) { + return new Connection(dataBase, user, password); + } + +} diff --git a/src/Main.java b/src/Main.java new file mode 100644 index 0000000..9b6427f --- /dev/null +++ b/src/Main.java @@ -0,0 +1,13 @@ + +public class Main { + + public static void main(String[] args) { + Proxy aConnection = new Proxy(); + if(aConnection.mySqlConnection()) + System.out.print("i'm functioning"); + else + System.out.print("I failed"); + + } + +} diff --git a/src/Proxy.java b/src/Proxy.java new file mode 100644 index 0000000..c524582 --- /dev/null +++ b/src/Proxy.java @@ -0,0 +1,28 @@ +import Builder.Director; +import Builder.MySQLBuilder; +import Connections.DataBaseConnection; + +public class Proxy { + Director myConnectionDirector = null; + + public Proxy() {} + + /** This method return true if the connection was done + * or false if there was any error. + * */ + public boolean mySqlConnection(){ + boolean result=false; + try { + if(myConnectionDirector == null) { + MySQLBuilder mysql = new MySQLBuilder("testingDataBase"); + this.myConnectionDirector = new Director(mysql); + this.myConnectionDirector.constructConnection(); + } + result=true; + }catch(Exception e) { + e.printStackTrace(); + } + return result; + } + +} From 677107c3a5704c01ab651e33b267a013d469aa83 Mon Sep 17 00:00:00 2001 From: SaraLavanchyUTNMDP Date: Fri, 4 May 2018 11:01:59 -0300 Subject: [PATCH 2/4] changing the name of the folder --- topic0/AbstractFactory/ConnectionFactory.java | 24 ++++++++++ .../AbstractFactory/ConnectionProducer.java | 26 +++++++++++ .../ConnectionsAbstractFactory.java | 7 +++ topic0/Builder/Builder.java | 9 ++++ topic0/Builder/Director.java | 14 ++++++ topic0/Builder/MySQLBuilder.java | 19 ++++++++ topic0/Connections/Connection.java | 18 ++++++++ topic0/Connections/DataBaseConnection.java | 45 +++++++++++++++++++ topic0/Drivers/DriverConnection.java | 7 +++ topic0/Drivers/MySQLDriverManager.java | 13 ++++++ topic0/Drivers/SQLDriverManager.java | 14 ++++++ topic0/Main.java | 13 ++++++ topic0/Proxy.java | 28 ++++++++++++ 13 files changed, 237 insertions(+) create mode 100644 topic0/AbstractFactory/ConnectionFactory.java create mode 100644 topic0/AbstractFactory/ConnectionProducer.java create mode 100644 topic0/AbstractFactory/ConnectionsAbstractFactory.java create mode 100644 topic0/Builder/Builder.java create mode 100644 topic0/Builder/Director.java create mode 100644 topic0/Builder/MySQLBuilder.java create mode 100644 topic0/Connections/Connection.java create mode 100644 topic0/Connections/DataBaseConnection.java create mode 100644 topic0/Drivers/DriverConnection.java create mode 100644 topic0/Drivers/MySQLDriverManager.java create mode 100644 topic0/Drivers/SQLDriverManager.java create mode 100644 topic0/Main.java create mode 100644 topic0/Proxy.java diff --git a/topic0/AbstractFactory/ConnectionFactory.java b/topic0/AbstractFactory/ConnectionFactory.java new file mode 100644 index 0000000..c17fe74 --- /dev/null +++ b/topic0/AbstractFactory/ConnectionFactory.java @@ -0,0 +1,24 @@ +package AbstractFactory; + +import Drivers.DriverConnection; +import Drivers.MySQLDriverManager; +import Drivers.SQLDriverManager; + +public class ConnectionFactory extends ConnectionsAbstractFactory { + @Override + public DriverConnection getConnection(String SQL) { + if( SQL == null) { + return null; + } + + if(SQL.equalsIgnoreCase("MySql")) { + return new MySQLDriverManager(); + + } else if(SQL.equalsIgnoreCase("SqlServer")) { + return new SQLDriverManager(); + } + + return null; + + } +} diff --git a/topic0/AbstractFactory/ConnectionProducer.java b/topic0/AbstractFactory/ConnectionProducer.java new file mode 100644 index 0000000..b284dc4 --- /dev/null +++ b/topic0/AbstractFactory/ConnectionProducer.java @@ -0,0 +1,26 @@ +package AbstractFactory; + +import Connections.Connection; +import Drivers.MySQLDriverManager; +import Drivers.SQLDriverManager; + +public class ConnectionProducer { + private static Connection connection; + + public static Connection getConnection(String choise, String dataBase, String user, String password) { + if( choise == null) { + connection = null; + } + + if(choise.equalsIgnoreCase("MySql")) { + MySQLDriverManager mySql= new MySQLDriverManager(); + connection = mySql.getConnection(dataBase, user, password); + + } else if(choise.equalsIgnoreCase("SqlServer")) { + SQLDriverManager sqlServer = new SQLDriverManager(); + connection = sqlServer.getConnection(dataBase, user, password); + } + + return connection; + } +} diff --git a/topic0/AbstractFactory/ConnectionsAbstractFactory.java b/topic0/AbstractFactory/ConnectionsAbstractFactory.java new file mode 100644 index 0000000..e4b923f --- /dev/null +++ b/topic0/AbstractFactory/ConnectionsAbstractFactory.java @@ -0,0 +1,7 @@ +package AbstractFactory; + +import Drivers.DriverConnection; + +public abstract class ConnectionsAbstractFactory { + abstract DriverConnection getConnection(String SQL); +} diff --git a/topic0/Builder/Builder.java b/topic0/Builder/Builder.java new file mode 100644 index 0000000..87acee8 --- /dev/null +++ b/topic0/Builder/Builder.java @@ -0,0 +1,9 @@ +package Builder; + +import Connections.DataBaseConnection; + +public interface Builder { + + public DataBaseConnection getConnection(); + +} diff --git a/topic0/Builder/Director.java b/topic0/Builder/Director.java new file mode 100644 index 0000000..3c79f76 --- /dev/null +++ b/topic0/Builder/Director.java @@ -0,0 +1,14 @@ +package Builder; + +public class Director { + private Builder connectionBuilder = null; + + public Director(Builder mealBuilder) { + this.connectionBuilder = mealBuilder; + } + + public void constructConnection() { + connectionBuilder.getConnection(); + } + +} diff --git a/topic0/Builder/MySQLBuilder.java b/topic0/Builder/MySQLBuilder.java new file mode 100644 index 0000000..a6d735b --- /dev/null +++ b/topic0/Builder/MySQLBuilder.java @@ -0,0 +1,19 @@ +package Builder; + +import Connections.DataBaseConnection; + +public class MySQLBuilder implements Builder{ + + private DataBaseConnection myConnection; + + public MySQLBuilder(String dataBase) { + myConnection.getInstance("MySql", dataBase , "sara", "myConnection"); + } + + @Override + public DataBaseConnection getConnection() { + return myConnection; + } + + +} diff --git a/topic0/Connections/Connection.java b/topic0/Connections/Connection.java new file mode 100644 index 0000000..451b0ce --- /dev/null +++ b/topic0/Connections/Connection.java @@ -0,0 +1,18 @@ +package Connections; + +public class Connection { + + private static Boolean connect = false; + private String dataBase = "testingDataBase"; + private String user = "sara"; + private String password = "myConnection"; + + public Connection(String database, String user, String password) { + if(this.dataBase.equals(database) && this.user.equals(user) && this.password.equals(password) ) { + connect = true; + }else { + System.out.print("You have an error in your connection. Please, try again later"); + } + } + +} diff --git a/topic0/Connections/DataBaseConnection.java b/topic0/Connections/DataBaseConnection.java new file mode 100644 index 0000000..1a76e80 --- /dev/null +++ b/topic0/Connections/DataBaseConnection.java @@ -0,0 +1,45 @@ +package Connections; + +import AbstractFactory.ConnectionProducer; + +public class DataBaseConnection { + + private Connection myConnection; + private static DataBaseConnection dataBaseConnection = null; + + private DataBaseConnection(){ + try { + myConnection = ConnectionProducer.getConnection("MySql","testingDataBase", "sara", "myConnection"); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + public static DataBaseConnection getInstance() { + if(dataBaseConnection == null) { + dataBaseConnection = new DataBaseConnection(); + } + return dataBaseConnection; + } + + //Builder Patron methods + private DataBaseConnection(String odbc, String dataBase, String user, String password) { + try { + myConnection = ConnectionProducer.getConnection(odbc, dataBase, user, password); + }catch(Exception e) { + e.printStackTrace();} + } + + public static DataBaseConnection getInstance(String odbc, String dataBase, String user, String password) { + if(dataBaseConnection == null) { + dataBaseConnection = new DataBaseConnection(odbc, dataBase, user, password); + } + return dataBaseConnection; + } + + public Connection getConnection() { + return myConnection; + } + +} diff --git a/topic0/Drivers/DriverConnection.java b/topic0/Drivers/DriverConnection.java new file mode 100644 index 0000000..0cf0431 --- /dev/null +++ b/topic0/Drivers/DriverConnection.java @@ -0,0 +1,7 @@ +package Drivers; + +import Connections.Connection; + +public interface DriverConnection { + public Connection getConnection(String dataBase, String u, String p); +} diff --git a/topic0/Drivers/MySQLDriverManager.java b/topic0/Drivers/MySQLDriverManager.java new file mode 100644 index 0000000..153bf1f --- /dev/null +++ b/topic0/Drivers/MySQLDriverManager.java @@ -0,0 +1,13 @@ +package Drivers; + +import Connections.Connection; + +public class MySQLDriverManager implements DriverConnection{ + public MySQLDriverManager() { + } + + public Connection getConnection(String dataBase, String user, String password) { + return new Connection(dataBase, user, password); + } + +} diff --git a/topic0/Drivers/SQLDriverManager.java b/topic0/Drivers/SQLDriverManager.java new file mode 100644 index 0000000..889df1b --- /dev/null +++ b/topic0/Drivers/SQLDriverManager.java @@ -0,0 +1,14 @@ +package Drivers; + +import Connections.Connection; + +public class SQLDriverManager implements DriverConnection{ + + public SQLDriverManager() { + } + + public Connection getConnection(String dataBase, String user, String password) { + return new Connection(dataBase, user, password); + } + +} diff --git a/topic0/Main.java b/topic0/Main.java new file mode 100644 index 0000000..9b6427f --- /dev/null +++ b/topic0/Main.java @@ -0,0 +1,13 @@ + +public class Main { + + public static void main(String[] args) { + Proxy aConnection = new Proxy(); + if(aConnection.mySqlConnection()) + System.out.print("i'm functioning"); + else + System.out.print("I failed"); + + } + +} diff --git a/topic0/Proxy.java b/topic0/Proxy.java new file mode 100644 index 0000000..c524582 --- /dev/null +++ b/topic0/Proxy.java @@ -0,0 +1,28 @@ +import Builder.Director; +import Builder.MySQLBuilder; +import Connections.DataBaseConnection; + +public class Proxy { + Director myConnectionDirector = null; + + public Proxy() {} + + /** This method return true if the connection was done + * or false if there was any error. + * */ + public boolean mySqlConnection(){ + boolean result=false; + try { + if(myConnectionDirector == null) { + MySQLBuilder mysql = new MySQLBuilder("testingDataBase"); + this.myConnectionDirector = new Director(mysql); + this.myConnectionDirector.constructConnection(); + } + result=true; + }catch(Exception e) { + e.printStackTrace(); + } + return result; + } + +} From 841b8fbc6414635b3b8e129c659a0e26977473fd Mon Sep 17 00:00:00 2001 From: SaraLavanchyUTNMDP Date: Fri, 4 May 2018 11:07:11 -0300 Subject: [PATCH 3/4] changing the name of the folder --- src/AbstractFactory/ConnectionFactory.java | 24 ---------- src/AbstractFactory/ConnectionProducer.java | 26 ----------- .../ConnectionsAbstractFactory.java | 7 --- src/Builder/Builder.java | 9 ---- src/Builder/Director.java | 14 ------ src/Builder/MySQLBuilder.java | 19 -------- src/Connections/Connection.java | 18 -------- src/Connections/DataBaseConnection.java | 45 ------------------- src/Drivers/DriverConnection.java | 7 --- src/Drivers/MySQLDriverManager.java | 13 ------ src/Drivers/SQLDriverManager.java | 14 ------ src/Main.java | 13 ------ src/Proxy.java | 28 ------------ 13 files changed, 237 deletions(-) delete mode 100644 src/AbstractFactory/ConnectionFactory.java delete mode 100644 src/AbstractFactory/ConnectionProducer.java delete mode 100644 src/AbstractFactory/ConnectionsAbstractFactory.java delete mode 100644 src/Builder/Builder.java delete mode 100644 src/Builder/Director.java delete mode 100644 src/Builder/MySQLBuilder.java delete mode 100644 src/Connections/Connection.java delete mode 100644 src/Connections/DataBaseConnection.java delete mode 100644 src/Drivers/DriverConnection.java delete mode 100644 src/Drivers/MySQLDriverManager.java delete mode 100644 src/Drivers/SQLDriverManager.java delete mode 100644 src/Main.java delete mode 100644 src/Proxy.java diff --git a/src/AbstractFactory/ConnectionFactory.java b/src/AbstractFactory/ConnectionFactory.java deleted file mode 100644 index c17fe74..0000000 --- a/src/AbstractFactory/ConnectionFactory.java +++ /dev/null @@ -1,24 +0,0 @@ -package AbstractFactory; - -import Drivers.DriverConnection; -import Drivers.MySQLDriverManager; -import Drivers.SQLDriverManager; - -public class ConnectionFactory extends ConnectionsAbstractFactory { - @Override - public DriverConnection getConnection(String SQL) { - if( SQL == null) { - return null; - } - - if(SQL.equalsIgnoreCase("MySql")) { - return new MySQLDriverManager(); - - } else if(SQL.equalsIgnoreCase("SqlServer")) { - return new SQLDriverManager(); - } - - return null; - - } -} diff --git a/src/AbstractFactory/ConnectionProducer.java b/src/AbstractFactory/ConnectionProducer.java deleted file mode 100644 index b284dc4..0000000 --- a/src/AbstractFactory/ConnectionProducer.java +++ /dev/null @@ -1,26 +0,0 @@ -package AbstractFactory; - -import Connections.Connection; -import Drivers.MySQLDriverManager; -import Drivers.SQLDriverManager; - -public class ConnectionProducer { - private static Connection connection; - - public static Connection getConnection(String choise, String dataBase, String user, String password) { - if( choise == null) { - connection = null; - } - - if(choise.equalsIgnoreCase("MySql")) { - MySQLDriverManager mySql= new MySQLDriverManager(); - connection = mySql.getConnection(dataBase, user, password); - - } else if(choise.equalsIgnoreCase("SqlServer")) { - SQLDriverManager sqlServer = new SQLDriverManager(); - connection = sqlServer.getConnection(dataBase, user, password); - } - - return connection; - } -} diff --git a/src/AbstractFactory/ConnectionsAbstractFactory.java b/src/AbstractFactory/ConnectionsAbstractFactory.java deleted file mode 100644 index e4b923f..0000000 --- a/src/AbstractFactory/ConnectionsAbstractFactory.java +++ /dev/null @@ -1,7 +0,0 @@ -package AbstractFactory; - -import Drivers.DriverConnection; - -public abstract class ConnectionsAbstractFactory { - abstract DriverConnection getConnection(String SQL); -} diff --git a/src/Builder/Builder.java b/src/Builder/Builder.java deleted file mode 100644 index 87acee8..0000000 --- a/src/Builder/Builder.java +++ /dev/null @@ -1,9 +0,0 @@ -package Builder; - -import Connections.DataBaseConnection; - -public interface Builder { - - public DataBaseConnection getConnection(); - -} diff --git a/src/Builder/Director.java b/src/Builder/Director.java deleted file mode 100644 index 3c79f76..0000000 --- a/src/Builder/Director.java +++ /dev/null @@ -1,14 +0,0 @@ -package Builder; - -public class Director { - private Builder connectionBuilder = null; - - public Director(Builder mealBuilder) { - this.connectionBuilder = mealBuilder; - } - - public void constructConnection() { - connectionBuilder.getConnection(); - } - -} diff --git a/src/Builder/MySQLBuilder.java b/src/Builder/MySQLBuilder.java deleted file mode 100644 index a6d735b..0000000 --- a/src/Builder/MySQLBuilder.java +++ /dev/null @@ -1,19 +0,0 @@ -package Builder; - -import Connections.DataBaseConnection; - -public class MySQLBuilder implements Builder{ - - private DataBaseConnection myConnection; - - public MySQLBuilder(String dataBase) { - myConnection.getInstance("MySql", dataBase , "sara", "myConnection"); - } - - @Override - public DataBaseConnection getConnection() { - return myConnection; - } - - -} diff --git a/src/Connections/Connection.java b/src/Connections/Connection.java deleted file mode 100644 index 451b0ce..0000000 --- a/src/Connections/Connection.java +++ /dev/null @@ -1,18 +0,0 @@ -package Connections; - -public class Connection { - - private static Boolean connect = false; - private String dataBase = "testingDataBase"; - private String user = "sara"; - private String password = "myConnection"; - - public Connection(String database, String user, String password) { - if(this.dataBase.equals(database) && this.user.equals(user) && this.password.equals(password) ) { - connect = true; - }else { - System.out.print("You have an error in your connection. Please, try again later"); - } - } - -} diff --git a/src/Connections/DataBaseConnection.java b/src/Connections/DataBaseConnection.java deleted file mode 100644 index 1a76e80..0000000 --- a/src/Connections/DataBaseConnection.java +++ /dev/null @@ -1,45 +0,0 @@ -package Connections; - -import AbstractFactory.ConnectionProducer; - -public class DataBaseConnection { - - private Connection myConnection; - private static DataBaseConnection dataBaseConnection = null; - - private DataBaseConnection(){ - try { - myConnection = ConnectionProducer.getConnection("MySql","testingDataBase", "sara", "myConnection"); - } catch (Exception e) { - e.printStackTrace(); - } - } - - - public static DataBaseConnection getInstance() { - if(dataBaseConnection == null) { - dataBaseConnection = new DataBaseConnection(); - } - return dataBaseConnection; - } - - //Builder Patron methods - private DataBaseConnection(String odbc, String dataBase, String user, String password) { - try { - myConnection = ConnectionProducer.getConnection(odbc, dataBase, user, password); - }catch(Exception e) { - e.printStackTrace();} - } - - public static DataBaseConnection getInstance(String odbc, String dataBase, String user, String password) { - if(dataBaseConnection == null) { - dataBaseConnection = new DataBaseConnection(odbc, dataBase, user, password); - } - return dataBaseConnection; - } - - public Connection getConnection() { - return myConnection; - } - -} diff --git a/src/Drivers/DriverConnection.java b/src/Drivers/DriverConnection.java deleted file mode 100644 index 0cf0431..0000000 --- a/src/Drivers/DriverConnection.java +++ /dev/null @@ -1,7 +0,0 @@ -package Drivers; - -import Connections.Connection; - -public interface DriverConnection { - public Connection getConnection(String dataBase, String u, String p); -} diff --git a/src/Drivers/MySQLDriverManager.java b/src/Drivers/MySQLDriverManager.java deleted file mode 100644 index 153bf1f..0000000 --- a/src/Drivers/MySQLDriverManager.java +++ /dev/null @@ -1,13 +0,0 @@ -package Drivers; - -import Connections.Connection; - -public class MySQLDriverManager implements DriverConnection{ - public MySQLDriverManager() { - } - - public Connection getConnection(String dataBase, String user, String password) { - return new Connection(dataBase, user, password); - } - -} diff --git a/src/Drivers/SQLDriverManager.java b/src/Drivers/SQLDriverManager.java deleted file mode 100644 index 889df1b..0000000 --- a/src/Drivers/SQLDriverManager.java +++ /dev/null @@ -1,14 +0,0 @@ -package Drivers; - -import Connections.Connection; - -public class SQLDriverManager implements DriverConnection{ - - public SQLDriverManager() { - } - - public Connection getConnection(String dataBase, String user, String password) { - return new Connection(dataBase, user, password); - } - -} diff --git a/src/Main.java b/src/Main.java deleted file mode 100644 index 9b6427f..0000000 --- a/src/Main.java +++ /dev/null @@ -1,13 +0,0 @@ - -public class Main { - - public static void main(String[] args) { - Proxy aConnection = new Proxy(); - if(aConnection.mySqlConnection()) - System.out.print("i'm functioning"); - else - System.out.print("I failed"); - - } - -} diff --git a/src/Proxy.java b/src/Proxy.java deleted file mode 100644 index c524582..0000000 --- a/src/Proxy.java +++ /dev/null @@ -1,28 +0,0 @@ -import Builder.Director; -import Builder.MySQLBuilder; -import Connections.DataBaseConnection; - -public class Proxy { - Director myConnectionDirector = null; - - public Proxy() {} - - /** This method return true if the connection was done - * or false if there was any error. - * */ - public boolean mySqlConnection(){ - boolean result=false; - try { - if(myConnectionDirector == null) { - MySQLBuilder mysql = new MySQLBuilder("testingDataBase"); - this.myConnectionDirector = new Director(mysql); - this.myConnectionDirector.constructConnection(); - } - result=true; - }catch(Exception e) { - e.printStackTrace(); - } - return result; - } - -} From b8756b06f7d296e405f59dc7e7989fc3298338e2 Mon Sep 17 00:00:00 2001 From: SaraLavanchyUTNMDP Date: Wed, 9 May 2018 12:31:01 -0300 Subject: [PATCH 4/4] project with the comments's corrections version 1 --- topic0/AbstractFactory/ConnectionFactory.java | 8 ++++---- .../AbstractFactory/ConnectionProducer.java | 13 +++++++----- .../ConnectionsAbstractFactory.java | 4 ++-- topic0/Builder/Builder.java | 4 ++-- topic0/Builder/Director.java | 2 +- topic0/Builder/MySQLBuilder.java | 4 ++-- topic0/Connections/Connection.java | 8 ++++---- topic0/Connections/DataBaseConnection.java | 4 ++-- topic0/Drivers/DriverConnection.java | 4 ++-- topic0/Drivers/MySQLDriverManager.java | 4 ++-- topic0/Drivers/SQLDriverManager.java | 4 ++-- topic0/Main.java | 2 +- topic0/Proxy.java | 20 +++++++++++-------- 13 files changed, 44 insertions(+), 37 deletions(-) diff --git a/topic0/AbstractFactory/ConnectionFactory.java b/topic0/AbstractFactory/ConnectionFactory.java index c17fe74..ec78ddf 100644 --- a/topic0/AbstractFactory/ConnectionFactory.java +++ b/topic0/AbstractFactory/ConnectionFactory.java @@ -1,8 +1,8 @@ -package AbstractFactory; +package abstractFactory; -import Drivers.DriverConnection; -import Drivers.MySQLDriverManager; -import Drivers.SQLDriverManager; +import drivers.DriverConnection; +import drivers.MySQLDriverManager; +import drivers.SQLDriverManager; public class ConnectionFactory extends ConnectionsAbstractFactory { @Override diff --git a/topic0/AbstractFactory/ConnectionProducer.java b/topic0/AbstractFactory/ConnectionProducer.java index b284dc4..75810c4 100644 --- a/topic0/AbstractFactory/ConnectionProducer.java +++ b/topic0/AbstractFactory/ConnectionProducer.java @@ -1,8 +1,8 @@ -package AbstractFactory; +package abstractFactory; -import Connections.Connection; -import Drivers.MySQLDriverManager; -import Drivers.SQLDriverManager; +import connections.Connection; +import drivers.MySQLDriverManager; +import drivers.SQLDriverManager; public class ConnectionProducer { private static Connection connection; @@ -19,7 +19,10 @@ public static Connection getConnection(String choise, String dataBase, String us } else if(choise.equalsIgnoreCase("SqlServer")) { SQLDriverManager sqlServer = new SQLDriverManager(); connection = sqlServer.getConnection(dataBase, user, password); - } + } else { + throw new Exception("the sql is not supported in this version of the program." + + "Please try with Mysql or SqlServer"); + } return connection; } diff --git a/topic0/AbstractFactory/ConnectionsAbstractFactory.java b/topic0/AbstractFactory/ConnectionsAbstractFactory.java index e4b923f..4c40a57 100644 --- a/topic0/AbstractFactory/ConnectionsAbstractFactory.java +++ b/topic0/AbstractFactory/ConnectionsAbstractFactory.java @@ -1,6 +1,6 @@ -package AbstractFactory; +package abstractFactory; -import Drivers.DriverConnection; +import drivers.DriverConnection; public abstract class ConnectionsAbstractFactory { abstract DriverConnection getConnection(String SQL); diff --git a/topic0/Builder/Builder.java b/topic0/Builder/Builder.java index 87acee8..7a5c98e 100644 --- a/topic0/Builder/Builder.java +++ b/topic0/Builder/Builder.java @@ -1,6 +1,6 @@ -package Builder; +package builder; -import Connections.DataBaseConnection; +import connections.DataBaseConnection; public interface Builder { diff --git a/topic0/Builder/Director.java b/topic0/Builder/Director.java index 3c79f76..6968aa4 100644 --- a/topic0/Builder/Director.java +++ b/topic0/Builder/Director.java @@ -1,4 +1,4 @@ -package Builder; +package builder; public class Director { private Builder connectionBuilder = null; diff --git a/topic0/Builder/MySQLBuilder.java b/topic0/Builder/MySQLBuilder.java index a6d735b..64dffe0 100644 --- a/topic0/Builder/MySQLBuilder.java +++ b/topic0/Builder/MySQLBuilder.java @@ -1,6 +1,6 @@ -package Builder; +package builder; -import Connections.DataBaseConnection; +import connections.DataBaseConnection; public class MySQLBuilder implements Builder{ diff --git a/topic0/Connections/Connection.java b/topic0/Connections/Connection.java index 451b0ce..146108c 100644 --- a/topic0/Connections/Connection.java +++ b/topic0/Connections/Connection.java @@ -1,17 +1,17 @@ -package Connections; +package connections; public class Connection { - private static Boolean connect = false; + private static Boolean connected = false; private String dataBase = "testingDataBase"; private String user = "sara"; private String password = "myConnection"; public Connection(String database, String user, String password) { if(this.dataBase.equals(database) && this.user.equals(user) && this.password.equals(password) ) { - connect = true; + connected = true; }else { - System.out.print("You have an error in your connection. Please, try again later"); + throw new Exception("You have an error in your connection. Please, try again later"); } } diff --git a/topic0/Connections/DataBaseConnection.java b/topic0/Connections/DataBaseConnection.java index 1a76e80..78c5ab6 100644 --- a/topic0/Connections/DataBaseConnection.java +++ b/topic0/Connections/DataBaseConnection.java @@ -1,6 +1,6 @@ -package Connections; +package connections; -import AbstractFactory.ConnectionProducer; +import abstractFactory.ConnectionProducer; public class DataBaseConnection { diff --git a/topic0/Drivers/DriverConnection.java b/topic0/Drivers/DriverConnection.java index 0cf0431..2abe35d 100644 --- a/topic0/Drivers/DriverConnection.java +++ b/topic0/Drivers/DriverConnection.java @@ -1,6 +1,6 @@ -package Drivers; +package drivers; -import Connections.Connection; +import connections.Connection; public interface DriverConnection { public Connection getConnection(String dataBase, String u, String p); diff --git a/topic0/Drivers/MySQLDriverManager.java b/topic0/Drivers/MySQLDriverManager.java index 153bf1f..0afa0df 100644 --- a/topic0/Drivers/MySQLDriverManager.java +++ b/topic0/Drivers/MySQLDriverManager.java @@ -1,6 +1,6 @@ -package Drivers; +package drivers; -import Connections.Connection; +import connections.Connection; public class MySQLDriverManager implements DriverConnection{ public MySQLDriverManager() { diff --git a/topic0/Drivers/SQLDriverManager.java b/topic0/Drivers/SQLDriverManager.java index 889df1b..fb06d6d 100644 --- a/topic0/Drivers/SQLDriverManager.java +++ b/topic0/Drivers/SQLDriverManager.java @@ -1,6 +1,6 @@ -package Drivers; +package drivers; -import Connections.Connection; +import connections.Connection; public class SQLDriverManager implements DriverConnection{ diff --git a/topic0/Main.java b/topic0/Main.java index 9b6427f..ef4582c 100644 --- a/topic0/Main.java +++ b/topic0/Main.java @@ -3,7 +3,7 @@ public class Main { public static void main(String[] args) { Proxy aConnection = new Proxy(); - if(aConnection.mySqlConnection()) + if(aConnection.mySqlConnection().get) System.out.print("i'm functioning"); else System.out.print("I failed"); diff --git a/topic0/Proxy.java b/topic0/Proxy.java index c524582..7f8fafa 100644 --- a/topic0/Proxy.java +++ b/topic0/Proxy.java @@ -1,6 +1,6 @@ -import Builder.Director; -import Builder.MySQLBuilder; -import Connections.DataBaseConnection; +import builder.Director; +import builder.MySQLBuilder; +import connections.DataBaseConnection; public class Proxy { Director myConnectionDirector = null; @@ -10,19 +10,23 @@ public Proxy() {} /** This method return true if the connection was done * or false if there was any error. * */ - public boolean mySqlConnection(){ - boolean result=false; + public void mySqlConnection(){ try { if(myConnectionDirector == null) { MySQLBuilder mysql = new MySQLBuilder("testingDataBase"); this.myConnectionDirector = new Director(mysql); this.myConnectionDirector.constructConnection(); - } - result=true; + }else{ + throw new Exception("We are sorry, something happened during the connection"); + } + }catch(Exception e) { e.printStackTrace(); } - return result; + } + public void setMyConnectionDirector(Director myConnectionDirector) { + this.myConnectionDirector = myConnectionDirector; + } }