Merge branch 'master' of https://github.com/sourcecodeschool/source-code

Author: ivankoriakovskii

…/java/ru/javacourse/model/LessonDao.java …in/java/ru/javacourse/Dao/CommonDao.javasrc/main/java/ru/javacourse/model/LessonDao.java renamed to src/main/java/ru/javacourse/Dao/CommonDao.java src/main/java/ru/javacourse/model/LessonDao.java renamed to src/main/java/ru/javacourse/Dao/CommonDao.java

@@ -1,30 +1,30 @@
-package ru.javacourse.model;
+package ru.javacourse.Dao;
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 import ru.javacourse.config.HibernateConfig;
+import ru.javacourse.model.Lesson;
 
 import java.util.List;
 
-public class LessonDao {
-
+public class CommonDao {
     private static SessionFactory sessionFactory = HibernateConfig.getSessionFactory();
+    private java.lang.Object Object;
 
-    //получение списка всех уроков
-    public List<Lesson> getAll ()
+    //получение списка
+   public <T> List<T> getAll(T obj)
     {
         Session session = sessionFactory.openSession();
         Transaction tx = session.beginTransaction();
-        List <Lesson> lessons = session.createQuery("from Lesson").list();
+        List <T> t = session.createQuery("from  " + obj.getClass().getSimpleName()).list();
         tx.commit();
         session.close();
-        return lessons;
+        return t;
     }
 
     //получение записи по id
-    public Lesson getById (String lessonId)
-    {
+    public Lesson getById(String lessonId) {
         Session session = sessionFactory.openSession();
         Transaction tx = session.beginTransaction();
         Lesson lesson = session.get(Lesson.class, lessonId);
@@ -35,8 +35,7 @@ public Lesson getById (String lessonId)
     }
 
     //сохранение записи
-    public <T> void save (T entity)
-    {
+    public <T> void save(T entity) {
         Session session = sessionFactory.openSession();
         Transaction tx = session.beginTransaction();
         session.save(entity);

src/main/java/ru/javacourse/config/HibernateConfig.java

@@ -4,6 +4,10 @@
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.service.ServiceRegistry;
+import ru.javacourse.model.Exercise;
+import ru.javacourse.model.Lesson;
+import ru.javacourse.model.LessonTask;
+import ru.javacourse.model.Resource;
 
 public class HibernateConfig {
     private static SessionFactory sessionFactory;
@@ -16,6 +20,10 @@ public static SessionFactory getSessionFactory(){
         ServiceRegistry serviceRegistry
                 = new StandardServiceRegistryBuilder()
                 .applySettings(configuration.getProperties()).build();
+        configuration.addAnnotatedClass(Lesson.class);
+        configuration.addAnnotatedClass(LessonTask.class);
+        configuration.addAnnotatedClass(Resource.class);
+        configuration.addAnnotatedClass(Exercise.class);
         sessionFactory = configuration.buildSessionFactory(serviceRegistry);
         return sessionFactory;
     }