From 035e0c742999b1e2a67b669c6dd5daf3dee230a1 Mon Sep 17 00:00:00 2001
From: "SIMONVOLLENDORF\\Simon" <simon.vollendorf@smail.inf.h-brs.de>
Date: Fri, 9 Jun 2017 09:41:51 +0200
Subject: [PATCH] =?UTF-8?q?Kleine=20=C3=84nderung=20am=20Control?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/s4s/dao/impl/RegistrationControl.java | 30 ++++++++++++-------
.../s4s/exceptions/WrongInputException.java | 25 ++++++++++++++++
2 files changed, 45 insertions(+), 10 deletions(-)
create mode 100644 src/main/java/org/s4s/exceptions/WrongInputException.java
diff --git a/src/main/java/org/s4s/dao/impl/RegistrationControl.java b/src/main/java/org/s4s/dao/impl/RegistrationControl.java
index 544be66..cea062d 100644
--- a/src/main/java/org/s4s/dao/impl/RegistrationControl.java
+++ b/src/main/java/org/s4s/dao/impl/RegistrationControl.java
@@ -9,6 +9,7 @@ import java.sql.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.validator.routines.EmailValidator;
+import org.s4s.exceptions.WrongInputException;
/**
@@ -17,10 +18,10 @@ import org.apache.commons.validator.routines.EmailValidator;
*/
public class RegistrationControl {
//User-Block
- private static String surname;
- private static String firstname;
+ private static String nachname;
+ private static String vorname;
private static String email;
- private static String password;
+ private static String passwort;
//DB-Block
Connection con;
@@ -31,15 +32,15 @@ public class RegistrationControl {
public static boolean init(String[] data) {
- surname = data[0];
- firstname = data[1];
+ nachname = data[0];
+ vorname = data[1];
email = data[2];
- password = data[4];
+ passwort = data[4];
- if (!nameValidator(surname)) {
+ if (!nameValidator(nachname)) {
return false;
}
- if (!nameValidator(firstname)) {
+ if (!nameValidator(vorname)) {
return false;
}
if (!emailValidator()) {
@@ -47,13 +48,19 @@ public class RegistrationControl {
} if (!passwordValidator()) {
return false;
}
+
return true;
}
- public void addUser() {
+ public void addUser(String[] data) {
try {
+ if (!init(data)) {
+ //Exception
+ throw new WrongInputException("Falsche Eingabe, bitte erneut eingeben!");
+ }
+
con = DriverManager.getConnection(url);
st = con.createStatement();
@@ -63,6 +70,9 @@ public class RegistrationControl {
//adresse am besten in der DB in User hinterlegen
sql_update = "INSERT INTO \"ERR\".\"user\"()"
+ ""; //erweitern
+ //INSERT INTO user(userID, email, passwort, nachname, vorname)
+ //VALUES(sq.generator.nextval, email, passwort, nachname, vorname);
+
st.executeUpdate(sql_update);
} catch (Exception ex) {
@@ -90,7 +100,7 @@ public class RegistrationControl {
public static boolean passwordValidator() {
String regex = "^.*(?=.{8,})(?=..*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%^&+=]).*$";
Pattern p = Pattern.compile(regex);
- Matcher m = p.matcher(password);
+ Matcher m = p.matcher(passwort);
return m.matches();
}
diff --git a/src/main/java/org/s4s/exceptions/WrongInputException.java b/src/main/java/org/s4s/exceptions/WrongInputException.java
new file mode 100644
index 0000000..21646e1
--- /dev/null
+++ b/src/main/java/org/s4s/exceptions/WrongInputException.java
@@ -0,0 +1,25 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.s4s.exceptions;
+
+/**
+ *
+ * @author Simon
+ */
+public class WrongInputException extends Exception {
+ String reason = null;
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+ public WrongInputException(String reason) {
+ this.reason = reason;
+ }
+}
--
GitLab