diff --git a/Klausuren/Sda1/2016Winter/Exam/src/main/java/de/hdm_stuttgart/mi/sda1/exam/jpaexport/EmployeeInfo.java b/Klausuren/Sda1/2016Winter/Exam/src/main/java/de/hdm_stuttgart/mi/sda1/exam/jpaexport/EmployeeInfo.java index 1778f3ce75c93dffd696acd7db29f6325e6a0398..27a8e30c0898454d683c8e61ba3d6c6503a8babb 100644 --- a/Klausuren/Sda1/2016Winter/Exam/src/main/java/de/hdm_stuttgart/mi/sda1/exam/jpaexport/EmployeeInfo.java +++ b/Klausuren/Sda1/2016Winter/Exam/src/main/java/de/hdm_stuttgart/mi/sda1/exam/jpaexport/EmployeeInfo.java @@ -18,7 +18,7 @@ public class EmployeeInfo { * This refers to a corresponding element {@code <persistence-unit name = "strategy_none" >} * in META-INF/persistence.xml leaving the Database "as is". */ - static public final String PERSISTENCE_UNIT_NONE = "strategy_none"; + static private final String PERSISTENCE_UNIT_NONE = "strategy_none"; /** * @param args Unused */ @@ -35,12 +35,9 @@ public class EmployeeInfo { cq.from(Department.class); // Set query root, don't forget me! em.getTransaction().begin(); - - for (final Department d: em.createQuery(cq).getResultList()) { - System.out.println(d.getName()); - } - - + for (final Department d: em.createQuery(cq).getResultList()) { + System.out.println(d.getName()); + } em.getTransaction().commit(); em.close(); diff --git a/Klausuren/Sda1/2016Winter/Solution/src/main/java/de/hdm_stuttgart/mi/sda1/exam/dataexport/EmployeeInfo.java b/Klausuren/Sda1/2016Winter/Solution/src/main/java/de/hdm_stuttgart/mi/sda1/exam/dataexport/EmployeeInfo.java index 75d77adee44e3ec5a79e0853871fdfbb209cbb70..a7b5e661472c058ef8e44aa375ddebef793a21bf 100644 --- a/Klausuren/Sda1/2016Winter/Solution/src/main/java/de/hdm_stuttgart/mi/sda1/exam/dataexport/EmployeeInfo.java +++ b/Klausuren/Sda1/2016Winter/Solution/src/main/java/de/hdm_stuttgart/mi/sda1/exam/dataexport/EmployeeInfo.java @@ -10,8 +10,8 @@ import de.hdm_stuttgart.mi.sda1.exam.dataexport.model.Department; import de.hdm_stuttgart.mi.sda1.exam.dataexport.model.Employee; /** - * Exporting company data. Execution requires importing corresponding - * schema and optionally sample data from Sql/sample.sql + * Exporting company data. Execution requires an existing database schema and + * optionally sample data. See file Sql/sample.sql. */ public class EmployeeInfo { @@ -19,7 +19,7 @@ public class EmployeeInfo { * This refers to a corresponding element {@code <persistence-unit name = "strategy_none" >} * in META-INF/persistence.xml leaving the Database "as is". */ - static public final String PERSISTENCE_UNIT_NONE = "strategy_none"; + static private final String PERSISTENCE_UNIT_NONE = "strategy_none"; /** * @param args Unused */ @@ -46,17 +46,18 @@ public class EmployeeInfo { factory.close(); } - static String getInfo(final Employee e) { - final StringBuffer ret = new StringBuffer(e.getCommonName() + ", department " + e.getDepartment().getName()); + private static String getInfo(final Employee e) { + final StringBuilder ret = new StringBuilder(e.getCommonName() + ", department " + e.getDepartment().getName()); final Department rootDepartment = getRootDepartment(e.getDepartment()); if (rootDepartment != e.getDepartment()) { - ret.append(", Top level department " + rootDepartment.getName()); + ret.append(", Top level department "); + ret.append(rootDepartment.getName()); } return ret.toString(); } - - static Department getRootDepartment(Department d) { + + private static Department getRootDepartment(Department d) { while (null != d.getParent()) { d = d.getParent(); }