From e54c53c7c796868fb06a437c93dffbdaedbf16ac Mon Sep 17 00:00:00 2001 From: bhimio Date: Thu, 21 Apr 2022 08:25:58 -0400 Subject: [PATCH 01/12] almost finished --- .../src/App.java | 2 +- mod2/Librairy/src/App.java | 10 ++-- mod2/Librairy/src/console/Console.java | 32 +++++++---- mod2/Librairy/src/dao/LibraryFileImpl.java | 53 ++++++++++++++--- .../Librairy/src/dao/LibraryInMemoryImpl.java | 57 +++++++++++-------- .../src/interfaces/LibraryInterface.java | 10 ++++ mod2/Librairy/src/model/Book.java | 17 ++---- mod2/Librairy/src/model/Client.java | 5 +- .../.vscode/settings.json | 7 --- mod2/hopenlop aka simple java I O/README.md | 18 ------ 10 files changed, 122 insertions(+), 89 deletions(-) rename mod2/{hopenlop aka simple java I O => Class roster}/src/App.java (66%) delete mode 100644 mod2/hopenlop aka simple java I O/.vscode/settings.json delete mode 100644 mod2/hopenlop aka simple java I O/README.md diff --git a/mod2/hopenlop aka simple java I O/src/App.java b/mod2/Class roster/src/App.java similarity index 66% rename from mod2/hopenlop aka simple java I O/src/App.java rename to mod2/Class roster/src/App.java index 7e88056..0a839f9 100644 --- a/mod2/hopenlop aka simple java I O/src/App.java +++ b/mod2/Class roster/src/App.java @@ -1,5 +1,5 @@ public class App { public static void main(String[] args) throws Exception { - + System.out.println("Hello, World!"); } } diff --git a/mod2/Librairy/src/App.java b/mod2/Librairy/src/App.java index 82f7217..f03083f 100644 --- a/mod2/Librairy/src/App.java +++ b/mod2/Librairy/src/App.java @@ -23,7 +23,7 @@ public static void main(String[] args) throws Exception { String getBookNamePrompt = "what is the title of this book"; String getBookAuthorPrompt = "who is the author of this book"; String getBookGenrePrompt = "which genre is this book located"; - //String getBookIdPrompt = "what is the id of this book"; + // String getBookIdPrompt = "what is the id of this book"; String getBookTypePrompt = "what type will you serch by"; impl.install(); System.out.println("welcome to the library"); @@ -42,9 +42,9 @@ public static void main(String[] args) throws Exception { break; case 2: bookType = console.getString(getBookTypePrompt); - if ( !bookType.equals("author") && !bookType.equals("genre")) { + if (!bookType.equals("author") && !bookType.equals("genre")) { sampleBook = impl.findType(bookType, sampleBook); - if (sampleBook != null ){ + if (sampleBook != null) { console.printBook(sampleBook); } } else if (bookType.equals("author") || bookType.equals("genre")) { @@ -53,14 +53,14 @@ public static void main(String[] args) throws Exception { console.printBook(sampleList); } } - + break; case 3: impl.print(); break; case 4: bookType = console.getString(getBookTypePrompt); - if (!bookType.equals("author") && !bookType.equals("Genre")){ + if (!bookType.equals("author") && !bookType.equals("Genre")) { sampleBook = impl.findType(bookType, sampleBook); if (sampleBook != null && sampleBook.getCheckedOut() == false) { impl.checkOut(sampleBook, true); diff --git a/mod2/Librairy/src/console/Console.java b/mod2/Librairy/src/console/Console.java index 6766c64..f5b3fa8 100644 --- a/mod2/Librairy/src/console/Console.java +++ b/mod2/Librairy/src/console/Console.java @@ -7,12 +7,13 @@ public class Console { private Scanner sc; + public Console(Scanner sc) { this.sc = sc; } - public void printMenue(){ - + public void printMenue() { + System.out.println("1: add a book to the library"); System.out.println("2: search for a book in the librairy"); System.out.println("3: list the books in the librairy"); @@ -20,6 +21,7 @@ public void printMenue(){ System.out.println("5: return a book to the librairy"); System.out.println("6: exit the librairy"); } + public void printBook(Book book) { System.out.println("___________________________"); System.out.println("title: " + book.getTitle()); @@ -29,16 +31,18 @@ public void printBook(Book book) { System.out.println("is checked out: " + book.getCheckedOut()); System.out.println("___________________________"); } + public void printBook(List librairyList) { for (Book book : librairyList) { this.printBook(book); } } + public int getInt(String prompt) { boolean isCorrect = false; int value = 0; String userInput; - while(!isCorrect) { + while (!isCorrect) { System.out.println(prompt); userInput = this.sc.nextLine(); try { @@ -47,14 +51,15 @@ public int getInt(String prompt) { } catch (Exception e) { System.out.println("That was not a int. Please try again"); } - } + } return value; } + public float getFloat(String prompt) { boolean isCorrect = false; float value = 0; String userInput; - while(!isCorrect) { + while (!isCorrect) { System.out.println(prompt); userInput = this.sc.nextLine(); try { @@ -63,14 +68,15 @@ public float getFloat(String prompt) { } catch (Exception e) { System.out.println("That was not a float. Please try again"); } - } + } return value; } + public double getDouble(String prompt) { boolean isCorrect = false; double value = 0; String userInput; - while(!isCorrect) { + while (!isCorrect) { System.out.println(prompt); userInput = this.sc.nextLine(); try { @@ -79,14 +85,15 @@ public double getDouble(String prompt) { } catch (Exception e) { System.out.println("That was not a double. Please try again"); } - } + } return value; } + public boolean getboolean(String prompt) { boolean isCorrect = false; boolean value = false; String userInput; - while(!isCorrect) { + while (!isCorrect) { userInput = this.getString(prompt); try { value = Boolean.parseBoolean(userInput); @@ -94,19 +101,20 @@ public boolean getboolean(String prompt) { } catch (Exception e) { System.out.println("That was not a boolean. Please try again"); } - } + } return value; } + public String getString(String prompt) { System.out.println(prompt); return this.sc.nextLine(); } - public boolean getYesOrNo(String prompt, String yes, String no){ + public boolean getYesOrNo(String prompt, String yes, String no) { String whatToDo = null; boolean satifaction = false; boolean yn = false; - + do { System.out.println(prompt + " " + yes + "/" + no); whatToDo = sc.nextLine(); diff --git a/mod2/Librairy/src/dao/LibraryFileImpl.java b/mod2/Librairy/src/dao/LibraryFileImpl.java index 5b86300..d4021fb 100644 --- a/mod2/Librairy/src/dao/LibraryFileImpl.java +++ b/mod2/Librairy/src/dao/LibraryFileImpl.java @@ -1,17 +1,35 @@ package dao; +import java.io.BufferedReader; +import java.io.FileReader; import java.io.PrintWriter; +import java.util.ArrayList; import java.util.List; +import java.util.Scanner; +import console.Console; import interfaces.LibraryInterface; import model.Book; import model.Client; -public class LibraryFileImpl implements LibraryInterface{ +public class LibraryFileImpl implements LibraryInterface { + private List libraryList = new ArrayList<>(); + private static int id; + private static Scanner scanner = new Scanner(System.in); + private static Console console = new Console(scanner); @Override public void create(Book book, PrintWriter writer) { - writer.println(book.getTitle() + "::" + book.getAuthor() + "::" + book.getGenre() + "::" + book.getCheckedOut() + "::" + book.getId()); + book.setId(id++); + book.setCheckedOut(false); + libraryList.add(book); + for (Book book2 : libraryList) { + writer.println( + book2.getTitle() + "::" + book2.getAuthor() + "::" + book2.getGenre() + "::" + book2.getCheckedOut() + + "::" + book2.getId()); + writer.flush(); + writer.close(); + } } @Override @@ -40,20 +58,19 @@ public List searchByGenre(String value) { @Override public void checkOut(Book book, boolean checkedOut) { - // TODO Auto-generated method stub - + } @Override public Client create(Client client) { - // TODO Auto-generated method stub return null; } @Override public void print() { - // TODO Auto-generated method stub - + for (Book book : libraryList) { + console.printBook(book); + } } @Override @@ -70,7 +87,25 @@ public List findType(String bookType, List sampleList) { @Override public void install() throws Exception { - + Scanner read = new Scanner( + new BufferedReader(new FileReader("/home/bhima/dev/mod2/Librairy/src/storage/OutFile.txt"))); + String[] parts; + String line; + while (read.hasNextLine()) { + line = read.nextLine(); + parts = line.split("::"); + Book b = new Book(); + b.setTitle(parts[0]); + b.setAuthor(parts[1]); + b.setGenre(parts[2]); + b.setCheckedOut(Boolean.parseBoolean(parts[3])); + b.setId(Integer.parseInt(parts[4])); + // add to in memory list for fast lookup + libraryList.add(b); + if (!read.hasNextLine()) { + this.id = Integer.parseInt(parts[4]) + 1; + } + } + } - } diff --git a/mod2/Librairy/src/dao/LibraryInMemoryImpl.java b/mod2/Librairy/src/dao/LibraryInMemoryImpl.java index a1f3d9d..4168e10 100644 --- a/mod2/Librairy/src/dao/LibraryInMemoryImpl.java +++ b/mod2/Librairy/src/dao/LibraryInMemoryImpl.java @@ -13,10 +13,10 @@ import model.Book; import model.Client; -public class LibraryInMemoryImpl implements LibraryInterface{ +public class LibraryInMemoryImpl implements LibraryInterface { private List libraryList = new ArrayList<>(); private HashMap librairyMap = new HashMap<>(); - //private List clientList = new ArrayList<>(); + // private List clientList = new ArrayList<>(); private static int id; private static int id2; Scanner sc = new Scanner(System.in); @@ -24,16 +24,18 @@ public class LibraryInMemoryImpl implements LibraryInterface{ public Book wrongBook = new Book("uh oh", "uh oh", "uh oh"); @Override - public void create(Book book, PrintWriter writer){ + public void create(Book book, PrintWriter writer) { book.setId(id++); book.setCheckedOut(false); libraryList.add(book); - writer.println(book.getTitle() + "::" + book.getAuthor() + "::" + book.getGenre() + "::" + book.getCheckedOut() + "::" + book.getId()); + writer.println(book.getTitle() + "::" + book.getAuthor() + "::" + book.getGenre() + "::" + book.getCheckedOut() + + "::" + book.getId()); writer.flush(); writer.close(); } + @Override - public Book searchById(String value){ + public Book searchById(String value) { int id; try { id = Integer.parseInt(value); @@ -47,17 +49,19 @@ public Book searchById(String value){ } return null; } + @Override - public Book searchByName(String value){ - for (Book b: libraryList) { + public Book searchByName(String value) { + for (Book b : libraryList) { if (value.equals(b.getTitle())) { return b; } } return null; } + @Override - public List searchByAuthor(String value){ + public List searchByAuthor(String value) { List bookList = new ArrayList<>(); for (Book b : libraryList) { if (value.equals(b.getAuthor())) { @@ -66,6 +70,7 @@ public List searchByAuthor(String value){ } return bookList; } + @Override public List searchByGenre(String value) { List bookList = new ArrayList<>(); @@ -76,29 +81,32 @@ public List searchByGenre(String value) { } return bookList; } + @Override - public void checkOut(Book book, boolean checkedOut){ + public void checkOut(Book book, boolean checkedOut) { this.searchByName(book.getTitle()).setCheckedOut(checkedOut); } @Override - public Client create(Client client){ + public Client create(Client client) { client.setId(id2++); client.setAge(client.getAge()); client.setBooks(client.getBooks()); client.setName(client.getName()); return client; } + @Override public void print() { - for (Book b : libraryList) { - console.printBook(b); - } + for (Book b : libraryList) { + console.printBook(b); + } } + @Override public Book findType(String bookType, Book sampleBook) { - + String getBookNamePrompt = "what is the title of this book"; String getBookAuthorPrompt = "who is the author of this book"; String getBookIdPrompt = "what is the id of this book"; @@ -128,7 +136,7 @@ public Book findType(String bookType, Book sampleBook) { } @Override - public List findType(String bookType, List sampleList){ + public List findType(String bookType, List sampleList) { String getBookAuthorPrompt = "who is the author of this book"; String getBookGenrePrompt = "which genre is this book located"; @@ -155,14 +163,15 @@ public List findType(String bookType, List sampleList){ } return null; } - + @Override - public void install() throws Exception{ - Scanner read = new Scanner(new BufferedReader(new FileReader("/home/bhima/dev/mod2/Librairy/src/storage/OutFile.txt"))); - String[] parts; - String line; - boolean ischeckedout; - int id; + public void install() throws Exception { + Scanner read = new Scanner( + new BufferedReader(new FileReader("/home/bhima/dev/mod2/Librairy/src/storage/OutFile.txt"))); + String[] parts; + String line; + boolean ischeckedout; + int id; while (read.hasNextLine()) { line = read.nextLine(); parts = line.split("::"); @@ -172,9 +181,9 @@ public void install() throws Exception{ b.setAuthor(parts[1]); b.setTitle(parts[0]); b.setCheckedOut(ischeckedout); - b.setGenre(parts [2]); + b.setGenre(parts[2]); b.setId(id); - //add to in memory list for fast lookup + // add to in memory list for fast lookup libraryList.add(b); if (!read.hasNextLine()) { this.id = id; diff --git a/mod2/Librairy/src/interfaces/LibraryInterface.java b/mod2/Librairy/src/interfaces/LibraryInterface.java index 5c764be..02bb331 100644 --- a/mod2/Librairy/src/interfaces/LibraryInterface.java +++ b/mod2/Librairy/src/interfaces/LibraryInterface.java @@ -8,15 +8,25 @@ public interface LibraryInterface { public void create(Book book, PrintWriter writer); + public Book searchById(String value); + public Book searchByName(String value); + public List searchByAuthor(String value); + public List searchByGenre(String value); + public void checkOut(Book book, boolean checkedOut); + public Client create(Client client); + public void print(); + public Book findType(String bookType, Book sampleBook); + public List findType(String bookType, List sampleList); + public void install() throws Exception; // public boolean delete(String value, String type); } diff --git a/mod2/Librairy/src/model/Book.java b/mod2/Librairy/src/model/Book.java index 79a7453..bae8de5 100644 --- a/mod2/Librairy/src/model/Book.java +++ b/mod2/Librairy/src/model/Book.java @@ -8,13 +8,11 @@ public class Book { private String genre; private boolean checkedOut; - - - public Book () { + public Book() { } - public Book (String title, String author, String genre) { + public Book(String title, String author, String genre) { this.title = title; this.author = author; this.genre = genre; @@ -28,8 +26,6 @@ public void setCheckedOut(Boolean checkedOut) { this.checkedOut = checkedOut; } - - public String getGenre() { return this.genre; } @@ -37,6 +33,7 @@ public String getGenre() { public void setGenre(String genre) { this.genre = genre; } + public boolean isIsAvailable() { return this.isAvailable; } @@ -45,8 +42,6 @@ public void setIsAvailable(boolean isAvailable) { this.isAvailable = isAvailable; } - - public String getTitle() { return this.title; } @@ -71,9 +66,9 @@ public void setId(int id) { this.id = id; } - public String toString () { - + public String toString() { + return ""; } - + } diff --git a/mod2/Librairy/src/model/Client.java b/mod2/Librairy/src/model/Client.java index e83dc8e..dabcbc0 100644 --- a/mod2/Librairy/src/model/Client.java +++ b/mod2/Librairy/src/model/Client.java @@ -6,11 +6,11 @@ public class Client { private int age; private int books; - public Client(){ + public Client() { } - public Client(int id, String name, int age){ + public Client(int id, String name, int age) { this.age = age; this.id = id; this.name = name; @@ -23,6 +23,7 @@ public int getBooks() { public void setBooks(int books) { this.books = books; } + public int getId() { return this.id; } diff --git a/mod2/hopenlop aka simple java I O/.vscode/settings.json b/mod2/hopenlop aka simple java I O/.vscode/settings.json deleted file mode 100644 index e112a70..0000000 --- a/mod2/hopenlop aka simple java I O/.vscode/settings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "java.project.sourcePaths": ["src"], - "java.project.outputPath": "bin", - "java.project.referencedLibraries": [ - "lib/**/*.jar" - ] -} diff --git a/mod2/hopenlop aka simple java I O/README.md b/mod2/hopenlop aka simple java I O/README.md deleted file mode 100644 index 7c03a53..0000000 --- a/mod2/hopenlop aka simple java I O/README.md +++ /dev/null @@ -1,18 +0,0 @@ -## Getting Started - -Welcome to the VS Code Java world. Here is a guideline to help you get started to write Java code in Visual Studio Code. - -## Folder Structure - -The workspace contains two folders by default, where: - -- `src`: the folder to maintain sources -- `lib`: the folder to maintain dependencies - -Meanwhile, the compiled output files will be generated in the `bin` folder by default. - -> If you want to customize the folder structure, open `.vscode/settings.json` and update the related settings there. - -## Dependency Management - -The `JAVA PROJECTS` view allows you to manage your dependencies. More details can be found [here](https://github.com/microsoft/vscode-java-dependency#manage-dependencies). From babdf14ddcaff98b7f7cd53c399d076a01d69b16 Mon Sep 17 00:00:00 2001 From: bhimio Date: Sun, 24 Apr 2022 18:30:50 -0400 Subject: [PATCH 02/12] what should i do whith find type --- mod2/Librairy/src/console/Console.java | 12 +++---- mod2/Librairy/src/dao/LibraryFileImpl.java | 41 +++++++++++++++++----- mod2/Librairy/src/storage/OutFile.txt | 2 +- 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/mod2/Librairy/src/console/Console.java b/mod2/Librairy/src/console/Console.java index f5b3fa8..eb83fa2 100644 --- a/mod2/Librairy/src/console/Console.java +++ b/mod2/Librairy/src/console/Console.java @@ -43,8 +43,7 @@ public int getInt(String prompt) { int value = 0; String userInput; while (!isCorrect) { - System.out.println(prompt); - userInput = this.sc.nextLine(); + userInput = this.getString(prompt); try { value = Integer.parseInt(userInput); isCorrect = true; @@ -60,8 +59,7 @@ public float getFloat(String prompt) { float value = 0; String userInput; while (!isCorrect) { - System.out.println(prompt); - userInput = this.sc.nextLine(); + userInput = this.getString(prompt); try { value = Float.parseFloat(userInput); isCorrect = true; @@ -77,8 +75,7 @@ public double getDouble(String prompt) { double value = 0; String userInput; while (!isCorrect) { - System.out.println(prompt); - userInput = this.sc.nextLine(); + userInput = this.getString(prompt); try { value = Double.parseDouble(userInput); isCorrect = true; @@ -116,8 +113,7 @@ public boolean getYesOrNo(String prompt, String yes, String no) { boolean yn = false; do { - System.out.println(prompt + " " + yes + "/" + no); - whatToDo = sc.nextLine(); + whatToDo = this.getString(prompt + " " + yes + "/" + no); if (whatToDo.equals(yes)) { yn = true; satifaction = true; diff --git a/mod2/Librairy/src/dao/LibraryFileImpl.java b/mod2/Librairy/src/dao/LibraryFileImpl.java index d4021fb..a1e17f0 100644 --- a/mod2/Librairy/src/dao/LibraryFileImpl.java +++ b/mod2/Librairy/src/dao/LibraryFileImpl.java @@ -17,6 +17,7 @@ public class LibraryFileImpl implements LibraryInterface { private static int id; private static Scanner scanner = new Scanner(System.in); private static Console console = new Console(scanner); + public Book wrongBook = new Book("uh oh", "uh oh", "uh oh"); @Override public void create(Book book, PrintWriter writer) { @@ -34,31 +35,55 @@ public void create(Book book, PrintWriter writer) { @Override public Book searchById(String value) { - // TODO Auto-generated method stub + int id; + try { + id = Integer.parseInt(value); + for (Book b : libraryList) { + if (id == b.getId()) { + return b; + } + } + } catch (Exception e) { + return wrongBook; + } return null; } @Override public Book searchByName(String value) { - // TODO Auto-generated method stub + for (Book b : libraryList) { + if (value.equals(b.getTitle())) { + return b; + } + } return null; } @Override public List searchByAuthor(String value) { - // TODO Auto-generated method stub - return null; + List bookList = new ArrayList<>(); + for (Book b : libraryList) { + if (value.equals(b.getAuthor())) { + bookList.add(b); + } + } + return bookList; } @Override public List searchByGenre(String value) { - // TODO Auto-generated method stub - return null; + List bookList = new ArrayList<>(); + for (Book b : libraryList) { + if (value.equals(b.getGenre())) { + bookList.add(b); + } + } + return bookList; } @Override public void checkOut(Book book, boolean checkedOut) { - + this.searchByName(book.getTitle()).setCheckedOut(checkedOut); } @Override @@ -103,7 +128,7 @@ public void install() throws Exception { // add to in memory list for fast lookup libraryList.add(b); if (!read.hasNextLine()) { - this.id = Integer.parseInt(parts[4]) + 1; + id = Integer.parseInt(parts[4]) + 1; } } diff --git a/mod2/Librairy/src/storage/OutFile.txt b/mod2/Librairy/src/storage/OutFile.txt index df29ab0..c7b0cc3 100644 --- a/mod2/Librairy/src/storage/OutFile.txt +++ b/mod2/Librairy/src/storage/OutFile.txt @@ -1 +1 @@ -fyfyus::hasgfgdfh::sfgsfg::false::0 +fyfyus::hasgfgdfh::sfgsfg::false::0 \ No newline at end of file From ef05adadbb977d61a2ab0639af63a4c6f021e9dd Mon Sep 17 00:00:00 2001 From: bhimio Date: Wed, 27 Apr 2022 14:41:24 -0400 Subject: [PATCH 03/12] this is for you --- mod2/Class roster/src/App.java | 5 +- mod2/Class roster/src/IO/ClassRosterView.java | 18 ++ mod2/Class roster/src/IO/Console.java | 174 ++++++++++++++++++ .../src/controller/ClassRosterControl.java | 45 +++++ .../src/interfaces/ClassRosterDao.java | 5 + .../src/interfaces/ConsoleIo.java | 16 ++ mod2/Class roster/src/model/student.java | 5 + mod2/Class roster/src/storage/OutFile.txt | 0 mod2/Librairy/src/storage/OutFile.txt | 2 +- mod2/d&d.vs/src/modle/Person.java | 9 +- mod2/d&d.vs/src/modle/item.java | 3 +- 11 files changed, 276 insertions(+), 6 deletions(-) create mode 100644 mod2/Class roster/src/IO/ClassRosterView.java create mode 100644 mod2/Class roster/src/IO/Console.java create mode 100644 mod2/Class roster/src/controller/ClassRosterControl.java create mode 100644 mod2/Class roster/src/interfaces/ClassRosterDao.java create mode 100644 mod2/Class roster/src/interfaces/ConsoleIo.java create mode 100644 mod2/Class roster/src/model/student.java create mode 100644 mod2/Class roster/src/storage/OutFile.txt diff --git a/mod2/Class roster/src/App.java b/mod2/Class roster/src/App.java index 0a839f9..1af8874 100644 --- a/mod2/Class roster/src/App.java +++ b/mod2/Class roster/src/App.java @@ -1,5 +1,8 @@ +import controller.ClassRosterControl; + public class App { public static void main(String[] args) throws Exception { - System.out.println("Hello, World!"); + ClassRosterControl con = new ClassRosterControl(); + con.run(); } } diff --git a/mod2/Class roster/src/IO/ClassRosterView.java b/mod2/Class roster/src/IO/ClassRosterView.java new file mode 100644 index 0000000..10c5437 --- /dev/null +++ b/mod2/Class roster/src/IO/ClassRosterView.java @@ -0,0 +1,18 @@ +package IO; + +import interfaces.ConsoleIo; + +public class ClassRosterView { + private ConsoleIo io = new Console(); + + public int printMenuAndGetSelection() { + io.print("Main Menu"); + io.print("1. List Student IDs"); + io.print("2. Create New Student"); + io.print("3. View a Student"); + io.print("4. Remove a Student"); + io.print("5. Exit"); + + return io.getInt("Please select from the above choices.", 1, 5); + } +} diff --git a/mod2/Class roster/src/IO/Console.java b/mod2/Class roster/src/IO/Console.java new file mode 100644 index 0000000..b856fe3 --- /dev/null +++ b/mod2/Class roster/src/IO/Console.java @@ -0,0 +1,174 @@ +package IO; + +import java.util.Scanner; + +import interfaces.ConsoleIo; + +public class Console implements ConsoleIo { + private Scanner sc = new Scanner(System.in); + + @Override + public int getInt(String prompt) { + boolean isCorrect = false; + int value = 0; + String userInput; + while (!isCorrect) { + userInput = this.getString(prompt); + try { + value = Integer.parseInt(userInput); + isCorrect = true; + } catch (Exception e) { + this.print("that was not a number please try again"); + } + } + return value; + } + + @Override + public int getInt(String prompt, int min, int max) { + boolean isCorrect = false; + int value; + do { + value = this.getInt(prompt); + if (value > max) { + this.print("that number was to high"); + } else if (value < min) { + this.print("that number was to low"); + } else { + isCorrect = true; + } + } while (!isCorrect); + return value; + } + + @Override + public float getFloat(String prompt) { + boolean isCorrect = false; + float value = 0; + String userInput; + while (!isCorrect) { + userInput = this.getString(prompt); + try { + value = Float.parseFloat(userInput); + isCorrect = true; + } catch (Exception e) { + this.print("that was not a number please try again"); + } + } + return value; + } + + @Override + public float getFloat(String prompt, float min, float max) { + boolean isCorrect = false; + float value; + do { + value = this.getFloat(prompt); + if (value > max) { + this.print("that number was to high"); + } else if (value < min) { + this.print("that number was to low"); + } else { + isCorrect = true; + } + } while (!isCorrect); + return value; + } + + @Override + public double getDouble(String prompt) { + boolean isCorrect = false; + double value = 0; + String userInput; + while (!isCorrect) { + userInput = this.getString(prompt); + try { + value = Double.parseDouble(userInput); + isCorrect = true; + } catch (Exception e) { + this.print("That was not a double. Please try again"); + } + } + return value; + } + + @Override + public double getDouble(String prompt, Double min, Double max) { + boolean isCorrect = false; + double value; + do { + value = this.getDouble(prompt); + if (value > max) { + this.print("that number was to high"); + } else if (value < min) { + this.print("that number was to low"); + } else { + isCorrect = true; + } + } while (!isCorrect); + return value; + } + + @Override + public boolean getboolean(String prompt) { + boolean isCorrect = false; + boolean value = false; + String userInput; + while (!isCorrect) { + userInput = this.getString(prompt); + try { + value = Boolean.parseBoolean(userInput); + isCorrect = true; + } catch (Exception e) { + this.print("That was not a boolean. Please try again"); + } + } + return value; + } + + @Override + public long getLong(String prompt) { + boolean isCorrect = false; + String userInput; + long value = 0; + while (!isCorrect) { + userInput = this.getString(prompt); + try { + value = Long.parseLong(userInput); + isCorrect = true; + } catch (Exception e) { + this.print("That was not a double. Please try again"); + } + } + return value; + } + + + public long getLong(String prompt, long min, long max) { + boolean isCorrect = false; + long value; + do { + value = this.getLong(prompt); + if (value > max) { + this.print("that number was to high"); + } else if (value < min) { + this.print("that number was to low"); + } else { + isCorrect = true; + } + } while (!isCorrect); + return value; + } + + @Override + public String getString(String prompt) { + this.print(prompt); + return this.sc.nextLine(); + } + + @Override + public void print(String msg) { + System.out.println(msg); + + } +} diff --git a/mod2/Class roster/src/controller/ClassRosterControl.java b/mod2/Class roster/src/controller/ClassRosterControl.java new file mode 100644 index 0000000..1d0f88d --- /dev/null +++ b/mod2/Class roster/src/controller/ClassRosterControl.java @@ -0,0 +1,45 @@ +package controller; + +import IO.ClassRosterView; +import IO.Console; +import interfaces.ConsoleIo; + +public class ClassRosterControl { + private ConsoleIo io = new Console(); + ClassRosterView view = new ClassRosterView(); + + public void run() { + boolean keepGoing = true; + int menuSelection = 0; + while (keepGoing) { + + menuSelection = getMenuSelection(); + + switch (menuSelection) { + case 1: + io.print("LIST STUDENTS"); + break; + case 2: + io.print("CREATE STUDENT"); + break; + case 3: + io.print("VIEW STUDENT"); + break; + case 4: + io.print("REMOVE STUDENT"); + break; + case 5: + keepGoing = false; + break; + default: + io.print("UNKNOWN COMMAND"); + } + + } + io.print("GOOD BYE"); + } + + private int getMenuSelection() { + return view.printMenuAndGetSelection(); + } +} diff --git a/mod2/Class roster/src/interfaces/ClassRosterDao.java b/mod2/Class roster/src/interfaces/ClassRosterDao.java new file mode 100644 index 0000000..9291df6 --- /dev/null +++ b/mod2/Class roster/src/interfaces/ClassRosterDao.java @@ -0,0 +1,5 @@ +package interfaces; + +public interface ClassRosterDao { + +} diff --git a/mod2/Class roster/src/interfaces/ConsoleIo.java b/mod2/Class roster/src/interfaces/ConsoleIo.java new file mode 100644 index 0000000..b8268ef --- /dev/null +++ b/mod2/Class roster/src/interfaces/ConsoleIo.java @@ -0,0 +1,16 @@ +package interfaces; + +public interface ConsoleIo { + public void print(String msg); + public int getInt(String prompt); + public int getInt(String prompt, int min, int max); + public float getFloat(String prompt); + public float getFloat(String prompt, float min, float max); + public double getDouble(String prompt); + public double getDouble(String prompt, Double min, Double max); + public boolean getboolean(String prompt); + public String getString(String prompt); + public long getLong(String prompt); + public long getLong(String prompt, long min, long max); + +} diff --git a/mod2/Class roster/src/model/student.java b/mod2/Class roster/src/model/student.java new file mode 100644 index 0000000..714ecd2 --- /dev/null +++ b/mod2/Class roster/src/model/student.java @@ -0,0 +1,5 @@ +package model; + +public class student { + +} diff --git a/mod2/Class roster/src/storage/OutFile.txt b/mod2/Class roster/src/storage/OutFile.txt new file mode 100644 index 0000000..e69de29 diff --git a/mod2/Librairy/src/storage/OutFile.txt b/mod2/Librairy/src/storage/OutFile.txt index c7b0cc3..ab35ce3 100644 --- a/mod2/Librairy/src/storage/OutFile.txt +++ b/mod2/Librairy/src/storage/OutFile.txt @@ -1 +1 @@ -fyfyus::hasgfgdfh::sfgsfg::false::0 \ No newline at end of file +rock::god::hat::false::0 diff --git a/mod2/d&d.vs/src/modle/Person.java b/mod2/d&d.vs/src/modle/Person.java index 32ea353..5587090 100644 --- a/mod2/d&d.vs/src/modle/Person.java +++ b/mod2/d&d.vs/src/modle/Person.java @@ -1,7 +1,11 @@ package modle; -import java.util.List; + +import javax.annotation.processing.RoundEnvironment; public class Person { + private static RoundEnvironment round = new RoundEnvironment() { + + }; private int str; public int getStr() { @@ -82,7 +86,6 @@ public int getWism() { return this.wism; } - private int car; public int getCar() { @@ -99,5 +102,5 @@ public int getCarm() { return this.carm; } - //private List itemList = new List(); + // private List itemList = new List(); } diff --git a/mod2/d&d.vs/src/modle/item.java b/mod2/d&d.vs/src/modle/item.java index b293ce5..2c5b437 100644 --- a/mod2/d&d.vs/src/modle/item.java +++ b/mod2/d&d.vs/src/modle/item.java @@ -1,5 +1,6 @@ package modle; public class item { - + private String name; + private int weight; } From 4b869971284a32ac366ec0fa9d75d9a557b9d522 Mon Sep 17 00:00:00 2001 From: bhimio Date: Wed, 4 May 2022 10:49:39 -0400 Subject: [PATCH 04/12] saving... --- mod2/Class roster/src/IO/ClassRosterView.java | 76 ++++++++++++++++++- mod2/Class roster/src/IO/Console.java | 39 +++++----- .../src/controller/ClassRosterControl.java | 57 ++++++++++++-- .../src/dao/ClassRosterDaoFileImpl.java | 36 +++++++++ .../src/interfaces/ClassRosterDao.java | 47 +++++++++++- .../src/interfaces/ConsoleIo.java | 30 +++++--- mod2/Class roster/src/model/Student.java | 40 ++++++++++ mod2/Class roster/src/model/student.java | 5 -- 8 files changed, 285 insertions(+), 45 deletions(-) create mode 100644 mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java create mode 100644 mod2/Class roster/src/model/Student.java delete mode 100644 mod2/Class roster/src/model/student.java diff --git a/mod2/Class roster/src/IO/ClassRosterView.java b/mod2/Class roster/src/IO/ClassRosterView.java index 10c5437..c5f7641 100644 --- a/mod2/Class roster/src/IO/ClassRosterView.java +++ b/mod2/Class roster/src/IO/ClassRosterView.java @@ -1,6 +1,9 @@ package IO; +import java.util.List; + import interfaces.ConsoleIo; +import model.Student; public class ClassRosterView { private ConsoleIo io = new Console(); @@ -13,6 +16,77 @@ public int printMenuAndGetSelection() { io.print("4. Remove a Student"); io.print("5. Exit"); - return io.getInt("Please select from the above choices.", 1, 5); + return io.readInt("Please select from the above choices.", 1, 5); + } + + public Student getNewStudentInfo() { + String studentId = io.readString("Please enter Student ID"); + String firstName = io.readString("Please enter First Name"); + String lastName = io.readString("Please enter Last Name"); + String cohort = io.readString("Please enter Cohort"); + Student currentStudent = new Student(studentId); + currentStudent.setFirstName(firstName); + currentStudent.setLastName(lastName); + currentStudent.setCohort(cohort); + return currentStudent; + } + + public void displayCreateStudentBanner() { + io.print("=== Create Student ==="); + } + + public void displayCreateSuccessBanner() { + io.readString( + "Student successfully created. Please hit enter to continue"); + } + + public void displayStudentList(List studentList) { + for (Student currentStudent : studentList) { + io.print(currentStudent.getStudentId() + ": " + + currentStudent.getFirstName() + " " + + currentStudent.getLastName()); + } + io.readString("Please hit enter to continue."); + } + + public void displayDisplayAllBanner() { + io.print("=== Display All Students ==="); + } + + public void displayDisplayStudentBanner () { + io.print("=== Display Student ==="); + } + + public String getStudentIdChoice() { + return io.readString("Please enter the Student ID."); + } + + public void displayStudent(Student student) { + if (student != null) { + io.print(student.getStudentId()); + io.print(student.getFirstName() + " " + student.getLastName()); + io.print(student.getCohort()); + io.print(""); + } else { + io.print("No such student."); + } + io.readString("Please hit enter to continue."); + } + + public void displayRemoveStudentBanner () { + io.print("=== Remove Student ==="); + } + + public void displayRemoveSuccessBanner () { + io.readString("Student successfully removed. Please hit enter to continue."); + } + + public void displayExitBanner() { + io.print("Good Bye!!!"); + } + + public void displayUnknownCommandBanner() { + io.print("Unknown Command!!!"); } + } diff --git a/mod2/Class roster/src/IO/Console.java b/mod2/Class roster/src/IO/Console.java index b856fe3..3a7ac0c 100644 --- a/mod2/Class roster/src/IO/Console.java +++ b/mod2/Class roster/src/IO/Console.java @@ -8,12 +8,12 @@ public class Console implements ConsoleIo { private Scanner sc = new Scanner(System.in); @Override - public int getInt(String prompt) { + public int readInt(String prompt) { boolean isCorrect = false; int value = 0; String userInput; while (!isCorrect) { - userInput = this.getString(prompt); + userInput = this.readString(prompt); try { value = Integer.parseInt(userInput); isCorrect = true; @@ -25,11 +25,11 @@ public int getInt(String prompt) { } @Override - public int getInt(String prompt, int min, int max) { + public int readInt(String prompt, int min, int max) { boolean isCorrect = false; int value; do { - value = this.getInt(prompt); + value = this.readInt(prompt); if (value > max) { this.print("that number was to high"); } else if (value < min) { @@ -42,12 +42,12 @@ public int getInt(String prompt, int min, int max) { } @Override - public float getFloat(String prompt) { + public float readFloat(String prompt) { boolean isCorrect = false; float value = 0; String userInput; while (!isCorrect) { - userInput = this.getString(prompt); + userInput = this.readString(prompt); try { value = Float.parseFloat(userInput); isCorrect = true; @@ -59,11 +59,11 @@ public float getFloat(String prompt) { } @Override - public float getFloat(String prompt, float min, float max) { + public float readFloat(String prompt, float min, float max) { boolean isCorrect = false; float value; do { - value = this.getFloat(prompt); + value = this.readFloat(prompt); if (value > max) { this.print("that number was to high"); } else if (value < min) { @@ -76,12 +76,12 @@ public float getFloat(String prompt, float min, float max) { } @Override - public double getDouble(String prompt) { + public double readDouble(String prompt) { boolean isCorrect = false; double value = 0; String userInput; while (!isCorrect) { - userInput = this.getString(prompt); + userInput = this.readString(prompt); try { value = Double.parseDouble(userInput); isCorrect = true; @@ -93,11 +93,11 @@ public double getDouble(String prompt) { } @Override - public double getDouble(String prompt, Double min, Double max) { + public double readDouble(String prompt, Double min, Double max) { boolean isCorrect = false; double value; do { - value = this.getDouble(prompt); + value = this.readDouble(prompt); if (value > max) { this.print("that number was to high"); } else if (value < min) { @@ -110,12 +110,12 @@ public double getDouble(String prompt, Double min, Double max) { } @Override - public boolean getboolean(String prompt) { + public boolean readboolean(String prompt) { boolean isCorrect = false; boolean value = false; String userInput; while (!isCorrect) { - userInput = this.getString(prompt); + userInput = this.readString(prompt); try { value = Boolean.parseBoolean(userInput); isCorrect = true; @@ -127,12 +127,12 @@ public boolean getboolean(String prompt) { } @Override - public long getLong(String prompt) { + public long readLong(String prompt) { boolean isCorrect = false; String userInput; long value = 0; while (!isCorrect) { - userInput = this.getString(prompt); + userInput = this.readString(prompt); try { value = Long.parseLong(userInput); isCorrect = true; @@ -143,12 +143,11 @@ public long getLong(String prompt) { return value; } - - public long getLong(String prompt, long min, long max) { + public long readLong(String prompt, long min, long max) { boolean isCorrect = false; long value; do { - value = this.getLong(prompt); + value = this.readLong(prompt); if (value > max) { this.print("that number was to high"); } else if (value < min) { @@ -161,7 +160,7 @@ public long getLong(String prompt, long min, long max) { } @Override - public String getString(String prompt) { + public String readString(String prompt) { this.print(prompt); return this.sc.nextLine(); } diff --git a/mod2/Class roster/src/controller/ClassRosterControl.java b/mod2/Class roster/src/controller/ClassRosterControl.java index 1d0f88d..c268f89 100644 --- a/mod2/Class roster/src/controller/ClassRosterControl.java +++ b/mod2/Class roster/src/controller/ClassRosterControl.java @@ -1,45 +1,86 @@ package controller; +import java.util.List; + import IO.ClassRosterView; import IO.Console; +import dao.ClassRosterDaoFileImpl; +import interfaces.ClassRosterDao; import interfaces.ConsoleIo; +import model.Student; public class ClassRosterControl { private ConsoleIo io = new Console(); ClassRosterView view = new ClassRosterView(); + ClassRosterDao dao = new ClassRosterDaoFileImpl(); public void run() { boolean keepGoing = true; int menuSelection = 0; while (keepGoing) { - + menuSelection = getMenuSelection(); switch (menuSelection) { case 1: - io.print("LIST STUDENTS"); + listStudents(); break; case 2: - io.print("CREATE STUDENT"); + createStudent(); break; case 3: - io.print("VIEW STUDENT"); + viewStudent(); break; case 4: - io.print("REMOVE STUDENT"); + removeStudent(); break; case 5: keepGoing = false; break; default: - io.print("UNKNOWN COMMAND"); + unknownCommand(); } } - io.print("GOOD BYE"); + exitMessage(); } - + private int getMenuSelection() { return view.printMenuAndGetSelection(); } + + private void createStudent() { + view.displayCreateStudentBanner(); + Student newStudent = view.getNewStudentInfo(); + dao.addStudent(newStudent.getStudentId(), newStudent); + view.displayCreateSuccessBanner(); + } + + private void listStudents() { + view.displayDisplayAllBanner(); + List studentList = dao.getAllStudents(); + view.displayStudentList(studentList); + } + + private void viewStudent() { + view.displayDisplayStudentBanner(); + String studentId = view.getStudentIdChoice(); + Student student = dao.getStudent(studentId); + view.displayStudent(student); + } + + private void removeStudent() { + view.displayRemoveStudentBanner(); + String studentId = view.getStudentIdChoice(); + dao.removeStudent(studentId); + view.displayRemoveSuccessBanner(); + } + + private void unknownCommand() { + view.displayUnknownCommandBanner(); + } + + private void exitMessage() { + view.displayExitBanner(); + } } diff --git a/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java b/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java new file mode 100644 index 0000000..6d26746 --- /dev/null +++ b/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java @@ -0,0 +1,36 @@ +package dao; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import interfaces.ClassRosterDao; +import model.Student; + +public class ClassRosterDaoFileImpl implements ClassRosterDao { + private Map students = new HashMap<>(); + + @Override + public Student addStudent(String studentId, Student student) { + Student newStudent = students.put(studentId, student); + return newStudent; + } + + @Override + public List getAllStudents() { + return new ArrayList(students.values()); + } + + @Override + public Student getStudent(String studentId) { + return students.get(studentId); + } + + @Override + public Student removeStudent(String studentId) { + Student removedStudent = students.remove(studentId); + return removedStudent; + } + +} \ No newline at end of file diff --git a/mod2/Class roster/src/interfaces/ClassRosterDao.java b/mod2/Class roster/src/interfaces/ClassRosterDao.java index 9291df6..5d34a2a 100644 --- a/mod2/Class roster/src/interfaces/ClassRosterDao.java +++ b/mod2/Class roster/src/interfaces/ClassRosterDao.java @@ -1,5 +1,50 @@ package interfaces; +import java.util.List; + +import model.Student; + public interface ClassRosterDao { - + /** + * Adds the given Student to the roster and associates it with the given + * student id. If there is already a student associated with the given + * student id it will return that student object, otherwise it will + * return null. + * + * @param studentId id with which student is to be associated + * @param student student to be added to the roster + * @return the Student object previously associated with the given + * student id if it exists, null otherwise + */ + Student addStudent(String studentId, Student student); + + /** + * Returns a String array containing the student ids of all + * students in the roster. + * + * @return String array containing the ids of all the students + * in the roster + */ + List getAllStudents(); + + /** + * Returns the student object associated with the given student id. + * Returns null if no such student exists + * + * @param studentId ID of the student to retrieve + * @return the Student object associated with the given student id, + * null if no such student exists + */ + Student getStudent(String studentId); + + /** + * Removes from the roster the student associated with the given id. + * Returns the student object that is being removed or null if + * there is no student associated with the given id + * + * @param studentId id of student to be removed + * @return Student object that was removed or null if no student + * was associated with the given student id + */ + Student removeStudent(String studentId); } diff --git a/mod2/Class roster/src/interfaces/ConsoleIo.java b/mod2/Class roster/src/interfaces/ConsoleIo.java index b8268ef..3ea93b2 100644 --- a/mod2/Class roster/src/interfaces/ConsoleIo.java +++ b/mod2/Class roster/src/interfaces/ConsoleIo.java @@ -2,15 +2,25 @@ public interface ConsoleIo { public void print(String msg); - public int getInt(String prompt); - public int getInt(String prompt, int min, int max); - public float getFloat(String prompt); - public float getFloat(String prompt, float min, float max); - public double getDouble(String prompt); - public double getDouble(String prompt, Double min, Double max); - public boolean getboolean(String prompt); - public String getString(String prompt); - public long getLong(String prompt); - public long getLong(String prompt, long min, long max); + + public int readInt(String prompt); + + public int readInt(String prompt, int min, int max); + + public float readFloat(String prompt); + + public float readFloat(String prompt, float min, float max); + + public double readDouble(String prompt); + + public double readDouble(String prompt, Double min, Double max); + + public boolean readboolean(String prompt); + + public String readString(String prompt); + + public long readLong(String prompt); + + public long readLong(String prompt, long min, long max); } diff --git a/mod2/Class roster/src/model/Student.java b/mod2/Class roster/src/model/Student.java new file mode 100644 index 0000000..0ca9adb --- /dev/null +++ b/mod2/Class roster/src/model/Student.java @@ -0,0 +1,40 @@ +package model; + +public class Student { + private String firstName; + private String lastName; + private String studentId; + private String cohort; // Java or .Net + cohort month/year + + public Student(String studentId) { + this.studentId = studentId; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getStudentId() { + return studentId; + } + + public String getCohort() { + return cohort; + } + + public void setCohort(String cohort) { + this.cohort = cohort; + } +} diff --git a/mod2/Class roster/src/model/student.java b/mod2/Class roster/src/model/student.java deleted file mode 100644 index 714ecd2..0000000 --- a/mod2/Class roster/src/model/student.java +++ /dev/null @@ -1,5 +0,0 @@ -package model; - -public class student { - -} From 664e899cbb3d74e8f87fbff7fe548126bdc50c19 Mon Sep 17 00:00:00 2001 From: bhimio Date: Wed, 4 May 2022 14:05:48 -0400 Subject: [PATCH 05/12] saving... roster finished --- mod2/Class roster/roster.txt | 2 + mod2/Class roster/src/App.java | 12 +- mod2/Class roster/src/IO/ClassRosterView.java | 76 ++++++----- .../src/controller/ClassRosterControl.java | 79 ++++++------ .../src/dao/ClassRosterDaoException.java | 13 ++ .../src/dao/ClassRosterDaoFileImpl.java | 118 +++++++++++++++++- .../src/interfaces/ClassRosterDao.java | 13 +- 7 files changed, 233 insertions(+), 80 deletions(-) create mode 100644 mod2/Class roster/roster.txt create mode 100644 mod2/Class roster/src/dao/ClassRosterDaoException.java diff --git a/mod2/Class roster/roster.txt b/mod2/Class roster/roster.txt new file mode 100644 index 0000000..27d94c6 --- /dev/null +++ b/mod2/Class roster/roster.txt @@ -0,0 +1,2 @@ +0002::yaga::baborine::hapy.NET +0001::bhima::raisz::1/2/3/4/5/6/7/8/9/0/ diff --git a/mod2/Class roster/src/App.java b/mod2/Class roster/src/App.java index 1af8874..ad29ed4 100644 --- a/mod2/Class roster/src/App.java +++ b/mod2/Class roster/src/App.java @@ -1,8 +1,16 @@ +import IO.ClassRosterView; +import IO.Console; import controller.ClassRosterControl; +import dao.ClassRosterDaoFileImpl; +import interfaces.ClassRosterDao; +import interfaces.ConsoleIo; public class App { public static void main(String[] args) throws Exception { - ClassRosterControl con = new ClassRosterControl(); - con.run(); + ConsoleIo myIo = new Console(); + ClassRosterView myView = new ClassRosterView(myIo); + ClassRosterDao myDao = new ClassRosterDaoFileImpl(); + ClassRosterControl controller = new ClassRosterControl(myDao, myView); + controller.run(); } } diff --git a/mod2/Class roster/src/IO/ClassRosterView.java b/mod2/Class roster/src/IO/ClassRosterView.java index c5f7641..4476f0d 100644 --- a/mod2/Class roster/src/IO/ClassRosterView.java +++ b/mod2/Class roster/src/IO/ClassRosterView.java @@ -6,7 +6,11 @@ import model.Student; public class ClassRosterView { - private ConsoleIo io = new Console(); + ConsoleIo io; + + public ClassRosterView(ConsoleIo io) { + this.io = io; + } public int printMenuAndGetSelection() { io.print("Main Menu"); @@ -50,43 +54,47 @@ public void displayStudentList(List studentList) { } public void displayDisplayAllBanner() { - io.print("=== Display All Students ==="); - } - - public void displayDisplayStudentBanner () { - io.print("=== Display Student ==="); - } - - public String getStudentIdChoice() { - return io.readString("Please enter the Student ID."); - } - - public void displayStudent(Student student) { - if (student != null) { - io.print(student.getStudentId()); - io.print(student.getFirstName() + " " + student.getLastName()); - io.print(student.getCohort()); - io.print(""); - } else { - io.print("No such student."); - } - io.readString("Please hit enter to continue."); - } - - public void displayRemoveStudentBanner () { - io.print("=== Remove Student ==="); - } - - public void displayRemoveSuccessBanner () { - io.readString("Student successfully removed. Please hit enter to continue."); - } - + io.print("=== Display All Students ==="); + } + + public void displayDisplayStudentBanner() { + io.print("=== Display Student ==="); + } + + public String getStudentIdChoice() { + return io.readString("Please enter the Student ID."); + } + + public void displayStudent(Student student) { + if (student != null) { + io.print(student.getStudentId()); + io.print(student.getFirstName() + " " + student.getLastName()); + io.print(student.getCohort()); + io.print(""); + } else { + io.print("No such student."); + } + io.readString("Please hit enter to continue."); + } + + public void displayRemoveStudentBanner() { + io.print("=== Remove Student ==="); + } + + public void displayRemoveSuccessBanner() { + io.readString("Student successfully removed. Please hit enter to continue."); + } + public void displayExitBanner() { io.print("Good Bye!!!"); } - + public void displayUnknownCommandBanner() { io.print("Unknown Command!!!"); } - + + public void displayErrorMessage(String errorMsg) { + io.print("=== ERROR ==="); + io.print(errorMsg); + } } diff --git a/mod2/Class roster/src/controller/ClassRosterControl.java b/mod2/Class roster/src/controller/ClassRosterControl.java index c268f89..195246c 100644 --- a/mod2/Class roster/src/controller/ClassRosterControl.java +++ b/mod2/Class roster/src/controller/ClassRosterControl.java @@ -3,73 +3,80 @@ import java.util.List; import IO.ClassRosterView; -import IO.Console; -import dao.ClassRosterDaoFileImpl; +import dao.ClassRosterDaoException; import interfaces.ClassRosterDao; -import interfaces.ConsoleIo; import model.Student; public class ClassRosterControl { - private ConsoleIo io = new Console(); - ClassRosterView view = new ClassRosterView(); - ClassRosterDao dao = new ClassRosterDaoFileImpl(); + ClassRosterView view; + ClassRosterDao dao; + ClassRosterDaoException e; + + public ClassRosterControl(ClassRosterDao dao, ClassRosterView view) { + this.dao = dao; + this.view = view; + } public void run() { - boolean keepGoing = true; - int menuSelection = 0; - while (keepGoing) { + boolean keepGoing = true; + int menuSelection = 0; + try { + while (keepGoing) { - menuSelection = getMenuSelection(); + menuSelection = getMenuSelection(); - switch (menuSelection) { - case 1: - listStudents(); - break; - case 2: - createStudent(); - break; - case 3: - viewStudent(); - break; - case 4: - removeStudent(); - break; - case 5: - keepGoing = false; - break; - default: - unknownCommand(); - } + switch (menuSelection) { + case 1: + listStudents(); + break; + case 2: + createStudent(); + break; + case 3: + viewStudent(); + break; + case 4: + removeStudent(); + break; + case 5: + keepGoing = false; + break; + default: + unknownCommand(); + } - } - exitMessage(); - } + } + exitMessage(); + } catch (ClassRosterDaoException e) { + view.displayErrorMessage(e.getMessage()); + } + } private int getMenuSelection() { return view.printMenuAndGetSelection(); } - private void createStudent() { + private void createStudent() throws ClassRosterDaoException { view.displayCreateStudentBanner(); Student newStudent = view.getNewStudentInfo(); dao.addStudent(newStudent.getStudentId(), newStudent); view.displayCreateSuccessBanner(); } - private void listStudents() { + private void listStudents() throws ClassRosterDaoException{ view.displayDisplayAllBanner(); List studentList = dao.getAllStudents(); view.displayStudentList(studentList); } - private void viewStudent() { + private void viewStudent() throws ClassRosterDaoException{ view.displayDisplayStudentBanner(); String studentId = view.getStudentIdChoice(); Student student = dao.getStudent(studentId); view.displayStudent(student); } - private void removeStudent() { + private void removeStudent() throws ClassRosterDaoException { view.displayRemoveStudentBanner(); String studentId = view.getStudentIdChoice(); dao.removeStudent(studentId); diff --git a/mod2/Class roster/src/dao/ClassRosterDaoException.java b/mod2/Class roster/src/dao/ClassRosterDaoException.java new file mode 100644 index 0000000..2e122ec --- /dev/null +++ b/mod2/Class roster/src/dao/ClassRosterDaoException.java @@ -0,0 +1,13 @@ +package dao; + +public class ClassRosterDaoException extends Exception{ + + public ClassRosterDaoException(String message) { + super(message); + } + + public ClassRosterDaoException(String message, Throwable cause) { + super(message, cause); + } + +} \ No newline at end of file diff --git a/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java b/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java index 6d26746..ca65bb3 100644 --- a/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java +++ b/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java @@ -1,36 +1,146 @@ package dao; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Scanner; import interfaces.ClassRosterDao; import model.Student; public class ClassRosterDaoFileImpl implements ClassRosterDao { private Map students = new HashMap<>(); + public static final String ROSTER_FILE = "roster.txt"; + public static final String DELIMITER = "::"; @Override - public Student addStudent(String studentId, Student student) { + public Student addStudent(String studentId, Student student) throws ClassRosterDaoException { Student newStudent = students.put(studentId, student); + writeRoster(); return newStudent; } @Override - public List getAllStudents() { + public List getAllStudents() throws ClassRosterDaoException { + loadRoster(); return new ArrayList(students.values()); } @Override - public Student getStudent(String studentId) { + public Student getStudent(String studentId) throws ClassRosterDaoException { + return students.get(studentId); } @Override - public Student removeStudent(String studentId) { + public Student removeStudent(String studentId) throws ClassRosterDaoException { Student removedStudent = students.remove(studentId); return removedStudent; } + /** + * reads all students from file + * preferably at startup + * + * @throws ClassRosterDaoException if an error occurs wile reading the file + */ + private void loadRoster() throws ClassRosterDaoException { + Scanner scanner; + + try { + // Create Scanner for reading the file + scanner = new Scanner( + new BufferedReader( + new FileReader(ROSTER_FILE))); + } catch (FileNotFoundException e) { + throw new ClassRosterDaoException( + "-_- Could not load roster data into memory.", e); + } + // currentLine holds the most recent line read from the file + String currentLine; + // currentTokens holds each of the parts of the currentLine after it has + // been split on our DELIMITER + // NOTE FOR APPRENTICES: In our case we use :: as our delimiter. If + // currentLine looks like this: + // 1234::Joe::Smith::Java-September2013 + // then currentTokens will be a string array that looks like this: + // + // ___________________________________ + // | | | | | + // |1234|Joe|Smith|Java-September2013| + // | | | | | + // ----------------------------------- + // [0] [1] [2] [3] + String[] currentTokens; + // Go through ROSTER_FILE line by line, decoding each line into a + // Student object. + // Process while we have more lines in the file + while (scanner.hasNextLine()) { + // get the next line in the file + currentLine = scanner.nextLine(); + // break up the line into tokens + currentTokens = currentLine.split(DELIMITER); + // Create a new Student object and put it into the map of students + // NOTE FOR APPRENTICES: We are going to use the student id + // which is currentTokens[0] as the map key for our student object. + // We also have to pass the student id into the Student constructor + Student currentStudent = new Student(currentTokens[0]); + // Set the remaining vlaues on currentStudent manually + currentStudent.setFirstName(currentTokens[1]); + currentStudent.setLastName(currentTokens[2]); + currentStudent.setCohort(currentTokens[3]); + + // Put currentStudent into the map using studentID as the key + students.put(currentStudent.getStudentId(), currentStudent); + } + // close scanner + scanner.close(); + } + + /** + * Writes all students in the roster out to a ROSTER_FILE. See loadRoster + * for file format. + * + * @throws ClassRosterDaoException if an error occurs writing to the file + */ + private void writeRoster() throws ClassRosterDaoException { + // NOTE FOR APPRENTICES: We are not handling the IOException - but + // we are translating it to an application specific exception and + // then simple throwing it (i.e. 'reporting' it) to the code that + // called us. It is the responsibility of the calling code to + // handle any errors that occur. + PrintWriter out; + + try { + out = new PrintWriter(new FileWriter(ROSTER_FILE)); + } catch (IOException e) { + throw new ClassRosterDaoException( + "Could not save student data.", e); + } + + // Write out the Student objects to the roster file. + // NOTE TO THE APPRENTICES: We could just grab the student map, + // get the Collection of Students and iterate over them but we've + // already created a method that gets a List of Students so + // we'll reuse it. + List studentList = this.getAllStudents(); + for (Student currentStudent : studentList) { + // write the Student object to the file + out.println(currentStudent.getStudentId() + DELIMITER + + currentStudent.getFirstName() + DELIMITER + + currentStudent.getLastName() + DELIMITER + + currentStudent.getCohort()); + // force PrintWriter to write line to the file + out.flush(); + } + // Clean up + out.close(); + } } \ No newline at end of file diff --git a/mod2/Class roster/src/interfaces/ClassRosterDao.java b/mod2/Class roster/src/interfaces/ClassRosterDao.java index 5d34a2a..f20a13f 100644 --- a/mod2/Class roster/src/interfaces/ClassRosterDao.java +++ b/mod2/Class roster/src/interfaces/ClassRosterDao.java @@ -2,6 +2,7 @@ import java.util.List; +import dao.ClassRosterDaoException; import model.Student; public interface ClassRosterDao { @@ -15,8 +16,9 @@ public interface ClassRosterDao { * @param student student to be added to the roster * @return the Student object previously associated with the given * student id if it exists, null otherwise + * @throws ClassRosterDaoException */ - Student addStudent(String studentId, Student student); + Student addStudent(String studentId, Student student) throws ClassRosterDaoException; /** * Returns a String array containing the student ids of all @@ -24,8 +26,9 @@ public interface ClassRosterDao { * * @return String array containing the ids of all the students * in the roster + * @throws ClassRosterDaoException */ - List getAllStudents(); + List getAllStudents() throws ClassRosterDaoException; /** * Returns the student object associated with the given student id. @@ -34,8 +37,9 @@ public interface ClassRosterDao { * @param studentId ID of the student to retrieve * @return the Student object associated with the given student id, * null if no such student exists + * @throws ClassRosterDaoException */ - Student getStudent(String studentId); + Student getStudent(String studentId) throws ClassRosterDaoException; /** * Removes from the roster the student associated with the given id. @@ -45,6 +49,7 @@ public interface ClassRosterDao { * @param studentId id of student to be removed * @return Student object that was removed or null if no student * was associated with the given student id + * @throws ClassRosterDaoException */ - Student removeStudent(String studentId); + Student removeStudent(String studentId) throws ClassRosterDaoException; } From d510f1775ea6559a1c38e8e76e0cf635a4e2498b Mon Sep 17 00:00:00 2001 From: bhimio Date: Wed, 4 May 2022 14:06:13 -0400 Subject: [PATCH 06/12] go --- mod2/Class roster/src/storage/OutFile.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mod2/Class roster/src/storage/OutFile.txt diff --git a/mod2/Class roster/src/storage/OutFile.txt b/mod2/Class roster/src/storage/OutFile.txt deleted file mode 100644 index e69de29..0000000 From f22eb539d97099654821286e92c7b6a725280d14 Mon Sep 17 00:00:00 2001 From: bhimio Date: Tue, 10 May 2022 08:54:05 -0400 Subject: [PATCH 07/12] finished --- mod2/Class roster/src/App.java | 15 +- .../audit/ClassRosterAuditDaoFileImpl.java | 30 +++ .../src/controller/ClassRosterControl.java | 155 ++++++----- .../src/dao/ClassRosterDaoException.java | 13 - .../src/dao/ClassRosterDaoFileImpl.java | 241 +++++++++--------- .../ClassRosterDataValidationException.java | 14 + .../ClassRosterDuplicateIdException.java | 14 + .../ClassRosterPersistenceException.java | 14 + .../src/interfaces/ClassRosterAuditDao.java | 15 ++ .../src/interfaces/ClassRosterDao.java | 108 ++++---- .../interfaces/ClassRosterServiceLayer.java | 64 +++++ .../ClassRosterServiceLayerFileImpl.java | 96 +++++++ mod2/d&d.vs/src/modle/Person.java | 3 - 13 files changed, 535 insertions(+), 247 deletions(-) create mode 100644 mod2/Class roster/src/audit/ClassRosterAuditDaoFileImpl.java delete mode 100644 mod2/Class roster/src/dao/ClassRosterDaoException.java create mode 100644 mod2/Class roster/src/exceptions/ClassRosterDataValidationException.java create mode 100644 mod2/Class roster/src/exceptions/ClassRosterDuplicateIdException.java create mode 100644 mod2/Class roster/src/exceptions/ClassRosterPersistenceException.java create mode 100644 mod2/Class roster/src/interfaces/ClassRosterAuditDao.java create mode 100644 mod2/Class roster/src/interfaces/ClassRosterServiceLayer.java create mode 100644 mod2/Class roster/src/serviceLayer/ClassRosterServiceLayerFileImpl.java diff --git a/mod2/Class roster/src/App.java b/mod2/Class roster/src/App.java index ad29ed4..9cc3420 100644 --- a/mod2/Class roster/src/App.java +++ b/mod2/Class roster/src/App.java @@ -1,16 +1,29 @@ import IO.ClassRosterView; import IO.Console; +import audit.ClassRosterAuditDaoFileImpl; import controller.ClassRosterControl; import dao.ClassRosterDaoFileImpl; +import interfaces.ClassRosterAuditDao; import interfaces.ClassRosterDao; +import interfaces.ClassRosterServiceLayer; import interfaces.ConsoleIo; +import serviceLayer.ClassRosterServiceLayerFileImpl; public class App { public static void main(String[] args) throws Exception { + // Instantiate the UserIO implementation ConsoleIo myIo = new Console(); + // Instantiate the View and wire the UserIO implementation into it ClassRosterView myView = new ClassRosterView(myIo); + // Instantiate the DAO ClassRosterDao myDao = new ClassRosterDaoFileImpl(); - ClassRosterControl controller = new ClassRosterControl(myDao, myView); + // Instantiate the Audit DAO + ClassRosterAuditDao myAuditDao = new ClassRosterAuditDaoFileImpl(); + // Instantiate the Service Layer and wire the DAO and Audit DAO into it + ClassRosterServiceLayer myService = new ClassRosterServiceLayerFileImpl(myDao, myAuditDao); + // Instantiate the Controller and wire the Service Layer into it + ClassRosterControl controller = new ClassRosterControl(myService, myView); + // Kick off the Controller controller.run(); } } diff --git a/mod2/Class roster/src/audit/ClassRosterAuditDaoFileImpl.java b/mod2/Class roster/src/audit/ClassRosterAuditDaoFileImpl.java new file mode 100644 index 0000000..00dccfb --- /dev/null +++ b/mod2/Class roster/src/audit/ClassRosterAuditDaoFileImpl.java @@ -0,0 +1,30 @@ +package audit; + +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.time.LocalDateTime; + +import exceptions.ClassRosterPersistenceException; +import interfaces.ClassRosterAuditDao; + +public class ClassRosterAuditDaoFileImpl implements ClassRosterAuditDao { + + public static final String AUDIT_FILE = "audit.txt"; + + @Override + public void writeAuditEntry(String entry) throws ClassRosterPersistenceException { + PrintWriter out; + + try { + out = new PrintWriter(new FileWriter(AUDIT_FILE, true)); + } catch (IOException e) { + throw new ClassRosterPersistenceException("Could not persist audit information.", e); + } + + LocalDateTime timestamp = LocalDateTime.now(); + out.println(timestamp.toString() + " : " + entry); + out.flush(); + } + +} diff --git a/mod2/Class roster/src/controller/ClassRosterControl.java b/mod2/Class roster/src/controller/ClassRosterControl.java index 195246c..61dabde 100644 --- a/mod2/Class roster/src/controller/ClassRosterControl.java +++ b/mod2/Class roster/src/controller/ClassRosterControl.java @@ -3,91 +3,108 @@ import java.util.List; import IO.ClassRosterView; -import dao.ClassRosterDaoException; -import interfaces.ClassRosterDao; +import exceptions.ClassRosterDataValidationException; +import exceptions.ClassRosterDuplicateIdException; +import exceptions.ClassRosterPersistenceException; +import interfaces.ClassRosterServiceLayer; import model.Student; public class ClassRosterControl { - ClassRosterView view; - ClassRosterDao dao; - ClassRosterDaoException e; + private ClassRosterView view; + private ClassRosterServiceLayer service; + ClassRosterPersistenceException e; - public ClassRosterControl(ClassRosterDao dao, ClassRosterView view) { - this.dao = dao; - this.view = view; - } + public ClassRosterControl(ClassRosterServiceLayer service, ClassRosterView view) { + this.service = service; + this.view = view; + } + + /** + * runs program + */ + public void run() { + boolean keepGoing = true; + int menuSelection = 0; + try { + this.service.run(); + while (keepGoing) { - public void run() { - boolean keepGoing = true; - int menuSelection = 0; - try { - while (keepGoing) { + menuSelection = getMenuSelection(); - menuSelection = getMenuSelection(); + switch (menuSelection) { + case 1: + listStudents(); + break; + case 2: + createStudent(); + break; + case 3: + viewStudent(); + break; + case 4: + removeStudent(); + break; + case 5: + keepGoing = false; + service.stopProgram(); + break; + default: + unknownCommand(); + } - switch (menuSelection) { - case 1: - listStudents(); - break; - case 2: - createStudent(); - break; - case 3: - viewStudent(); - break; - case 4: - removeStudent(); - break; - case 5: - keepGoing = false; - break; - default: - unknownCommand(); - } + } + exitMessage(); + } catch (ClassRosterPersistenceException | ClassRosterDataValidationException | ClassRosterDuplicateIdException e) { + view.displayErrorMessage(e.getMessage()); + } + } - } - exitMessage(); - } catch (ClassRosterDaoException e) { - view.displayErrorMessage(e.getMessage()); - } + private int getMenuSelection() { + return view.printMenuAndGetSelection(); } - private int getMenuSelection() { - return view.printMenuAndGetSelection(); - } + private void createStudent() throws ClassRosterPersistenceException, ClassRosterDataValidationException, + ClassRosterDuplicateIdException { + view.displayCreateStudentBanner(); + boolean hasErrors = false; + do { + Student currentStudent = view.getNewStudentInfo(); + try { + service.createStudent(currentStudent); + view.displayCreateSuccessBanner(); + hasErrors = false; + } catch (ClassRosterDuplicateIdException | ClassRosterDataValidationException e) { + hasErrors = true; + view.displayErrorMessage(e.getMessage()); + } + } while (hasErrors); + } - private void createStudent() throws ClassRosterDaoException { - view.displayCreateStudentBanner(); - Student newStudent = view.getNewStudentInfo(); - dao.addStudent(newStudent.getStudentId(), newStudent); - view.displayCreateSuccessBanner(); - } + private void listStudents() throws ClassRosterPersistenceException { + view.displayDisplayAllBanner(); + List studentList = service.getAllStudents(); + view.displayStudentList(studentList); + } - private void listStudents() throws ClassRosterDaoException{ - view.displayDisplayAllBanner(); - List studentList = dao.getAllStudents(); - view.displayStudentList(studentList); + private void viewStudent() throws ClassRosterPersistenceException { + view.displayDisplayStudentBanner(); + String studentId = view.getStudentIdChoice(); + Student student = service.getStudent(studentId); + view.displayStudent(student); } - private void viewStudent() throws ClassRosterDaoException{ - view.displayDisplayStudentBanner(); - String studentId = view.getStudentIdChoice(); - Student student = dao.getStudent(studentId); - view.displayStudent(student); + private void removeStudent() throws ClassRosterPersistenceException { + view.displayRemoveStudentBanner(); + String studentId = view.getStudentIdChoice(); + service.removeStudent(studentId); + view.displayRemoveSuccessBanner(); } - private void removeStudent() throws ClassRosterDaoException { - view.displayRemoveStudentBanner(); - String studentId = view.getStudentIdChoice(); - dao.removeStudent(studentId); - view.displayRemoveSuccessBanner(); + private void unknownCommand() { + view.displayUnknownCommandBanner(); } - private void unknownCommand() { - view.displayUnknownCommandBanner(); - } - - private void exitMessage() { - view.displayExitBanner(); - } + private void exitMessage() { + view.displayExitBanner(); + } } diff --git a/mod2/Class roster/src/dao/ClassRosterDaoException.java b/mod2/Class roster/src/dao/ClassRosterDaoException.java deleted file mode 100644 index 2e122ec..0000000 --- a/mod2/Class roster/src/dao/ClassRosterDaoException.java +++ /dev/null @@ -1,13 +0,0 @@ -package dao; - -public class ClassRosterDaoException extends Exception{ - - public ClassRosterDaoException(String message) { - super(message); - } - - public ClassRosterDaoException(String message, Throwable cause) { - super(message, cause); - } - -} \ No newline at end of file diff --git a/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java b/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java index ca65bb3..1b56e03 100644 --- a/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java +++ b/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java @@ -12,135 +12,148 @@ import java.util.Map; import java.util.Scanner; +import exceptions.ClassRosterPersistenceException; import interfaces.ClassRosterDao; import model.Student; public class ClassRosterDaoFileImpl implements ClassRosterDao { - private Map students = new HashMap<>(); - public static final String ROSTER_FILE = "roster.txt"; + private Map students = new HashMap<>(); + public static final String ROSTER_FILE = "roster.txt"; public static final String DELIMITER = "::"; - @Override - public Student addStudent(String studentId, Student student) throws ClassRosterDaoException { - Student newStudent = students.put(studentId, student); - writeRoster(); - return newStudent; - } + @Override + public Student addStudent(String studentId, Student student) throws ClassRosterPersistenceException { + Student newStudent = students.put(studentId, student); + writeRoster(); + return newStudent; + } + + @Override + public List getAllStudents() throws ClassRosterPersistenceException { + loadRoster(); + return new ArrayList(students.values()); + } + + @Override + public Student getStudent(String studentId) throws ClassRosterPersistenceException { - @Override - public List getAllStudents() throws ClassRosterDaoException { - loadRoster(); - return new ArrayList(students.values()); - } + return students.get(studentId); + } + + @Override + public Student removeStudent(String studentId) throws ClassRosterPersistenceException { + Student removedStudent = students.remove(studentId); + return removedStudent; + } - @Override - public Student getStudent(String studentId) throws ClassRosterDaoException { + @Override + public void run() throws ClassRosterPersistenceException { + this.loadRoster(); + } - return students.get(studentId); + @Override + public void stopProgram() throws ClassRosterPersistenceException { + this.writeRoster(); } - @Override - public Student removeStudent(String studentId) throws ClassRosterDaoException { - Student removedStudent = students.remove(studentId); - return removedStudent; + /** + * reads all students from file + * preferably at startup + * + * @throws ClassRosterPersistenceException if an error occurs wile reading the + * file + */ + private void loadRoster() throws ClassRosterPersistenceException { + Scanner scanner; + + try { + // Create Scanner for reading the file + scanner = new Scanner( + new BufferedReader( + new FileReader(ROSTER_FILE))); + } catch (FileNotFoundException e) { + throw new ClassRosterPersistenceException( + "-_- Could not load roster data into memory.", e); + } + // currentLine holds the most recent line read from the file + String currentLine; + // currentTokens holds each of the parts of the currentLine after it has + // been split on our DELIMITER + // NOTE FOR APPRENTICES: In our case we use :: as our delimiter. If + // currentLine looks like this: + // 1234::Joe::Smith::Java-September2013 + // then currentTokens will be a string array that looks like this: + // + // ___________________________________ + // | | | | | + // |1234|Joe|Smith|Java-September2013| + // | | | | | + // ----------------------------------- + // [0] [1] [2] [3] + String[] currentTokens; + // Go through ROSTER_FILE line by line, decoding each line into a + // Student object. + // Process while we have more lines in the file + while (scanner.hasNextLine()) { + // get the next line in the file + currentLine = scanner.nextLine(); + // break up the line into tokens + currentTokens = currentLine.split(DELIMITER); + // Create a new Student object and put it into the map of students + // NOTE FOR APPRENTICES: We are going to use the student id + // which is currentTokens[0] as the map key for our student object. + // We also have to pass the student id into the Student constructor + Student currentStudent = new Student(currentTokens[0]); + // Set the remaining vlaues on currentStudent manually + currentStudent.setFirstName(currentTokens[1]); + currentStudent.setLastName(currentTokens[2]); + currentStudent.setCohort(currentTokens[3]); + + // Put currentStudent into the map using studentID as the key + students.put(currentStudent.getStudentId(), currentStudent); + } + // close scanner + scanner.close(); } - /** - * reads all students from file - * preferably at startup - * - * @throws ClassRosterDaoException if an error occurs wile reading the file - */ - private void loadRoster() throws ClassRosterDaoException { - Scanner scanner; - - try { - // Create Scanner for reading the file - scanner = new Scanner( - new BufferedReader( - new FileReader(ROSTER_FILE))); - } catch (FileNotFoundException e) { - throw new ClassRosterDaoException( - "-_- Could not load roster data into memory.", e); - } - // currentLine holds the most recent line read from the file - String currentLine; - // currentTokens holds each of the parts of the currentLine after it has - // been split on our DELIMITER - // NOTE FOR APPRENTICES: In our case we use :: as our delimiter. If - // currentLine looks like this: - // 1234::Joe::Smith::Java-September2013 - // then currentTokens will be a string array that looks like this: - // - // ___________________________________ - // | | | | | - // |1234|Joe|Smith|Java-September2013| - // | | | | | - // ----------------------------------- - // [0] [1] [2] [3] - String[] currentTokens; - // Go through ROSTER_FILE line by line, decoding each line into a - // Student object. - // Process while we have more lines in the file - while (scanner.hasNextLine()) { - // get the next line in the file - currentLine = scanner.nextLine(); - // break up the line into tokens - currentTokens = currentLine.split(DELIMITER); - // Create a new Student object and put it into the map of students - // NOTE FOR APPRENTICES: We are going to use the student id - // which is currentTokens[0] as the map key for our student object. - // We also have to pass the student id into the Student constructor - Student currentStudent = new Student(currentTokens[0]); - // Set the remaining vlaues on currentStudent manually - currentStudent.setFirstName(currentTokens[1]); - currentStudent.setLastName(currentTokens[2]); - currentStudent.setCohort(currentTokens[3]); - - // Put currentStudent into the map using studentID as the key - students.put(currentStudent.getStudentId(), currentStudent); - } - // close scanner - scanner.close(); - } - - /** - * Writes all students in the roster out to a ROSTER_FILE. See loadRoster + /** + * Writes all students in the roster out to a ROSTER_FILE. See loadRoster * for file format. * - * @throws ClassRosterDaoException if an error occurs writing to the file + * @throws ClassRosterPersistenceException if an error occurs writing to the + * file */ - private void writeRoster() throws ClassRosterDaoException { - // NOTE FOR APPRENTICES: We are not handling the IOException - but - // we are translating it to an application specific exception and - // then simple throwing it (i.e. 'reporting' it) to the code that - // called us. It is the responsibility of the calling code to - // handle any errors that occur. - PrintWriter out; - - try { - out = new PrintWriter(new FileWriter(ROSTER_FILE)); - } catch (IOException e) { - throw new ClassRosterDaoException( - "Could not save student data.", e); - } - - // Write out the Student objects to the roster file. - // NOTE TO THE APPRENTICES: We could just grab the student map, - // get the Collection of Students and iterate over them but we've - // already created a method that gets a List of Students so - // we'll reuse it. - List studentList = this.getAllStudents(); - for (Student currentStudent : studentList) { - // write the Student object to the file - out.println(currentStudent.getStudentId() + DELIMITER - + currentStudent.getFirstName() + DELIMITER - + currentStudent.getLastName() + DELIMITER - + currentStudent.getCohort()); - // force PrintWriter to write line to the file - out.flush(); - } - // Clean up - out.close(); + private void writeRoster() throws ClassRosterPersistenceException { + // NOTE FOR APPRENTICES: We are not handling the IOException - but + // we are translating it to an application specific exception and + // then simple throwing it (i.e. 'reporting' it) to the code that + // called us. It is the responsibility of the calling code to + // handle any errors that occur. + PrintWriter out; + + try { + out = new PrintWriter(new FileWriter(ROSTER_FILE)); + } catch (IOException e) { + throw new ClassRosterPersistenceException( + "Could not save student data.", e); + } + + // Write out the Student objects to the roster file. + // NOTE TO THE APPRENTICES: We could just grab the student map, + // get the Collection of Students and iterate over them but we've + // already created a method that gets a List of Students so + // we'll reuse it. + List studentList = this.getAllStudents(); + for (Student currentStudent : studentList) { + // write the Student object to the file + out.println(currentStudent.getStudentId() + DELIMITER + + currentStudent.getFirstName() + DELIMITER + + currentStudent.getLastName() + DELIMITER + + currentStudent.getCohort()); + // force PrintWriter to write line to the file + out.flush(); + } + // Clean up + out.close(); } } \ No newline at end of file diff --git a/mod2/Class roster/src/exceptions/ClassRosterDataValidationException.java b/mod2/Class roster/src/exceptions/ClassRosterDataValidationException.java new file mode 100644 index 0000000..cdbd42b --- /dev/null +++ b/mod2/Class roster/src/exceptions/ClassRosterDataValidationException.java @@ -0,0 +1,14 @@ +package exceptions; + +public class ClassRosterDataValidationException extends Exception { + + public ClassRosterDataValidationException(String message) { + super(message); + } + + public ClassRosterDataValidationException(String message, + Throwable cause) { + super(message, cause); + } + +} diff --git a/mod2/Class roster/src/exceptions/ClassRosterDuplicateIdException.java b/mod2/Class roster/src/exceptions/ClassRosterDuplicateIdException.java new file mode 100644 index 0000000..2c4276d --- /dev/null +++ b/mod2/Class roster/src/exceptions/ClassRosterDuplicateIdException.java @@ -0,0 +1,14 @@ +package exceptions; + +public class ClassRosterDuplicateIdException extends Exception { + + public ClassRosterDuplicateIdException(String message) { + super(message); + } + + public ClassRosterDuplicateIdException(String message, + Throwable cause) { + super(message, cause); + } + +} diff --git a/mod2/Class roster/src/exceptions/ClassRosterPersistenceException.java b/mod2/Class roster/src/exceptions/ClassRosterPersistenceException.java new file mode 100644 index 0000000..b9ae706 --- /dev/null +++ b/mod2/Class roster/src/exceptions/ClassRosterPersistenceException.java @@ -0,0 +1,14 @@ +package exceptions; + +public class ClassRosterPersistenceException extends Exception{ + + public ClassRosterPersistenceException(String message) { + super(message); + } + + public ClassRosterPersistenceException(String message, + Throwable cause) { + super(message, cause); + } + +} diff --git a/mod2/Class roster/src/interfaces/ClassRosterAuditDao.java b/mod2/Class roster/src/interfaces/ClassRosterAuditDao.java new file mode 100644 index 0000000..b6d13f6 --- /dev/null +++ b/mod2/Class roster/src/interfaces/ClassRosterAuditDao.java @@ -0,0 +1,15 @@ +package interfaces; + +import exceptions.ClassRosterPersistenceException; + +public interface ClassRosterAuditDao { + + /** + * writes a Audit + * + * @param entry + * @throws ClassRosterPersistenceException + */ + void writeAuditEntry(String entry) throws ClassRosterPersistenceException; + +} diff --git a/mod2/Class roster/src/interfaces/ClassRosterDao.java b/mod2/Class roster/src/interfaces/ClassRosterDao.java index f20a13f..91b063b 100644 --- a/mod2/Class roster/src/interfaces/ClassRosterDao.java +++ b/mod2/Class roster/src/interfaces/ClassRosterDao.java @@ -2,54 +2,68 @@ import java.util.List; -import dao.ClassRosterDaoException; +import exceptions.ClassRosterPersistenceException; import model.Student; public interface ClassRosterDao { - /** - * Adds the given Student to the roster and associates it with the given - * student id. If there is already a student associated with the given - * student id it will return that student object, otherwise it will - * return null. - * - * @param studentId id with which student is to be associated - * @param student student to be added to the roster - * @return the Student object previously associated with the given - * student id if it exists, null otherwise - * @throws ClassRosterDaoException - */ - Student addStudent(String studentId, Student student) throws ClassRosterDaoException; - - /** - * Returns a String array containing the student ids of all - * students in the roster. - * - * @return String array containing the ids of all the students - * in the roster - * @throws ClassRosterDaoException - */ - List getAllStudents() throws ClassRosterDaoException; - - /** - * Returns the student object associated with the given student id. - * Returns null if no such student exists - * - * @param studentId ID of the student to retrieve - * @return the Student object associated with the given student id, - * null if no such student exists - * @throws ClassRosterDaoException - */ - Student getStudent(String studentId) throws ClassRosterDaoException; - - /** - * Removes from the roster the student associated with the given id. - * Returns the student object that is being removed or null if - * there is no student associated with the given id - * - * @param studentId id of student to be removed - * @return Student object that was removed or null if no student - * was associated with the given student id - * @throws ClassRosterDaoException - */ - Student removeStudent(String studentId) throws ClassRosterDaoException; + /** + * Adds the given Student to the roster and associates it with the given + * student id. If there is already a student associated with the given + * student id it will return that student object, otherwise it will + * return null. + * + * @param studentId id with which student is to be associated + * @param student student to be added to the roster + * @return the Student object previously associated with the given + * student id if it exists, null otherwise + * @throws ClassRosterPersistenceException + */ + Student addStudent(String studentId, Student student) throws ClassRosterPersistenceException; + + /** + * Returns a String array containing the student ids of all + * students in the roster. + * + * @return String array containing the ids of all the students + * in the roster + * @throws ClassRosterPersistenceException + */ + List getAllStudents() throws ClassRosterPersistenceException; + + /** + * Returns the student object associated with the given student id. + * Returns null if no such student exists + * + * @param studentId ID of the student to retrieve + * @return the Student object associated with the given student id, + * null if no such student exists + * @throws ClassRosterPersistenceException + */ + Student getStudent(String studentId) throws ClassRosterPersistenceException; + + /** + * Removes from the roster the student associated with the given id. + * Returns the student object that is being removed or null if + * there is no student associated with the given id + * + * @param studentId id of student to be removed + * @return Student object that was removed or null if no student + * was associated with the given student id + * @throws ClassRosterPersistenceException + */ + Student removeStudent(String studentId) throws ClassRosterPersistenceException; + + /** + * insantiates all the students + * + * @throws ClassRosterPersistenceException + */ + void run() throws ClassRosterPersistenceException; + + /** + * writes all students to file + * + * @throws ClassRosterPersistenceException + */ + void stopProgram() throws ClassRosterPersistenceException; } diff --git a/mod2/Class roster/src/interfaces/ClassRosterServiceLayer.java b/mod2/Class roster/src/interfaces/ClassRosterServiceLayer.java new file mode 100644 index 0000000..4f38e77 --- /dev/null +++ b/mod2/Class roster/src/interfaces/ClassRosterServiceLayer.java @@ -0,0 +1,64 @@ +package interfaces; + +import java.util.List; + +import exceptions.ClassRosterDataValidationException; +import exceptions.ClassRosterDuplicateIdException; +import exceptions.ClassRosterPersistenceException; +import model.Student; + +public interface ClassRosterServiceLayer { + + /** + * creates a student but also thows an Exeption if the students id matches + * another id + * + * @param student + * @throws ClassRosterDuplicateIdException + * @throws ClassRosterDataValidationException + * @throws ClassRosterPersistenceException + */ + void createStudent(Student student) throws ClassRosterDuplicateIdException, + ClassRosterDataValidationException, + ClassRosterPersistenceException; + + /** + * gets all students in the student librairy while also checking the Scanner + * + * @return all students as a list + * @throws ClassRosterPersistenceException + */ + List getAllStudents() throws ClassRosterPersistenceException; + + /** + * gets a student by searching it by id + * + * @param studentId + * @return searched student + * @throws ClassRosterPersistenceException + */ + Student getStudent(String studentId) throws ClassRosterPersistenceException; + + /** + * gets a student and then removes it + * + * @param studentId + * @return deleted student + * @throws ClassRosterPersistenceException + */ + Student removeStudent(String studentId) throws ClassRosterPersistenceException; + + /** + * instantiates all students at run time and then writes to an audit + * + * @throws ClassRosterPersistenceException + */ + void run() throws ClassRosterPersistenceException; + + /** + * writes to file and then writes to audit + * + * @throws ClassRosterPersistenceException + */ + void stopProgram() throws ClassRosterPersistenceException; +} diff --git a/mod2/Class roster/src/serviceLayer/ClassRosterServiceLayerFileImpl.java b/mod2/Class roster/src/serviceLayer/ClassRosterServiceLayerFileImpl.java new file mode 100644 index 0000000..82f1df8 --- /dev/null +++ b/mod2/Class roster/src/serviceLayer/ClassRosterServiceLayerFileImpl.java @@ -0,0 +1,96 @@ +package serviceLayer; + +import java.util.List; + +import exceptions.ClassRosterDataValidationException; +import exceptions.ClassRosterDuplicateIdException; +import exceptions.ClassRosterPersistenceException; +import interfaces.ClassRosterAuditDao; +import interfaces.ClassRosterDao; +import interfaces.ClassRosterServiceLayer; +import model.Student; + +public class ClassRosterServiceLayerFileImpl implements ClassRosterServiceLayer { + + private ClassRosterAuditDao auditDao; + + private ClassRosterDao dao; + + public ClassRosterServiceLayerFileImpl(ClassRosterDao dao, ClassRosterAuditDao auditDao) { + this.dao = dao; + this.auditDao = auditDao; + } + + private void validateStudentData(Student student) throws ClassRosterDataValidationException { + + if (student.getFirstName() == null + || student.getFirstName().trim().length() == 0 + || student.getLastName() == null + || student.getLastName().trim().length() == 0 + || student.getCohort() == null + || student.getCohort().trim().length() == 0) { + + throw new ClassRosterDataValidationException( + "ERROR: All fields [First Name, Last Name, Cohort] are required."); + } + } + + @Override + public void createStudent(Student student) throws ClassRosterDataValidationException, + ClassRosterPersistenceException, ClassRosterDuplicateIdException { + + // First check to see if there is alreay a student + // associated with the given student's id + // If so, we're all done here - + // throw a ClassRosterDuplicateIdException + if (dao.getStudent(student.getStudentId()) != null) { + throw new ClassRosterDuplicateIdException( + "ERROR: Could not create student. Student Id " + + student.getStudentId() + + " already exists"); + } + + // Now validate all the fields on the given Student object. + // This method will throw an + // exception if any of the validation rules are violated. + validateStudentData(student); + + // We passed all our business rules checks so go ahead + // and persist the Student object + dao.addStudent(student.getStudentId(), student); + + // The student was successfully created, now write to the audit log + auditDao.writeAuditEntry( + "Student " + student.getStudentId() + " CREATED."); + } + + @Override + public List getAllStudents() throws ClassRosterPersistenceException { + return dao.getAllStudents(); + } + + @Override + public Student getStudent(String studentId) throws ClassRosterPersistenceException { + return dao.getStudent(studentId); + } + + @Override + public Student removeStudent(String studentId) throws ClassRosterPersistenceException { + Student removedStudent = dao.removeStudent(studentId); + // Write to audit log + auditDao.writeAuditEntry("Student " + studentId + " REMOVED."); + return removedStudent; + } + + @Override + public void run() throws ClassRosterPersistenceException { + dao.run(); + auditDao.writeAuditEntry("||||||||||||||| Sucesfull: start runing program |||||||||||||||"); + } + + @Override + public void stopProgram() throws ClassRosterPersistenceException { + dao.stopProgram(); + auditDao.writeAuditEntry("||||||||||||||| Sucesfull: stop program |||||||||||||||"); + } +} diff --git a/mod2/d&d.vs/src/modle/Person.java b/mod2/d&d.vs/src/modle/Person.java index 5587090..d1cdf69 100644 --- a/mod2/d&d.vs/src/modle/Person.java +++ b/mod2/d&d.vs/src/modle/Person.java @@ -3,9 +3,6 @@ import javax.annotation.processing.RoundEnvironment; public class Person { - private static RoundEnvironment round = new RoundEnvironment() { - - }; private int str; public int getStr() { From 1f6c47357b41cf5e5f634c5d2cbd531aaa8478a0 Mon Sep 17 00:00:00 2001 From: bhimio Date: Wed, 11 May 2022 10:40:01 -0400 Subject: [PATCH 08/12] finall commit for class roster branch --- mod2/Class roster/Class roster.jar | Bin 0 -> 16008 bytes mod2/Class roster/audit.txt | 11 ++ mod2/Class roster/roster.txt | 3 +- .../src/dao/ClassRosterDaoFileImpl.java | 1 + .../ClassRosterServiceLayerFileImpl.java | 1 + mod2/adress Book/adress Book.jar | Bin 0 -> 6277 bytes mod2/adress Book/src/App.java | 5 + mod2/adress Book/src/IO/IO.java | 173 ++++++++++++++++++ .../exceptions/DataVialationException.java | 11 ++ .../src/exceptions/PersistenceException.java | 11 ++ .../src/exceptions/SameAdressException.java | 11 ++ mod2/adress Book/src/interfaces/Audit.java | 5 + mod2/adress Book/src/interfaces/Dao.java | 58 ++++++ .../src/interfaces/ServiceLayer.java | 5 + .../adress Book/src/interfaces/consoleIO.java | 50 +++++ mod2/adress Book/src/modle/Adress.java | 38 ++++ 16 files changed, 381 insertions(+), 2 deletions(-) create mode 100644 mod2/Class roster/Class roster.jar create mode 100644 mod2/Class roster/audit.txt create mode 100644 mod2/adress Book/adress Book.jar create mode 100644 mod2/adress Book/src/App.java create mode 100644 mod2/adress Book/src/IO/IO.java create mode 100644 mod2/adress Book/src/exceptions/DataVialationException.java create mode 100644 mod2/adress Book/src/exceptions/PersistenceException.java create mode 100644 mod2/adress Book/src/exceptions/SameAdressException.java create mode 100644 mod2/adress Book/src/interfaces/Audit.java create mode 100644 mod2/adress Book/src/interfaces/Dao.java create mode 100644 mod2/adress Book/src/interfaces/ServiceLayer.java create mode 100644 mod2/adress Book/src/interfaces/consoleIO.java create mode 100644 mod2/adress Book/src/modle/Adress.java diff --git a/mod2/Class roster/Class roster.jar b/mod2/Class roster/Class roster.jar new file mode 100644 index 0000000000000000000000000000000000000000..f7fcf3b977f6a6e34d14fad8e9e05cb9a850e9b6 GIT binary patch literal 16008 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 literal 0 HcmV?d00001 diff --git a/mod2/Class roster/audit.txt b/mod2/Class roster/audit.txt new file mode 100644 index 0000000..1c3a22a --- /dev/null +++ b/mod2/Class roster/audit.txt @@ -0,0 +1,11 @@ +2022-05-09T20:00:54.681710 : Student 1111 CREATED. +2022-05-10T08:32:30.927770 : ||||||||||||||| Sucesfull: start runing program ||||||||||||||| +2022-05-10T08:32:54.832127 : Student 1111 REMOVED. +2022-05-10T08:47:44.467095 : ||||||||||||||| Sucesfull: start runing program ||||||||||||||| +2022-05-10T08:48:25.732196 : Student 1111 REMOVED. +2022-05-10T08:49:19.643601 : Student 1112 CREATED. +2022-05-10T08:49:26.906286 : Student 1111 REMOVED. +2022-05-10T08:49:37.850037 : ||||||||||||||| Sucesfull: stop program ||||||||||||||| +2022-05-11T10:36:21.716903 : ||||||||||||||| Sucesfull: start runing program ||||||||||||||| +2022-05-11T10:36:34.449032 : Student 1111 REMOVED. +2022-05-11T10:36:43.859600 : ||||||||||||||| Sucesfull: stop program ||||||||||||||| diff --git a/mod2/Class roster/roster.txt b/mod2/Class roster/roster.txt index 27d94c6..33f6905 100644 --- a/mod2/Class roster/roster.txt +++ b/mod2/Class roster/roster.txt @@ -1,2 +1 @@ -0002::yaga::baborine::hapy.NET -0001::bhima::raisz::1/2/3/4/5/6/7/8/9/0/ +1112::bhima::raisz::java 2021-2025 diff --git a/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java b/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java index 1b56e03..e304f63 100644 --- a/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java +++ b/mod2/Class roster/src/dao/ClassRosterDaoFileImpl.java @@ -43,6 +43,7 @@ public Student getStudent(String studentId) throws ClassRosterPersistenceExcepti @Override public Student removeStudent(String studentId) throws ClassRosterPersistenceException { Student removedStudent = students.remove(studentId); + this.writeRoster(); return removedStudent; } diff --git a/mod2/Class roster/src/serviceLayer/ClassRosterServiceLayerFileImpl.java b/mod2/Class roster/src/serviceLayer/ClassRosterServiceLayerFileImpl.java index 82f1df8..70ebe14 100644 --- a/mod2/Class roster/src/serviceLayer/ClassRosterServiceLayerFileImpl.java +++ b/mod2/Class roster/src/serviceLayer/ClassRosterServiceLayerFileImpl.java @@ -80,6 +80,7 @@ public Student removeStudent(String studentId) throws ClassRosterPersistenceExce // Write to audit log auditDao.writeAuditEntry("Student " + studentId + " REMOVED."); return removedStudent; + } @Override diff --git a/mod2/adress Book/adress Book.jar b/mod2/adress Book/adress Book.jar new file mode 100644 index 0000000000000000000000000000000000000000..9db92df0f164979a2a212dfeb9ce67f26c412afa GIT binary patch literal 6277 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 max) { + this.print("that number was to high"); + } else if (value < min) { + this.print("that number was to low"); + } else { + isCorrect = true; + } + } while (!isCorrect); + return value; + } + + @Override + public float readFloat(String prompt) { + boolean isCorrect = false; + float value = 0; + String userInput; + while (!isCorrect) { + userInput = this.readString(prompt); + try { + value = Float.parseFloat(userInput); + isCorrect = true; + } catch (Exception e) { + this.print("that was not a number please try again"); + } + } + return value; + } + + @Override + public float readFloat(String prompt, float min, float max) { + boolean isCorrect = false; + float value; + do { + value = this.readFloat(prompt); + if (value > max) { + this.print("that number was to high"); + } else if (value < min) { + this.print("that number was to low"); + } else { + isCorrect = true; + } + } while (!isCorrect); + return value; + } + + @Override + public double readDouble(String prompt) { + boolean isCorrect = false; + double value = 0; + String userInput; + while (!isCorrect) { + userInput = this.readString(prompt); + try { + value = Double.parseDouble(userInput); + isCorrect = true; + } catch (Exception e) { + this.print("That was not a double. Please try again"); + } + } + return value; + } + + @Override + public double readDouble(String prompt, Double min, Double max) { + boolean isCorrect = false; + double value; + do { + value = this.readDouble(prompt); + if (value > max) { + this.print("that number was to high"); + } else if (value < min) { + this.print("that number was to low"); + } else { + isCorrect = true; + } + } while (!isCorrect); + return value; + } + + @Override + public boolean readboolean(String prompt) { + boolean isCorrect = false; + boolean value = false; + String userInput; + while (!isCorrect) { + userInput = this.readString(prompt); + try { + value = Boolean.parseBoolean(userInput); + isCorrect = true; + } catch (Exception e) { + this.print("That was not a boolean. Please try again"); + } + } + return value; + } + + @Override + public long readLong(String prompt) { + boolean isCorrect = false; + String userInput; + long value = 0; + while (!isCorrect) { + userInput = this.readString(prompt); + try { + value = Long.parseLong(userInput); + isCorrect = true; + } catch (Exception e) { + this.print("That was not a double. Please try again"); + } + } + return value; + } + + public long readLong(String prompt, long min, long max) { + boolean isCorrect = false; + long value; + do { + value = this.readLong(prompt); + if (value > max) { + this.print("that number was to high"); + } else if (value < min) { + this.print("that number was to low"); + } else { + isCorrect = true; + } + } while (!isCorrect); + return value; + } + + @Override + public String readString(String prompt) { + this.print(prompt); + return this.sc.nextLine(); + } + + @Override + public void print(String msg) { + System.out.println(msg); + + } +} diff --git a/mod2/adress Book/src/exceptions/DataVialationException.java b/mod2/adress Book/src/exceptions/DataVialationException.java new file mode 100644 index 0000000..a5102f9 --- /dev/null +++ b/mod2/adress Book/src/exceptions/DataVialationException.java @@ -0,0 +1,11 @@ +package exceptions; + +public class DataVialationException extends Exception { + DataVialationException(String msg) { + super(msg); + } + + DataVialationException(String msg, Throwable cause) { + super(msg, cause); + } +} diff --git a/mod2/adress Book/src/exceptions/PersistenceException.java b/mod2/adress Book/src/exceptions/PersistenceException.java new file mode 100644 index 0000000..1b453b3 --- /dev/null +++ b/mod2/adress Book/src/exceptions/PersistenceException.java @@ -0,0 +1,11 @@ +package exceptions; + +public class PersistenceException extends Exception { + PersistenceException(String msg) { + super(msg); + } + + PersistenceException(String msg, Throwable cause) { + super(msg, cause); + } +} diff --git a/mod2/adress Book/src/exceptions/SameAdressException.java b/mod2/adress Book/src/exceptions/SameAdressException.java new file mode 100644 index 0000000..b61f0c7 --- /dev/null +++ b/mod2/adress Book/src/exceptions/SameAdressException.java @@ -0,0 +1,11 @@ +package exceptions; + +public class SameAdressException extends Exception { + SameAdressException(String msg) { + super(msg); + } + + SameAdressException(String msg, Throwable cause) { + super(msg, cause); + } +} diff --git a/mod2/adress Book/src/interfaces/Audit.java b/mod2/adress Book/src/interfaces/Audit.java new file mode 100644 index 0000000..ff94c4b --- /dev/null +++ b/mod2/adress Book/src/interfaces/Audit.java @@ -0,0 +1,5 @@ +package interfaces; + +public interface Audit { + +} diff --git a/mod2/adress Book/src/interfaces/Dao.java b/mod2/adress Book/src/interfaces/Dao.java new file mode 100644 index 0000000..0060e9a --- /dev/null +++ b/mod2/adress Book/src/interfaces/Dao.java @@ -0,0 +1,58 @@ +package interfaces; + +import java.util.List; + +import exceptions.PersistenceException; +import modle.Adress; + +public interface Dao { + /** + * creates an adress + * + * @param myAdress + * @return created adress + * @throws PersistenceException + */ + Adress createAdress(Adress myAdress) throws PersistenceException; + + /** + * deletes an adress + * + * @param myAdress + * @return deleted adress + * @throws PersistenceException + */ + Adress deleteAdress(Adress myAdress) throws PersistenceException; + + /** + * gets an adress by searching by name + * + * @param name + * @return searched adress + * @throws PersistenceException + */ + Adress getAdress(String name) throws PersistenceException; + + /** + * gets all the adresses + * + * @return all the adresses + * @throws PersistenceException + */ + List getAllAdresses() throws PersistenceException; + + /** + * instantiates all adresses to run the program and also makes the file if it + * does not exist + * + * @throws PersistenceException + */ + void run() throws PersistenceException; + + /** + * puts all the adresses into long term memory so you can close the program + * + * @throws PersistenceException + */ + void close() throws PersistenceException; +} diff --git a/mod2/adress Book/src/interfaces/ServiceLayer.java b/mod2/adress Book/src/interfaces/ServiceLayer.java new file mode 100644 index 0000000..ea67983 --- /dev/null +++ b/mod2/adress Book/src/interfaces/ServiceLayer.java @@ -0,0 +1,5 @@ +package interfaces; + +public interface ServiceLayer { + +} diff --git a/mod2/adress Book/src/interfaces/consoleIO.java b/mod2/adress Book/src/interfaces/consoleIO.java new file mode 100644 index 0000000..36ae013 --- /dev/null +++ b/mod2/adress Book/src/interfaces/consoleIO.java @@ -0,0 +1,50 @@ +package interfaces; + +public interface consoleIO { + /** + * prints msg + * + * @param msg + */ + public void print(String msg); + + /** + * gets an string and converts it to a int unless the string is not a number + * + * @param prompt + * @return the int that has been created + */ + public int readInt(String prompt); + + /** + * uses .readInt and only between min and max + * + * @param prompt + * @param min + * @param max + * @return the int between min and max + */ + public int readInt(String prompt, int min, int max); + + /** + * + * + * @param prompt + * @return + */ + public float readFloat(String prompt); + + public float readFloat(String prompt, float min, float max); + + public double readDouble(String prompt); + + public double readDouble(String prompt, Double min, Double max); + + public boolean readboolean(String prompt); + + public String readString(String prompt); + + public long readLong(String prompt); + + public long readLong(String prompt, long min, long max); +} diff --git a/mod2/adress Book/src/modle/Adress.java b/mod2/adress Book/src/modle/Adress.java new file mode 100644 index 0000000..b23acdf --- /dev/null +++ b/mod2/adress Book/src/modle/Adress.java @@ -0,0 +1,38 @@ +package modle; + +public class Adress { + private String firstName; + private String lastName; + private String adressName; + + Adress(String firstName, String lastName, String adressName) { + this.setFirstName(firstName); + this.setLastName(lastName); + this.setAdressName(adressName); + } + + public String getFirstName() { + return this.firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return this.lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getAdressName() { + return this.adressName; + } + + public void setAdressName(String adressName) { + this.adressName = adressName; + } + +} From 4fb942ba6968f1953e356e885366cd2854ea77ad Mon Sep 17 00:00:00 2001 From: bhimio Date: Wed, 11 May 2022 12:30:31 -0400 Subject: [PATCH 09/12] saving for later --- mod2/Class roster/.vscode/settings.json | 7 + mod2/adress Book/.vscode/settings.json | 8 + .../src/Contrllers/Controller.java | 15 ++ mod2/adress Book/src/IO/IO.java | 6 +- mod2/adress Book/src/IO/Veiw.java | 25 +++ .../ServiceLayer/ServiceLayerFileImpl.java | 12 ++ mod2/adress Book/src/audit/AuditDao.java | 7 + mod2/adress Book/src/dao/DaoFileImpl.java | 166 ++++++++++++++++++ .../src/exceptions/PersistenceException.java | 2 +- mod2/adress Book/src/interfaces/Dao.java | 8 + mod2/adress Book/src/modle/Adress.java | 4 +- 11 files changed, 255 insertions(+), 5 deletions(-) create mode 100644 mod2/Class roster/.vscode/settings.json create mode 100644 mod2/adress Book/.vscode/settings.json create mode 100644 mod2/adress Book/src/Contrllers/Controller.java create mode 100644 mod2/adress Book/src/IO/Veiw.java create mode 100644 mod2/adress Book/src/ServiceLayer/ServiceLayerFileImpl.java create mode 100644 mod2/adress Book/src/audit/AuditDao.java create mode 100644 mod2/adress Book/src/dao/DaoFileImpl.java diff --git a/mod2/Class roster/.vscode/settings.json b/mod2/Class roster/.vscode/settings.json new file mode 100644 index 0000000..e112a70 --- /dev/null +++ b/mod2/Class roster/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "java.project.sourcePaths": ["src"], + "java.project.outputPath": "bin", + "java.project.referencedLibraries": [ + "lib/**/*.jar" + ] +} diff --git a/mod2/adress Book/.vscode/settings.json b/mod2/adress Book/.vscode/settings.json new file mode 100644 index 0000000..3ae42db --- /dev/null +++ b/mod2/adress Book/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "java.project.sourcePaths": ["src"], + "java.project.outputPath": "bin", + "java.project.referencedLibraries": [ + "lib/**/*.jar" + ], + "java.dependency.packagePresentation": "flat" +} diff --git a/mod2/adress Book/src/Contrllers/Controller.java b/mod2/adress Book/src/Contrllers/Controller.java new file mode 100644 index 0000000..702a92e --- /dev/null +++ b/mod2/adress Book/src/Contrllers/Controller.java @@ -0,0 +1,15 @@ +package Contrllers; + +import IO.Veiw; + +public class Controller { + private Veiw veiw; + + public Controller(Veiw veiw){ + this.veiw = veiw; + } + + public void run() { + + } +} diff --git a/mod2/adress Book/src/IO/IO.java b/mod2/adress Book/src/IO/IO.java index f008d0b..6259346 100644 --- a/mod2/adress Book/src/IO/IO.java +++ b/mod2/adress Book/src/IO/IO.java @@ -5,7 +5,11 @@ import interfaces.consoleIO; public class IO implements consoleIO { - private Scanner sc = new Scanner(System.in); + private Scanner sc; + + IO(Scanner sc) { + this.sc = sc; + } @Override public int readInt(String prompt) { diff --git a/mod2/adress Book/src/IO/Veiw.java b/mod2/adress Book/src/IO/Veiw.java new file mode 100644 index 0000000..d567d90 --- /dev/null +++ b/mod2/adress Book/src/IO/Veiw.java @@ -0,0 +1,25 @@ +package IO; + +import interfaces.consoleIO; + +public class Veiw { + consoleIO io; + private final String SPACE = " "; + + Veiw(consoleIO io) { + this.io = io; + } + + public int printMenu() { + io.print("=================="); + io.print("chose one of the folowing"); + io.print(SPACE + "1: create adress"); + io.print(SPACE + "2: list all adresses"); + io.print(SPACE + "3: search for a adress"); + io.print(SPACE + "4: count all the adresses"); + io.print(SPACE + "5: remove an adress"); + io.print(SPACE + "6: EXIT"); + + return io.readInt("", 1, 5); + } +} diff --git a/mod2/adress Book/src/ServiceLayer/ServiceLayerFileImpl.java b/mod2/adress Book/src/ServiceLayer/ServiceLayerFileImpl.java new file mode 100644 index 0000000..413b884 --- /dev/null +++ b/mod2/adress Book/src/ServiceLayer/ServiceLayerFileImpl.java @@ -0,0 +1,12 @@ +package ServiceLayer; + +import interfaces.Dao; +import interfaces.ServiceLayer; + +public class ServiceLayerFileImpl implements ServiceLayer { + Dao dao; + + public ServiceLayerFileImpl(Dao dao) { + this.dao = dao; + } +} diff --git a/mod2/adress Book/src/audit/AuditDao.java b/mod2/adress Book/src/audit/AuditDao.java new file mode 100644 index 0000000..38c8326 --- /dev/null +++ b/mod2/adress Book/src/audit/AuditDao.java @@ -0,0 +1,7 @@ +package audit; + +import interfaces.Audit; + +public class AuditDao implements Audit { + +} diff --git a/mod2/adress Book/src/dao/DaoFileImpl.java b/mod2/adress Book/src/dao/DaoFileImpl.java new file mode 100644 index 0000000..605f648 --- /dev/null +++ b/mod2/adress Book/src/dao/DaoFileImpl.java @@ -0,0 +1,166 @@ +package dao; + +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Scanner; + +import exceptions.PersistenceException; +import interfaces.Dao; +import modle.Adress; + +public class DaoFileImpl implements Dao { + private Map adressMap = new HashMap<>(); + public static final String ADRESS_FILE = "book.txt"; + public static final String DELIMITER = "::"; + + public DaoFileImpl() { + + } + + @Override + public Adress createAdress(Adress myAdress) throws PersistenceException { + // TODO Auto-generated method stub + return null; + } + + @Override + public Adress deleteAdress(Adress myAdress) throws PersistenceException { + // TODO Auto-generated method stub + return null; + } + + @Override + public Adress getAdress(String name) throws PersistenceException { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getAllAdresses() throws PersistenceException { + // TODO Auto-generated method stub + return null; + } + + @Override + public void run() throws PersistenceException { + // TODO Auto-generated method stub + + } + + @Override + public void close() throws PersistenceException { + // TODO Auto-generated method stub + + } + + @Override + public int count() { + return adressMap.size(); + } + + /** + * reads all Adresss from file + * preferably at startup + * + * @throws PersistenceException if an error occurs wile reading the + * file + */ + private void loadRoster() throws PersistenceException { + Scanner scanner; + + try { + // Create Scanner for reading the file + scanner = new Scanner( + new BufferedReader( + new FileReader(ADRESS_FILE))); + } catch (FileNotFoundException e) { + throw new PersistenceException( + "-_- Could not load roster data into memory.", e); + } + // currentLine holds the most recent line read from the file + String currentLine; + // currentTokens holds each of the parts of the currentLine after it has + // been split on our DELIMITER + // NOTE FOR APPRENTICES: In our case we use :: as our delimiter. If + // currentLine looks like this: + // 1234::Joe::Smith::Java-September2013 + // then currentTokens will be a string array that looks like this: + // + // ___________________________________ + // | | | | | + // |1234|Joe|Smith|Java-September2013| + // | | | | | + // ----------------------------------- + // [0] [1] [2] [3] + String[] currentTokens; + // Go through ROSTER_FILE line by line, decoding each line into a + // Adress object. + // Process while we have more lines in the file + while (scanner.hasNextLine()) { + // get the next line in the file + currentLine = scanner.nextLine(); + // break up the line into tokens + currentTokens = currentLine.split(DELIMITER); + // Create a new Adress object and put it into the map of Adress + // NOTE FOR APPRENTICES: We are going to use the Adress id + // which is currentTokens[0] as the map key for our Adress object. + // We also have to pass the Adress id into the Adress constructor + Adress currentAdress = new Adress(currentTokens[0]); + // Set the remaining vlaues on currentAdress manually + currentAdress.setFirstName(currentTokens[1]); + currentAdress.setLastName(currentTokens[2]); + // Put currentAdress into the map using AdressID as the key + adressMap.put(currentAdress.getFirstName(), currentAdress); + } + // close scanner + scanner.close(); + } + + /** + * Writes all Adresss in the roster out to a ROSTER_FILE. See loadRoster + * for file format. + * + * @throws PersistenceException if an error occurs writing to the + * file + */ + private void writeRoster() throws PersistenceException { + // NOTE FOR APPRENTICES: We are not handling the IOException - but + // we are translating it to an application specific exception and + // then simple throwing it (i.e. 'reporting' it) to the code that + // called us. It is the responsibility of the calling code to + // handle any errors that occur. + PrintWriter out; + + try { + out = new PrintWriter(new FileWriter(ADRESS_FILE)); + } catch (IOException e) { + throw new PersistenceException( + "Could not save Adress data.", e); + } + + // Write out the Adress objects to the roster file. + // NOTE TO THE APPRENTICES: We could just grab the Adress map, + // get the Collection of Adresss and iterate over them but we've + // already created a method that gets a List of Adresss so + // we'll reuse it. + List AdressList = this.getAllAdresses(); + for (Adress currentAdress : AdressList) { + // write the Adress object to the file + out.println(currentAdress.getAdressName() + DELIMITER + + currentAdress.getFirstName() + DELIMITER + + currentAdress.getLastName()); + // force PrintWriter to write line to the file + out.flush(); + } + // Clean up + out.close(); + } + +} diff --git a/mod2/adress Book/src/exceptions/PersistenceException.java b/mod2/adress Book/src/exceptions/PersistenceException.java index 1b453b3..b7816d2 100644 --- a/mod2/adress Book/src/exceptions/PersistenceException.java +++ b/mod2/adress Book/src/exceptions/PersistenceException.java @@ -5,7 +5,7 @@ public class PersistenceException extends Exception { super(msg); } - PersistenceException(String msg, Throwable cause) { + public PersistenceException(String msg, Throwable cause) { super(msg, cause); } } diff --git a/mod2/adress Book/src/interfaces/Dao.java b/mod2/adress Book/src/interfaces/Dao.java index 0060e9a..2e53e4e 100644 --- a/mod2/adress Book/src/interfaces/Dao.java +++ b/mod2/adress Book/src/interfaces/Dao.java @@ -55,4 +55,12 @@ public interface Dao { * @throws PersistenceException */ void close() throws PersistenceException; + + /** + * counts all the adresses + * + * @return the number of adresses + * @throws PersistenceException + */ + int count() throws PersistenceException; } diff --git a/mod2/adress Book/src/modle/Adress.java b/mod2/adress Book/src/modle/Adress.java index b23acdf..3d28faa 100644 --- a/mod2/adress Book/src/modle/Adress.java +++ b/mod2/adress Book/src/modle/Adress.java @@ -5,9 +5,7 @@ public class Adress { private String lastName; private String adressName; - Adress(String firstName, String lastName, String adressName) { - this.setFirstName(firstName); - this.setLastName(lastName); + public Adress(String adressName) { this.setAdressName(adressName); } From ddec20a5ac2c83a1f15c8b5071f8fda4242b3e3c Mon Sep 17 00:00:00 2001 From: bhimio Date: Tue, 31 May 2022 11:08:31 -0400 Subject: [PATCH 10/12] hello --- .gitignore | 3 +- mod2/Class roster/README.md | 18 +++++ mod2/Librairy/bin/storage/OutFile.txt | 2 +- mod2/adress Book/README.md | 18 +++++ mod2/adress Book/src/App.java | 2 +- .../src/Contrllers/Controller.java | 45 ++++++++++- mod2/adress Book/src/IO/Veiw.java | 9 +++ mod2/adress Book/src/audit/AuditDao.java | 21 ++++++ mod2/adress Book/src/dao/DaoFileImpl.java | 13 ++-- mod2/adress Book/src/interfaces/Audit.java | 10 ++- mod2/d&d.vs/things .txt | 3 + mod4/FirstMavenProject/pom.xml | 28 +++++++ .../firstmavenproject/FirstMavenProject.java | 20 +++++ .../src/main/java/greatParty/GreatParty.java | 24 ++++++ .../main/java/greatParty/GreatPartyTest.java | 34 +++++++++ mod4/demo/pom.xml | 75 +++++++++++++++++++ .../src/main/java/com/example/bhima/App.java | 13 ++++ .../test/java/com/example/bhima/AppTest.java | 20 +++++ mod4/rats/.vscode/settings.json | 4 + mod4/rats/pom.xml | 75 +++++++++++++++++++ .../src/main/java/com/text/greateParty.java | 22 ++++++ mod4/rats/src/test/java/com/text/AppTest.java | 15 ++++ 22 files changed, 461 insertions(+), 13 deletions(-) create mode 100644 mod2/Class roster/README.md create mode 100644 mod2/adress Book/README.md create mode 100644 mod2/d&d.vs/things .txt create mode 100644 mod4/FirstMavenProject/pom.xml create mode 100644 mod4/FirstMavenProject/src/main/java/com/mycompany/firstmavenproject/FirstMavenProject.java create mode 100644 mod4/FirstMavenProject/src/main/java/greatParty/GreatParty.java create mode 100644 mod4/FirstMavenProject/src/main/java/greatParty/GreatPartyTest.java create mode 100644 mod4/demo/pom.xml create mode 100644 mod4/demo/src/main/java/com/example/bhima/App.java create mode 100644 mod4/demo/src/test/java/com/example/bhima/AppTest.java create mode 100644 mod4/rats/.vscode/settings.json create mode 100644 mod4/rats/pom.xml create mode 100644 mod4/rats/src/main/java/com/text/greateParty.java create mode 100644 mod4/rats/src/test/java/com/text/AppTest.java diff --git a/.gitignore b/.gitignore index 8399968..925de21 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -**/*.class \ No newline at end of file +**/*.class +/mod4/FirstMavenProject/target/ diff --git a/mod2/Class roster/README.md b/mod2/Class roster/README.md new file mode 100644 index 0000000..7c03a53 --- /dev/null +++ b/mod2/Class roster/README.md @@ -0,0 +1,18 @@ +## Getting Started + +Welcome to the VS Code Java world. Here is a guideline to help you get started to write Java code in Visual Studio Code. + +## Folder Structure + +The workspace contains two folders by default, where: + +- `src`: the folder to maintain sources +- `lib`: the folder to maintain dependencies + +Meanwhile, the compiled output files will be generated in the `bin` folder by default. + +> If you want to customize the folder structure, open `.vscode/settings.json` and update the related settings there. + +## Dependency Management + +The `JAVA PROJECTS` view allows you to manage your dependencies. More details can be found [here](https://github.com/microsoft/vscode-java-dependency#manage-dependencies). diff --git a/mod2/Librairy/bin/storage/OutFile.txt b/mod2/Librairy/bin/storage/OutFile.txt index df29ab0..ab35ce3 100644 --- a/mod2/Librairy/bin/storage/OutFile.txt +++ b/mod2/Librairy/bin/storage/OutFile.txt @@ -1 +1 @@ -fyfyus::hasgfgdfh::sfgsfg::false::0 +rock::god::hat::false::0 diff --git a/mod2/adress Book/README.md b/mod2/adress Book/README.md new file mode 100644 index 0000000..7c03a53 --- /dev/null +++ b/mod2/adress Book/README.md @@ -0,0 +1,18 @@ +## Getting Started + +Welcome to the VS Code Java world. Here is a guideline to help you get started to write Java code in Visual Studio Code. + +## Folder Structure + +The workspace contains two folders by default, where: + +- `src`: the folder to maintain sources +- `lib`: the folder to maintain dependencies + +Meanwhile, the compiled output files will be generated in the `bin` folder by default. + +> If you want to customize the folder structure, open `.vscode/settings.json` and update the related settings there. + +## Dependency Management + +The `JAVA PROJECTS` view allows you to manage your dependencies. More details can be found [here](https://github.com/microsoft/vscode-java-dependency#manage-dependencies). diff --git a/mod2/adress Book/src/App.java b/mod2/adress Book/src/App.java index 0a839f9..2add349 100644 --- a/mod2/adress Book/src/App.java +++ b/mod2/adress Book/src/App.java @@ -1,5 +1,5 @@ public class App { public static void main(String[] args) throws Exception { - System.out.println("Hello, World!"); + } } diff --git a/mod2/adress Book/src/Contrllers/Controller.java b/mod2/adress Book/src/Contrllers/Controller.java index 702a92e..11d912c 100644 --- a/mod2/adress Book/src/Contrllers/Controller.java +++ b/mod2/adress Book/src/Contrllers/Controller.java @@ -3,13 +3,56 @@ import IO.Veiw; public class Controller { - private Veiw veiw; + Veiw veiw; public Controller(Veiw veiw){ this.veiw = veiw; } public void run() { + boolean keepGoing = true; + int menuSelection = 0; + while (keepGoing) { + + menuSelection = getMenu(); + + switch (menuSelection) { + case 1: + listStudents(); + break; + case 2: + createStudent(); + break; + case 3: + viewStudent(); + break; + case 4: + removeStudent(); + break; + case 5: + keepGoing = false; + break; + default: + + } + + } + } + + private void removeStudent() { + } + + private void viewStudent() { + } + + private void createStudent() { + } + + private void listStudents() { + } + + private int getMenu() { + return veiw.printMenu(); } } diff --git a/mod2/adress Book/src/IO/Veiw.java b/mod2/adress Book/src/IO/Veiw.java index d567d90..812e8b7 100644 --- a/mod2/adress Book/src/IO/Veiw.java +++ b/mod2/adress Book/src/IO/Veiw.java @@ -22,4 +22,13 @@ public int printMenu() { return io.readInt("", 1, 5); } + + public void baner(String msg) { + io.print("===== " + msg + " ====="); + } + + public void errorMessage(String errorMsg) { + io.print("==== ERROR ===="); + io.print(errorMsg); + } } diff --git a/mod2/adress Book/src/audit/AuditDao.java b/mod2/adress Book/src/audit/AuditDao.java index 38c8326..72e68f8 100644 --- a/mod2/adress Book/src/audit/AuditDao.java +++ b/mod2/adress Book/src/audit/AuditDao.java @@ -1,7 +1,28 @@ package audit; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.time.LocalDateTime; + +import exceptions.PersistenceException; import interfaces.Audit; public class AuditDao implements Audit { + public static final String AUDIT_FILE = "audit.txt"; + + @Override + public void writeAuditEntry(String entry) throws PersistenceException { + PrintWriter out; + + try { + out = new PrintWriter(new FileWriter(AUDIT_FILE, true)); + } catch (IOException e) { + throw new PersistenceException("Could not persist audit information.", e); + } + LocalDateTime timestamp = LocalDateTime.now(); + out.println(timestamp.toString() + " : " + entry); + out.flush(); + } } diff --git a/mod2/adress Book/src/dao/DaoFileImpl.java b/mod2/adress Book/src/dao/DaoFileImpl.java index 605f648..f551f0b 100644 --- a/mod2/adress Book/src/dao/DaoFileImpl.java +++ b/mod2/adress Book/src/dao/DaoFileImpl.java @@ -6,6 +6,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,14 +21,10 @@ public class DaoFileImpl implements Dao { public static final String ADRESS_FILE = "book.txt"; public static final String DELIMITER = "::"; - public DaoFileImpl() { - - } - @Override public Adress createAdress(Adress myAdress) throws PersistenceException { - // TODO Auto-generated method stub - return null; + Adress newAdress = adressMap.put(myAdress.getAdressName(), myAdress); + return newAdress; } @Override @@ -44,8 +41,8 @@ public Adress getAdress(String name) throws PersistenceException { @Override public List getAllAdresses() throws PersistenceException { - // TODO Auto-generated method stub - return null; + this.loadRoster(); + return new ArrayList(adressMap.values()); } @Override diff --git a/mod2/adress Book/src/interfaces/Audit.java b/mod2/adress Book/src/interfaces/Audit.java index ff94c4b..42cc056 100644 --- a/mod2/adress Book/src/interfaces/Audit.java +++ b/mod2/adress Book/src/interfaces/Audit.java @@ -1,5 +1,13 @@ package interfaces; +import exceptions.PersistenceException; + public interface Audit { - + /** + * writes a Audit + * + * @param entry + * @throws ClassRosterPersistenceException + */ + void writeAuditEntry(String entry) throws PersistenceException; } diff --git a/mod2/d&d.vs/things .txt b/mod2/d&d.vs/things .txt new file mode 100644 index 0000000..9a00bdd --- /dev/null +++ b/mod2/d&d.vs/things .txt @@ -0,0 +1,3 @@ + Math. round () - this method rounds a number to the nearest integer. ... + Math. floor () - this method rounds a number downward to the nearest integer. ... + Math. ceil() - this method rounds a number upward to its nearest integer. \ No newline at end of file diff --git a/mod4/FirstMavenProject/pom.xml b/mod4/FirstMavenProject/pom.xml new file mode 100644 index 0000000..2feec73 --- /dev/null +++ b/mod4/FirstMavenProject/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + com.mycompany.firstmavenproject + FirstMavenProject + 1.0-SNAPSHOT + + UTF-8 + 18 + 18 + com.mycompany.firstmavenproject.FirstMavenProject + + + + org.springframework + spring-context + 4.3.4.RELEASE + + + + junit + junit + 4.11 + test + + + + \ No newline at end of file diff --git a/mod4/FirstMavenProject/src/main/java/com/mycompany/firstmavenproject/FirstMavenProject.java b/mod4/FirstMavenProject/src/main/java/com/mycompany/firstmavenproject/FirstMavenProject.java new file mode 100644 index 0000000..a564b20 --- /dev/null +++ b/mod4/FirstMavenProject/src/main/java/com/mycompany/firstmavenproject/FirstMavenProject.java @@ -0,0 +1,20 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Project/Maven2/JavaApp/src/main/java/${packagePath}/${mainClassName}.java to edit this template + */ + +package com.mycompany.firstmavenproject; + +/** + * + * @author bhima + */ +public class FirstMavenProject { + + public static void main(String[] args) { + System.out.println("Hello World!"); + } + + + +} diff --git a/mod4/FirstMavenProject/src/main/java/greatParty/GreatParty.java b/mod4/FirstMavenProject/src/main/java/greatParty/GreatParty.java new file mode 100644 index 0000000..a029af6 --- /dev/null +++ b/mod4/FirstMavenProject/src/main/java/greatParty/GreatParty.java @@ -0,0 +1,24 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package greatParty; + +/** + * + * @author bhima + */ +public class GreatParty { + // When squirrels get together for a party, they like to have cigars. +// A squirrel party is successful when the number of cigars is between +// 40 and 60, inclusive. Unless it is the weekend, in which case there +// is no upper bound on the number of cigars. Return true if the party +// with the given values is successful, or false otherwise. +// +// greatParty(30, false) → false +// greatParty(50, false) → true +// greatParty(70, true) → true +public boolean greatParty(int cigars, boolean isWeekend) { + throw new UnsupportedOperationException("Not implemented"); +} +} diff --git a/mod4/FirstMavenProject/src/main/java/greatParty/GreatPartyTest.java b/mod4/FirstMavenProject/src/main/java/greatParty/GreatPartyTest.java new file mode 100644 index 0000000..adf336f --- /dev/null +++ b/mod4/FirstMavenProject/src/main/java/greatParty/GreatPartyTest.java @@ -0,0 +1,34 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package greatParty; + +import org.JU + +/** + * + * @author bhima + */ +public class GreatPartyTest { + GreatParty party = new GreatParty(); + + public GreatPartyTest() { + } + + @BeforeClass + public static void setUpClass() { + } + + @AfterClass + public static void tearDownClass() { + } + + @Before + public void setUp() { + } + + @After + public void teardown() { + } +} diff --git a/mod4/demo/pom.xml b/mod4/demo/pom.xml new file mode 100644 index 0000000..24e5e42 --- /dev/null +++ b/mod4/demo/pom.xml @@ -0,0 +1,75 @@ + + + + 4.0.0 + + com.example.bhima + demo + 1.0-SNAPSHOT + + demo + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + + + + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + + maven-jar-plugin + 3.0.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + maven-site-plugin + 3.7.1 + + + maven-project-info-reports-plugin + 3.0.0 + + + + + diff --git a/mod4/demo/src/main/java/com/example/bhima/App.java b/mod4/demo/src/main/java/com/example/bhima/App.java new file mode 100644 index 0000000..53e39e2 --- /dev/null +++ b/mod4/demo/src/main/java/com/example/bhima/App.java @@ -0,0 +1,13 @@ +package com.example.bhima; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/mod4/demo/src/test/java/com/example/bhima/AppTest.java b/mod4/demo/src/test/java/com/example/bhima/AppTest.java new file mode 100644 index 0000000..d1b2e10 --- /dev/null +++ b/mod4/demo/src/test/java/com/example/bhima/AppTest.java @@ -0,0 +1,20 @@ +package com.example.bhima; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * Unit test for simple App. + */ +public class AppTest +{ + /** + * Rigorous Test :-) + */ + @Test + public void shouldAnswerWithTrue() + { + assertTrue( true ); + } +} diff --git a/mod4/rats/.vscode/settings.json b/mod4/rats/.vscode/settings.json new file mode 100644 index 0000000..779a1b4 --- /dev/null +++ b/mod4/rats/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive", + "maven.view": "flat" +} \ No newline at end of file diff --git a/mod4/rats/pom.xml b/mod4/rats/pom.xml new file mode 100644 index 0000000..8e27964 --- /dev/null +++ b/mod4/rats/pom.xml @@ -0,0 +1,75 @@ + + + + 4.0.0 + + com.text + rats + 1.0-SNAPSHOT + + rats + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + + + + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + + maven-jar-plugin + 3.0.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + maven-site-plugin + 3.7.1 + + + maven-project-info-reports-plugin + 3.0.0 + + + + + diff --git a/mod4/rats/src/main/java/com/text/greateParty.java b/mod4/rats/src/main/java/com/text/greateParty.java new file mode 100644 index 0000000..8b6011e --- /dev/null +++ b/mod4/rats/src/main/java/com/text/greateParty.java @@ -0,0 +1,22 @@ +package com.text; + +public class greateParty { + // When squirrels get together for a party, they like to have cigars. + // A squirrel party is successful when the number of cigars is between + // 40 and 60, inclusive. Unless it is the weekend, in which case there + // is no upper bound on the number of cigars. Return true if the party + // with the given values is successful, or false otherwise. + // + // greatParty(30, false) → false + // greatParty(50, false) → true + // greatParty(70, true) → true + public boolean greatParty(int cigars, boolean isWeekend) { + if (cigars > 40 && cigars < 60 && !isWeekend) { + return true; + } else if (cigars > 40 && isWeekend) { + return true; + } else { + return false; + } + } +} diff --git a/mod4/rats/src/test/java/com/text/AppTest.java b/mod4/rats/src/test/java/com/text/AppTest.java new file mode 100644 index 0000000..14da253 --- /dev/null +++ b/mod4/rats/src/test/java/com/text/AppTest.java @@ -0,0 +1,15 @@ +package com.text; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class AppTest { + /** + * Rigorous Test :-) + */ + @Test + public void shouldAnswerWithTrue() { + assertTrue(true); + } +} From c790eac169e2591492c3d6d7bfdeb569c48da23a Mon Sep 17 00:00:00 2001 From: bhimio Date: Tue, 31 May 2022 11:31:25 -0400 Subject: [PATCH 11/12] another --- .../{greateParty.java => GreateParty.java} | 2 +- mod4/rats/src/test/java/com/text/AppTest.java | 15 ------ .../test/java/com/text/GreatePartyTest.java | 47 +++++++++++++++++++ 3 files changed, 48 insertions(+), 16 deletions(-) rename mod4/rats/src/main/java/com/text/{greateParty.java => GreateParty.java} (96%) delete mode 100644 mod4/rats/src/test/java/com/text/AppTest.java create mode 100644 mod4/rats/src/test/java/com/text/GreatePartyTest.java diff --git a/mod4/rats/src/main/java/com/text/greateParty.java b/mod4/rats/src/main/java/com/text/GreateParty.java similarity index 96% rename from mod4/rats/src/main/java/com/text/greateParty.java rename to mod4/rats/src/main/java/com/text/GreateParty.java index 8b6011e..208b757 100644 --- a/mod4/rats/src/main/java/com/text/greateParty.java +++ b/mod4/rats/src/main/java/com/text/GreateParty.java @@ -1,6 +1,6 @@ package com.text; -public class greateParty { +public class GreateParty { // When squirrels get together for a party, they like to have cigars. // A squirrel party is successful when the number of cigars is between // 40 and 60, inclusive. Unless it is the weekend, in which case there diff --git a/mod4/rats/src/test/java/com/text/AppTest.java b/mod4/rats/src/test/java/com/text/AppTest.java deleted file mode 100644 index 14da253..0000000 --- a/mod4/rats/src/test/java/com/text/AppTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.text; - -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -public class AppTest { - /** - * Rigorous Test :-) - */ - @Test - public void shouldAnswerWithTrue() { - assertTrue(true); - } -} diff --git a/mod4/rats/src/test/java/com/text/GreatePartyTest.java b/mod4/rats/src/test/java/com/text/GreatePartyTest.java new file mode 100644 index 0000000..b8fcc24 --- /dev/null +++ b/mod4/rats/src/test/java/com/text/GreatePartyTest.java @@ -0,0 +1,47 @@ +package com.text; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +public class GreatePartyTest { + GreateParty party = new GreateParty(); + + public GreatePartyTest() { + } + + @BeforeClass + public static void setUpClass() { + + } + + @AfterClass + public static void tearDownClass() { + + } + + @Before + public void setUp() { + + } + + @After + public void tearDown() { + + } + + @Test + public void test30False() { + assertFalse(party.greatParty(30, false)); + } + + @Test + public void test50False() { + assertTrue(party.greatParty(50, false)); + } +} From cee55e429c44d9ee604ade488e74ca93ffcc4023 Mon Sep 17 00:00:00 2001 From: bhimio Date: Tue, 7 Mar 2023 08:19:39 -0500 Subject: [PATCH 12/12] message --- console.sql | 1 + mod4/datetime/datetime.jar | Bin 0 -> 2666 bytes mod4/datetime/pom.xml | 75 +++++ .../datetime/src/main/java/com/bhima/App.java | 56 ++++ .../src/test/java/com/bhima/AppTest.java | 20 ++ mod4/myspringproject/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 58727 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 + mod4/myspringproject/mvnw | 316 ++++++++++++++++++ mod4/myspringproject/mvnw.cmd | 188 +++++++++++ mod4/myspringproject/pom.xml | 50 +++ .../java/com/bhima/myspringproject/Book.java | 46 +++ .../myspringproject/GreetingController.java | 22 ++ .../MyspringprojectApplication.java | 13 + .../bhima/myspringproject/RootReposotory.java | 0 .../myspringproject/ServletInitializer.java | 13 + .../src/main/resources/application.properties | 5 + .../src/main/resources/static/index.html | 21 ++ .../src/main/resources/templates/error.html | 22 ++ .../main/resources/templates/greeting.html | 10 + .../MyspringprojectApplicationTests.java | 13 + mod4/randomWord/.vscode/settings.json | 7 + mod4/randomWord/README.md | 18 + mod4/randomWord/java | 0 mod4/randomWord/json | 0 mod4/randomWord/random word.jar | Bin 0 -> 1482 bytes mod4/randomWord/src/App.java | 111 ++++++ mod4/randomWord/src/RandomWord.java | 111 ++++++ mod4/rats/.vscode/settings.json | 2 +- mod4/rats/pom.xml | 13 +- mod4/rats/src/main/applicationContext.xml | 20 ++ .../com/text/{GreateParty.java => App.java} | 2 +- .../test/java/com/text/GreatePartyTest.java | 44 +-- mod4/server of the gods/.vscode/settings.json | 7 + mod4/server of the gods/README.md | 18 + mod4/server of the gods/src/App.java | 7 + .../src/dao/DaoMemoryImpl.java | 76 +++++ .../src/interfaces/dao.java | 18 + mod4/server of the gods/src/modle/Server.java | 75 +++++ 39 files changed, 1386 insertions(+), 49 deletions(-) create mode 100644 console.sql create mode 100755 mod4/datetime/datetime.jar create mode 100644 mod4/datetime/pom.xml create mode 100644 mod4/datetime/src/main/java/com/bhima/App.java create mode 100644 mod4/datetime/src/test/java/com/bhima/AppTest.java create mode 100644 mod4/myspringproject/.gitignore create mode 100644 mod4/myspringproject/.mvn/wrapper/maven-wrapper.jar create mode 100644 mod4/myspringproject/.mvn/wrapper/maven-wrapper.properties create mode 100755 mod4/myspringproject/mvnw create mode 100644 mod4/myspringproject/mvnw.cmd create mode 100644 mod4/myspringproject/pom.xml create mode 100644 mod4/myspringproject/src/main/java/com/bhima/myspringproject/Book.java create mode 100644 mod4/myspringproject/src/main/java/com/bhima/myspringproject/GreetingController.java create mode 100644 mod4/myspringproject/src/main/java/com/bhima/myspringproject/MyspringprojectApplication.java create mode 100644 mod4/myspringproject/src/main/java/com/bhima/myspringproject/RootReposotory.java create mode 100644 mod4/myspringproject/src/main/java/com/bhima/myspringproject/ServletInitializer.java create mode 100644 mod4/myspringproject/src/main/resources/application.properties create mode 100644 mod4/myspringproject/src/main/resources/static/index.html create mode 100644 mod4/myspringproject/src/main/resources/templates/error.html create mode 100644 mod4/myspringproject/src/main/resources/templates/greeting.html create mode 100644 mod4/myspringproject/src/test/java/com/bhima/myspringproject/MyspringprojectApplicationTests.java create mode 100644 mod4/randomWord/.vscode/settings.json create mode 100644 mod4/randomWord/README.md create mode 100644 mod4/randomWord/java create mode 100644 mod4/randomWord/json create mode 100644 mod4/randomWord/random word.jar create mode 100644 mod4/randomWord/src/App.java create mode 100644 mod4/randomWord/src/RandomWord.java create mode 100644 mod4/rats/src/main/applicationContext.xml rename mod4/rats/src/main/java/com/text/{GreateParty.java => App.java} (96%) create mode 100644 mod4/server of the gods/.vscode/settings.json create mode 100644 mod4/server of the gods/README.md create mode 100644 mod4/server of the gods/src/App.java create mode 100644 mod4/server of the gods/src/dao/DaoMemoryImpl.java create mode 100644 mod4/server of the gods/src/interfaces/dao.java create mode 100644 mod4/server of the gods/src/modle/Server.java diff --git a/console.sql b/console.sql new file mode 100644 index 0000000..f794a1a --- /dev/null +++ b/console.sql @@ -0,0 +1 @@ +select * from Book \ No newline at end of file diff --git a/mod4/datetime/datetime.jar b/mod4/datetime/datetime.jar new file mode 100755 index 0000000000000000000000000000000000000000..2fce0f770f476dcb7f8808dec8e2bc4fe0b311c9 GIT binary patch literal 2666 zcmaJ@2{@GN7yptPW63r#BTK35rimXQ3{obDmb~h^oU}IwgbV*Mv zfNu-}umU(e3mth3UjGc_SO60&i0!Pj#|3rfRwtRS3G)E# z0Kf+P&jDDOU!Bf-AN#onGwzFrqno?8!xz7=rKtR;6#no0bbNi`PF@cF{_z&GX1&^w zO#yayT^_j?B;9$-spJU3(vK_=hDrzd(7X1RwF^xA2F|;yIB)r3x0>4I?#~J};gcAd z+$(B59bPWWZ&x~kYWzQ~uW!tOem#pgaspB6l3kTKsIX|0Jv5reMm6NkWN!H6Yy`#ol_YqNfBD&3PXtWMLk=*oo%m~UJsi9RQM6T4; zg1L6VZ^t_v1Qyz=O#BnF-rQ8HM?NrK8$34)K2vLrhKb{Sj{iB#xjYdV;kgxUbfp`E z=9~0zM2VcD93=+O&!D(!V2cA$ageo}ul6 z2O%smwvUU`C`Rm&_Bk7WuOwy2NCQtG)**i^cAe6^K+{vrR#IgYuqv{gu9MO|RoJd- ztgpl3q~k72k(dl*%WlvVz0U$eSLco?zeAJ;yTs)N#e2A!b|D` zNjPymF3mMUFBG0FXWIYr`m1s7{Tg*nWMxS~R>h#!6EK&*Amu}A7S+PFki4TBcQ4){ znF#Jt3^qE|DZQ!$kIYD@G{m8JZE6?M^ROPi*Zb6;4BQ(#X@@Wz-b`{{i#K~;fu-gT ziQy7Ty*bjGo;6W9xsGjsyNp*n^W+8MRw%yd7n^A7^l(wx5v7fdSM}G*oCVg0l~S6| z+<2TtoW7%Y;ZBfWbOgc%8Sll(m1b(nu#&YHhiSH}?Q+I?eRzwnxHdIM6RaqGGf3bD;MR`(W}GSlJV z<%yC`-^ZB9)w_PSLKX6x3F`7wcXjE=Ib-uYsQm`OFZS_tn6{{qc&yl%0c<%#=)k#E z?Uar|*X-&SqnENnLbp~{IG&#Pq!$bwDzP+uE)3JdS*zfxt4w5Kd7y;EhvqnGHy69X z7U5aztXdUUDjC_?btJl%vo1NcH_{EI9U-Vm7U)NOB<51PTOSkha`-DeoFAeHvIj12 zaYNo7o{Sn#AR+y4;IC#nCKYBjpARus zt$!&)Qt3n>>>3UCI|*l2ah}}low^lp&$`&L4qax_m_kh-sjNQT;QrpXeJeUx>b4!o z&Nn>0s7}xdnbR@gR6{xsF6}N$f2$c~NVVfUM-^op*~?qcV>!Lwhp#xAx9SQd2-OFEg%kc0JVriL#)ah~o%Lg63QtIy1x24>R59Ec2lP(ef!Q=WJnLTK{CoDI8T$ z!l~xT8`VS9H1(7gkaH@b%FiVl!K$^(v*F$C=iP7KkxS|a)k6$s<2gXy2|8SMb&dPg zY`8+BePif^2HhAR`9PcZOQBzA=g|iXp(SQ#Om=PeZWjv#*pW5g>Wyt#^S%8{Q%k7ANl*`U}x3$Z+6uPZlcC3}T+==^_F~2Q%JHfYu zw9T|TX2-04C&Bl;``;|zwsd>wb}R$*qb&c7pb2&llluW+FY^gw{*Hd8xC4N{0e3Yj A5&!@I literal 0 HcmV?d00001 diff --git a/mod4/datetime/pom.xml b/mod4/datetime/pom.xml new file mode 100644 index 0000000..6d29bcc --- /dev/null +++ b/mod4/datetime/pom.xml @@ -0,0 +1,75 @@ + + + + 4.0.0 + + com.bhima + datetime + 1.0-SNAPSHOT + + datetime + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + + + + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + + maven-jar-plugin + 3.0.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + maven-site-plugin + 3.7.1 + + + maven-project-info-reports-plugin + 3.0.0 + + + + + diff --git a/mod4/datetime/src/main/java/com/bhima/App.java b/mod4/datetime/src/main/java/com/bhima/App.java new file mode 100644 index 0000000..45d8f22 --- /dev/null +++ b/mod4/datetime/src/main/java/com/bhima/App.java @@ -0,0 +1,56 @@ +package com.bhima; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDate; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; +import java.util.Date; + +public class App { + public App(String[] args) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM/dd/yyyy"); + LocalDate ld = LocalDate.parse("02/07/2010", formatter); + String formatted = ld.format(formatter); + Date legacyDate = new Date(); + ZonedDateTime zdt = ZonedDateTime.ofInstant( + legacyDate.toInstant(), ZoneId.systemDefault()); + ld = zdt.toLocalDate(); + formatted = ld.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL)); + System.out.println(formatted); + InnerApp_1 iApp_1 = new InnerApp_1(args); + } +} + +class InnerApp { + public static void main(String[] args) { + BigDecimal a = new BigDecimal("42.35"); + BigDecimal b; + b = a.setScale(1, RoundingMode.HALF_UP); + System.out.println(b.toString()); + b = a.setScale(1, RoundingMode.HALF_DOWN); + System.out.println(b.toString()); // 42.3 + BigDecimal op1 = new BigDecimal("10"); + BigDecimal op2 = new BigDecimal("4"); + BigDecimal c = op1.divide(op2); // ERROR + System.out.println(c); + c = op1.divide(op2, RoundingMode.HALF_UP); // 2 + System.out.println(c.toString()); + + c = op1.divide(op2, 2, RoundingMode.HALF_UP); // 1.67 + System.out.println(c.toString()); + + c = op1.divide(op2, 2, RoundingMode.DOWN); // 1.66 + System.out.println(c.toString()); + App app = new App(args); + + } +} + +class InnerApp_1 { + public InnerApp_1(String[] args) { + + } +} diff --git a/mod4/datetime/src/test/java/com/bhima/AppTest.java b/mod4/datetime/src/test/java/com/bhima/AppTest.java new file mode 100644 index 0000000..6e23f01 --- /dev/null +++ b/mod4/datetime/src/test/java/com/bhima/AppTest.java @@ -0,0 +1,20 @@ +package com.bhima; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * Unit test for simple App. + */ +public class AppTest +{ + /** + * Rigorous Test :-) + */ + @Test + public void shouldAnswerWithTrue() + { + assertTrue( true ); + } +} diff --git a/mod4/myspringproject/.gitignore b/mod4/myspringproject/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/mod4/myspringproject/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/mod4/myspringproject/.mvn/wrapper/maven-wrapper.jar b/mod4/myspringproject/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1dd12f17644411d6e840bd5a10c6ecda0175f18 GIT binary patch literal 58727 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%0ANsA|A3-jj|r`KAo%oTajX3>^E` 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 YM{}PByk10KD_nuQ4E7Du?}+~TKh4V)`~Uy| literal 0 HcmV?d00001 diff --git a/mod4/myspringproject/.mvn/wrapper/maven-wrapper.properties b/mod4/myspringproject/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..b7cb93e --- /dev/null +++ b/mod4/myspringproject/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/mod4/myspringproject/mvnw b/mod4/myspringproject/mvnw new file mode 100755 index 0000000..8a8fb22 --- /dev/null +++ b/mod4/myspringproject/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mod4/myspringproject/mvnw.cmd b/mod4/myspringproject/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/mod4/myspringproject/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/mod4/myspringproject/pom.xml b/mod4/myspringproject/pom.xml new file mode 100644 index 0000000..b685067 --- /dev/null +++ b/mod4/myspringproject/pom.xml @@ -0,0 +1,50 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.6.3 + + + com.example + serving-web-content-complete + 0.0.1-SNAPSHOT + serving-web-content-complete + Demo project for Spring Boot + + 1.8 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + mysql + mysql-connector-java + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/mod4/myspringproject/src/main/java/com/bhima/myspringproject/Book.java b/mod4/myspringproject/src/main/java/com/bhima/myspringproject/Book.java new file mode 100644 index 0000000..34c88c7 --- /dev/null +++ b/mod4/myspringproject/src/main/java/com/bhima/myspringproject/Book.java @@ -0,0 +1,46 @@ +package com.bhima.myspringproject; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; + + +import org.springframework.data.annotation.Id; + +@Entity +public class Book { + @Id + @GeneratedValue(strategy=GenerationType.AUTO) + private Integer id; + private String title; + private String author; + + public Book(String title){ + this.setTitle(title); + } + + public int getId() { + return this.id; + } + + public void setId(int id) { + this.id = id; + } + + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getAuthor() { + return this.author; + } + + public void setAuthor(String author) { + this.author = author; + } + +} diff --git a/mod4/myspringproject/src/main/java/com/bhima/myspringproject/GreetingController.java b/mod4/myspringproject/src/main/java/com/bhima/myspringproject/GreetingController.java new file mode 100644 index 0000000..e7150c7 --- /dev/null +++ b/mod4/myspringproject/src/main/java/com/bhima/myspringproject/GreetingController.java @@ -0,0 +1,22 @@ +package com.bhima.myspringproject; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +@Controller +public class GreetingController { + + @GetMapping("/greeting") + public String greeting(@RequestParam(name="name", required=false, defaultValue="World") String name, Model model) { + model.addAttribute("name", name); + return "greeting"; + } + + @GetMapping("/error") + public String error() { + return "error"; + } + +} \ No newline at end of file diff --git a/mod4/myspringproject/src/main/java/com/bhima/myspringproject/MyspringprojectApplication.java b/mod4/myspringproject/src/main/java/com/bhima/myspringproject/MyspringprojectApplication.java new file mode 100644 index 0000000..f5a5e88 --- /dev/null +++ b/mod4/myspringproject/src/main/java/com/bhima/myspringproject/MyspringprojectApplication.java @@ -0,0 +1,13 @@ +package com.bhima.myspringproject; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class MyspringprojectApplication { + + public static void main(String[] args) { + SpringApplication.run(MyspringprojectApplication.class, args); + } + +} diff --git a/mod4/myspringproject/src/main/java/com/bhima/myspringproject/RootReposotory.java b/mod4/myspringproject/src/main/java/com/bhima/myspringproject/RootReposotory.java new file mode 100644 index 0000000..e69de29 diff --git a/mod4/myspringproject/src/main/java/com/bhima/myspringproject/ServletInitializer.java b/mod4/myspringproject/src/main/java/com/bhima/myspringproject/ServletInitializer.java new file mode 100644 index 0000000..e7548ab --- /dev/null +++ b/mod4/myspringproject/src/main/java/com/bhima/myspringproject/ServletInitializer.java @@ -0,0 +1,13 @@ +package com.bhima.myspringproject; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +public class ServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(MyspringprojectApplication.class); + } + +} diff --git a/mod4/myspringproject/src/main/resources/application.properties b/mod4/myspringproject/src/main/resources/application.properties new file mode 100644 index 0000000..346fdd4 --- /dev/null +++ b/mod4/myspringproject/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.jpa.hibernate.ddl-auto=update +spring.datasource.url=jdbc:mysql://localhost:3306/library +spring.datasource.username=root +spring.datasource.passsword=mynewpassword +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/mod4/myspringproject/src/main/resources/static/index.html b/mod4/myspringproject/src/main/resources/static/index.html new file mode 100644 index 0000000..bb4cc32 --- /dev/null +++ b/mod4/myspringproject/src/main/resources/static/index.html @@ -0,0 +1,21 @@ + + + + Getting Started: Serving Web Content + + + +

this is my first spring boot!

+ +
  • Get your greeting here.
    • +
  • + click to make errors apere!!! +
    • + + + \ No newline at end of file diff --git a/mod4/myspringproject/src/main/resources/templates/error.html b/mod4/myspringproject/src/main/resources/templates/error.html new file mode 100644 index 0000000..00cd423 --- /dev/null +++ b/mod4/myspringproject/src/main/resources/templates/error.html @@ -0,0 +1,22 @@ + + + + What the HECK! + + +

    + 2022-06-01 12:04:47.975 INFO 47920 --- [ restartedMain] c.b.m.MyspringprojectApplication : Starting MyspringprojectApplication using Java 11.0.15 on bhima-Lenovo-ideapad-310-Touch-15ISK with PID 47920 (/home/bhima/dev/mod4/myspringproject/target/classes started by bhima in /home/bhima/dev/mod4/myspringproject) + 2022-06-01 12:04:47.976 INFO 47920 --- [ restartedMain] c.b.m.MyspringprojectApplication : No active profile set, falling back to default profiles: default + 2022-06-01 12:04:48.444 INFO 47920 --- [ restartedMain] o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat initialized with port(s): ${name} (http) + 2022-06-01 12:04:48.447 INFO 47920 --- [ restartedMain] o.apache.catalina.core.StandardService : Starting service [Tomcat] + 2022-06-01 12:04:48.448 INFO 47920 --- [ restartedMain] org.apache.catalina.core.StandardEngine : Starting Servlet engine: [Apache Tomcat/9.0.56] + 2022-06-01 12:04:48.463 INFO 47920 --- [ restartedMain] o.a.c.c.C.[Tomcat].[localhost].[/] : Initializing Spring embedded WebApplicationContext + 2022-06-01 12:04:48.464 INFO 47920 --- [ restartedMain] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 482 ms + 2022-06-01 12:04:48.577 INFO 47920 --- [ restartedMain] o.s.b.a.w.s.WelcomePageHandlerMapping : Adding welcome page: class path resource [static/index.html] + 2022-06-01 12:04:48.640 INFO 47920 --- [ restartedMain] o.s.b.d.a.OptionalLiveReloadServer : LiveReload server is running on port 35729 + 2022-06-01 12:04:48.680 INFO 47920 --- [ restartedMain] o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat started on port(s): 8080 (http) with context path '' + 2022-06-01 12:04:48.691 INFO 47920 --- [ restartedMain] c.b.m.MyspringprojectApplication : Started MyspringprojectApplication in 0.763 seconds (JVM running for 1725.67) + 2022-06-01 12:04:48.697 INFO 47920 --- [ restartedMain] .ConditionEvaluationDeltaLoggingListener : Condition evaluation unchanged +

    + + \ No newline at end of file diff --git a/mod4/myspringproject/src/main/resources/templates/greeting.html b/mod4/myspringproject/src/main/resources/templates/greeting.html new file mode 100644 index 0000000..6ec386d --- /dev/null +++ b/mod4/myspringproject/src/main/resources/templates/greeting.html @@ -0,0 +1,10 @@ + + + + Getting Started: Serving Web Content + + + +

    + + diff --git a/mod4/myspringproject/src/test/java/com/bhima/myspringproject/MyspringprojectApplicationTests.java b/mod4/myspringproject/src/test/java/com/bhima/myspringproject/MyspringprojectApplicationTests.java new file mode 100644 index 0000000..c747228 --- /dev/null +++ b/mod4/myspringproject/src/test/java/com/bhima/myspringproject/MyspringprojectApplicationTests.java @@ -0,0 +1,13 @@ +package com.bhima.myspringproject; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class MyspringprojectApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/mod4/randomWord/.vscode/settings.json b/mod4/randomWord/.vscode/settings.json new file mode 100644 index 0000000..e112a70 --- /dev/null +++ b/mod4/randomWord/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "java.project.sourcePaths": ["src"], + "java.project.outputPath": "bin", + "java.project.referencedLibraries": [ + "lib/**/*.jar" + ] +} diff --git a/mod4/randomWord/README.md b/mod4/randomWord/README.md new file mode 100644 index 0000000..7c03a53 --- /dev/null +++ b/mod4/randomWord/README.md @@ -0,0 +1,18 @@ +## Getting Started + +Welcome to the VS Code Java world. Here is a guideline to help you get started to write Java code in Visual Studio Code. + +## Folder Structure + +The workspace contains two folders by default, where: + +- `src`: the folder to maintain sources +- `lib`: the folder to maintain dependencies + +Meanwhile, the compiled output files will be generated in the `bin` folder by default. + +> If you want to customize the folder structure, open `.vscode/settings.json` and update the related settings there. + +## Dependency Management + +The `JAVA PROJECTS` view allows you to manage your dependencies. More details can be found [here](https://github.com/microsoft/vscode-java-dependency#manage-dependencies). diff --git a/mod4/randomWord/java b/mod4/randomWord/java new file mode 100644 index 0000000..e69de29 diff --git a/mod4/randomWord/json b/mod4/randomWord/json new file mode 100644 index 0000000..e69de29 diff --git a/mod4/randomWord/random word.jar b/mod4/randomWord/random word.jar new file mode 100644 index 0000000000000000000000000000000000000000..8fe453cabdd4d402f267cacf529afae39a26f1e2 GIT binary patch literal 1482 zcmZ{kc{CIV9LL8onQ2puajZ#9bT~&@auuT-V~lgiAV)M9xsOeBXeZGu7b--$1%(hwqfK^O;n-yAJqgxcMuF~1wRc5c*r!~%7!L+yc zMs}jqG??}wYRAWUlRQCyEm{PW1;R_HZF{S1x9#`DBmYSRZ-0>?AsXJ7y~4wxY$jBi@Vt$0Pj zxZJ*gKj{rFVyB~c(Z%KuWiub(i~C#R?Z`te?TrlhNSK3ZVyZxYt1RV?nbQ;$ z=XO@PYN33=(=Q9`jMtHkH%^Zm4!vW1Jg~C*fk{c-q(yAlGr!fo`Pa@jZ^K8TPtWFD zgRy@i@wFE*mx_$f(p~_NWhr#`kCJN>dC<+Jygmo}l{AlwR7o_DfQ}lGvw8mqvvh`X zE(c)3HuwB%+9Ky}6un=CSPFT1);Y3_Qgb^_+qo@lPlr|adworKkEl8pN8_>k1E{9% zRdzzK5c%E?$+GI)v?0;dfg3Mb-F4siR1p45Fwd{5JdNl;Z*Banp#!@Da22L~$dCf! z%~gorwN+7XC(k6vuzZ@ktQ=oRFzeQc0rdS*_oHihNA&dqEhAFXAmkK#2-v=aldp7t z{-|6EA6{@|J>{zs6J^+9SIfEHgG^LXR;(X5tcuJuwSG*VwpdGFf&AP92kT@Ux0pr= zL4awh^=G6_6Olbsj;6oGq^7^~q<>EWr;PR*l27|$2pbVul#$a4Ie3iyN-tm_iN`M!yj( zs?NuDgr6x~la-nZdNJ)L+z|m=Prj=6=F?~Ql$Z1Z4a4Mn<6EKxoG%E?|1v&%RA2! z>vLJ((*28ycfK2%hNSIdO`% zEHV$%UscJQ+E`-w2;ARl@Z;Evi+hqrayAyU`_(Nga>vuHT TqJevMUV__oZF`;q?p*%>56y`& literal 0 HcmV?d00001 diff --git a/mod4/randomWord/src/App.java b/mod4/randomWord/src/App.java new file mode 100644 index 0000000..790395f --- /dev/null +++ b/mod4/randomWord/src/App.java @@ -0,0 +1,111 @@ +import java.util.Random; + +public class App { + public static void main(String[] args) throws Exception { + Random random = new Random(); + System.out.println(getWord(random)); + } + + private static String getWord(Random random) { + int times = randomNum(random, 10) + 1; + String word = ""; + for (int i = 0; i < times; i++) { + word = word + numToWord(randomNum(random, 27)); + } + + return word; + } + + private static String numToWord(int num) { + + switch (num) { + case 0: + return "a"; + case 1: + + return "b"; + case 2: + + return "c"; + case 3: + + return "d"; + case 4: + + return "e"; + case 5: + + return "f"; + case 6: + + return "g"; + case 7: + + return "h"; + case 8: + + return "i"; + case 9: + + return "j"; + case 10: + + return "k"; + case 11: + + return "l"; + case 12: + + return "m"; + case 13: + + return "n"; + case 14: + + return "o"; + case 15: + + return "p"; + case 16: + + return "q"; + case 17: + + return "r"; + case 18: + + return "s"; + case 19: + + return "t"; + case 20: + + return "u"; + case 21: + + return "v"; + case 22: + + return "w"; + case 23: + + return "x"; + case 24: + + return "y"; + case 25: + + return "z"; + case 26: + + return " "; + case 27: + return ""; + } + return null; + } + + private static int randomNum(Random random, int bound) { + return random.nextInt(bound); + } +} diff --git a/mod4/randomWord/src/RandomWord.java b/mod4/randomWord/src/RandomWord.java new file mode 100644 index 0000000..ab55975 --- /dev/null +++ b/mod4/randomWord/src/RandomWord.java @@ -0,0 +1,111 @@ +import java.util.Random; + +public class RandomWord { + private Random random; + public RandomWord(Random random){ + this.random = random; + } + + public String getWord() { + int times = this.randomNum(this.random, 12) + 1; + String word = ""; + for (int i = 0; i < times; i++) { + word = word + this.numToWord(randomNum(this.random, 27)); + } + + return word; + } + + private String numToWord(int num) { + + switch (num) { + case 0: + return "a"; + case 1: + + return "b"; + case 2: + + return "c"; + case 3: + + return "d"; + case 4: + + return "e"; + case 5: + + return "f"; + case 6: + + return "g"; + case 7: + + return "h"; + case 8: + + return "i"; + case 9: + + return "j"; + case 10: + + return "k"; + case 11: + + return "l"; + case 12: + + return "m"; + case 13: + + return "n"; + case 14: + + return "o"; + case 15: + + return "p"; + case 16: + + return "q"; + case 17: + + return "r"; + case 18: + + return "s"; + case 19: + + return "t"; + case 20: + + return "u"; + case 21: + + return "v"; + case 22: + + return "w"; + case 23: + + return "x"; + case 24: + + return "y"; + case 25: + + return "z"; + case 26: + + return " "; + case 27: + return ""; + } + return null; + } + + private int randomNum(Random random, int bound) { + return random.nextInt(bound); + } +} diff --git a/mod4/rats/.vscode/settings.json b/mod4/rats/.vscode/settings.json index 779a1b4..d71dfa0 100644 --- a/mod4/rats/.vscode/settings.json +++ b/mod4/rats/.vscode/settings.json @@ -1,4 +1,4 @@ { - "java.configuration.updateBuildConfiguration": "interactive", + "java.configuration.updateBuildConfiguration": "automatic", "maven.view": "flat" } \ No newline at end of file diff --git a/mod4/rats/pom.xml b/mod4/rats/pom.xml index 8e27964..035aef9 100644 --- a/mod4/rats/pom.xml +++ b/mod4/rats/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.text @@ -25,10 +24,16 @@ 4.11 test + + org.springframework + spring-context + 5.3.20 + - + + @@ -72,4 +77,4 @@ - + \ No newline at end of file diff --git a/mod4/rats/src/main/applicationContext.xml b/mod4/rats/src/main/applicationContext.xml new file mode 100644 index 0000000..bd4594a --- /dev/null +++ b/mod4/rats/src/main/applicationContext.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/mod4/rats/src/main/java/com/text/GreateParty.java b/mod4/rats/src/main/java/com/text/App.java similarity index 96% rename from mod4/rats/src/main/java/com/text/GreateParty.java rename to mod4/rats/src/main/java/com/text/App.java index 208b757..7798015 100644 --- a/mod4/rats/src/main/java/com/text/GreateParty.java +++ b/mod4/rats/src/main/java/com/text/App.java @@ -1,6 +1,6 @@ package com.text; -public class GreateParty { +public class App { // When squirrels get together for a party, they like to have cigars. // A squirrel party is successful when the number of cigars is between // 40 and 60, inclusive. Unless it is the weekend, in which case there diff --git a/mod4/rats/src/test/java/com/text/GreatePartyTest.java b/mod4/rats/src/test/java/com/text/GreatePartyTest.java index b8fcc24..fa27c89 100644 --- a/mod4/rats/src/test/java/com/text/GreatePartyTest.java +++ b/mod4/rats/src/test/java/com/text/GreatePartyTest.java @@ -1,47 +1,5 @@ package com.text; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - public class GreatePartyTest { - GreateParty party = new GreateParty(); - - public GreatePartyTest() { - } - - @BeforeClass - public static void setUpClass() { - - } - - @AfterClass - public static void tearDownClass() { - - } - - @Before - public void setUp() { - - } - - @After - public void tearDown() { - - } - - @Test - public void test30False() { - assertFalse(party.greatParty(30, false)); - } - - @Test - public void test50False() { - assertTrue(party.greatParty(50, false)); - } + } diff --git a/mod4/server of the gods/.vscode/settings.json b/mod4/server of the gods/.vscode/settings.json new file mode 100644 index 0000000..e112a70 --- /dev/null +++ b/mod4/server of the gods/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "java.project.sourcePaths": ["src"], + "java.project.outputPath": "bin", + "java.project.referencedLibraries": [ + "lib/**/*.jar" + ] +} diff --git a/mod4/server of the gods/README.md b/mod4/server of the gods/README.md new file mode 100644 index 0000000..7c03a53 --- /dev/null +++ b/mod4/server of the gods/README.md @@ -0,0 +1,18 @@ +## Getting Started + +Welcome to the VS Code Java world. Here is a guideline to help you get started to write Java code in Visual Studio Code. + +## Folder Structure + +The workspace contains two folders by default, where: + +- `src`: the folder to maintain sources +- `lib`: the folder to maintain dependencies + +Meanwhile, the compiled output files will be generated in the `bin` folder by default. + +> If you want to customize the folder structure, open `.vscode/settings.json` and update the related settings there. + +## Dependency Management + +The `JAVA PROJECTS` view allows you to manage your dependencies. More details can be found [here](https://github.com/microsoft/vscode-java-dependency#manage-dependencies). diff --git a/mod4/server of the gods/src/App.java b/mod4/server of the gods/src/App.java new file mode 100644 index 0000000..a21cba8 --- /dev/null +++ b/mod4/server of the gods/src/App.java @@ -0,0 +1,7 @@ +import java.util.Random; + +public class App { + public static void main(String[] args) throws Exception { + RandomWord foo = new RandomWord(new Random()); + } +} diff --git a/mod4/server of the gods/src/dao/DaoMemoryImpl.java b/mod4/server of the gods/src/dao/DaoMemoryImpl.java new file mode 100644 index 0000000..d57c431 --- /dev/null +++ b/mod4/server of the gods/src/dao/DaoMemoryImpl.java @@ -0,0 +1,76 @@ +package dao; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import interfaces.dao; +import modle.Server; + +public class DaoMemoryImpl implements dao { + + private Map serverMap = new HashMap<>(); + + @Override + public void addServer(Server server) { + serverMap.put(server.getName(), server); + } + + @Override + public Server getServer(String name) { + return serverMap.get(name); + } + + @Override + public void removeServer(String name) { + serverMap.remove(name); + } + + @Override + public List getAllServers() { + return new ArrayList(serverMap.values()); + } + + @Override + public Map> getAllServersGroupByManufacturer() { + return serverMap.values() + .stream() + .collect(Collectors.groupingBy(Server::getManufacturer)); + } + + @Override + public List getServersByManufacturer(String manufacturer) { + return serverMap.values() + .stream() + .filter(s -> s.getManufacturer().equalsIgnoreCase(manufacturer)) + .collect(Collectors.toList()); + } + + @Override + public List getServersOlderThan(int ageInYears) { + return serverMap.values() + .stream() + .filter(s -> s.getServerAge() > ageInYears) + .collect(Collectors.toList()); + } + + @Override + public Map> getServersOlderThanGroupByManufacturer(int ageInYears) { + return this.getServersOlderThan(ageInYears) + .stream() + .collect(Collectors.groupingBy(Server::getManufacturer)); + } + + @Override + public double getAverageServerAge() { + return serverMap.values() + .stream() + .mapToLong(s -> s.getServerAge()) + // .mapToLong(Server::getServerAge) + .average() + .getAsDouble(); + } + +} diff --git a/mod4/server of the gods/src/interfaces/dao.java b/mod4/server of the gods/src/interfaces/dao.java new file mode 100644 index 0000000..c446db1 --- /dev/null +++ b/mod4/server of the gods/src/interfaces/dao.java @@ -0,0 +1,18 @@ +package interfaces; + +import java.util.List; +import java.util.Map; + +import modle.Server; + +public interface dao { + public void addServer(Server server); + public Server getServer(String name); + public void removeServer(String name); + public List getAllServers(); + public Map> getAllServersGroupByManufacturer(); + public List getServersByManufacturer(String manufacturer); + public List getServersOlderThan(int ageInYears); + public Map> getServersOlderThanGroupByManufacturer(int ageInYears); + public double getAverageServerAge(); +} diff --git a/mod4/server of the gods/src/modle/Server.java b/mod4/server of the gods/src/modle/Server.java new file mode 100644 index 0000000..89855ae --- /dev/null +++ b/mod4/server of the gods/src/modle/Server.java @@ -0,0 +1,75 @@ +package modle; + +import java.time.LocalDate; +import java.time.Period; + +public class Server { + private String name; + private String ip; + private String manufacturer; + private int ram; + private int numProcessors; + private LocalDate purchaseDate; + + public Server(String name, String ip, String manufacturer, int ram, int numProcessors, LocalDate purchaseDate){ + this.setIp(ip); + this.setManufacturer(manufacturer); + this.setNumProcessors(numProcessors); + this.setPurchaseDate(purchaseDate); + this.setRam(ram); + this.setName(name); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getIp() { + return ip; + } + + public void setIp(String ip) { + this.ip = ip; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public int getRam() { + return ram; + } + + public void setRam(int ram) { + this.ram = ram; + } + + public int getNumProcessors() { + return numProcessors; + } + + public void setNumProcessors(int numProcessors) { + this.numProcessors = numProcessors; + } + + public LocalDate getPurchaseDate() { + return purchaseDate; + } + + public void setPurchaseDate(LocalDate purchaseDate) { + this.purchaseDate = purchaseDate; + } + + public long getServerAge() { + Period p = purchaseDate.until(LocalDate.now()); + return p.getYears(); + } +}

    jdk!