Merge pull request #16 from jiritobias/Competition+SportEvent

Competition+sport event
jiritobias · Oct 29, 2017 · 092ae42 · 092ae42
2 parents 9c91f45 + 6f7003c
commit 092ae42
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 5 deletions.
diff --git a/persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDao.java b/persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDao.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 /**
- * Created by lenoch on 26.10.17.
+ * @author Petra Halová 26.10.17.
  */
 public interface CompetitionDao extends BaseDao<Competition> {
 

diff --git a/persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDaoImpl.java b/persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDaoImpl.java
@@ -6,7 +6,7 @@
 import java.util.List;
 
 /**
- * Created by lenoch on 26.10.17.
+ * @author Petra Halová on 26.10.17.
  */
 @Repository
 public class CompetitionDaoImpl extends BaseDaoImpl<Competition> implements CompetitionDao{

diff --git a/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDao.java b/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDao.java
@@ -3,7 +3,7 @@
 import cz.fi.muni.pa165.entity.SportEvent;
 
 /**
- * Created by lenoch on 26.10.17.
+ * @author Petra Halová on 26.10.17.
  */
 public interface SportEventDao extends BaseDao<SportEvent> {
 }
diff --git a/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDaoImpl.java b/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDaoImpl.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 /**
- * Created by lenoch on 26.10.17.
+ * @author Petra Halová on 26.10.17.
  */
 @Repository
 public class SportEventDaoImpl extends BaseDaoImpl<SportEvent> implements SportEventDao {

diff --git a/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java b/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java
@@ -8,12 +8,13 @@
 import java.util.Set;
 
 /**
- * Created by lenoch on 26.10.17.
+ * @author Petra Halová on 26.10.17.
  */
 
 @Entity
 @Table(name = "SPORT_EVENT_TABLE")
 public class SportEvent extends BaseEntity{
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;

diff --git a/persistence/src/main/main.iml b/persistence/src/main/main.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="jpa" name="JPA">
+      <configuration>
+        <setting name="validation-enabled" value="true" />
+        <setting name="provider-name" value="" />
+        <datasource-mapping />
+        <deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/resources/META-INF/persistence.xml" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
diff --git a/persistence/src/test/java/cz/fi/muni/pa165/dao/SportDaoImplTest.java b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportDaoImplTest.java
@@ -1,5 +1,8 @@
 package cz.fi.muni.pa165.dao;
 
+/**
+ * @author Petra Halová
+ */
 public class SportDaoImplTest extends BaseDaoImplTest {
 
 }
diff --git a/persistence/src/test/test.iml b/persistence/src/test/test.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="main" />
+  </component>
+</module>