Several bugfixes

sci-publications/src/main/java/org/scientificcms/publications/JournalRepository.java

@@ -46,8 +46,10 @@ public class JournalRepository extends AbstractEntityRepository<Long, Journal> {
 
     @Override
     protected void initNewEntity(final Journal entity) {
+        if (entity.getUuid() == null) {
             entity.setUuid(UUID.randomUUID().toString());
         }
+    }
 
     @Transactional(Transactional.TxType.REQUIRED)
     public Optional<Journal> findByUuid(final String uuid) {

sci-publications/src/main/java/org/scientificcms/publications/PublicationRepository.java

@@ -53,8 +53,9 @@ public class PublicationRepository
 
     @Override
     public void initNewEntity(final Publication entity) {
-        final String uuid = UUID.randomUUID().toString();
+        if (entity.getUuid() == null) {
-        entity.setUuid(uuid);
+            entity.setUuid(UUID.randomUUID().toString());
+        }
     }
 
     @Transactional(Transactional.TxType.REQUIRED)

sci-publications/src/main/java/org/scientificcms/publications/PublicationWithPublisherRepository.java

@@ -52,8 +52,10 @@ public class PublicationWithPublisherRepository
 
     @Override
     public void initNewEntity(final PublicationWithPublisher entity) {
+        if (entity.getUuid() == null) {
             publicationRepository.initNewEntity(entity);
         }
+    }
 
     @Transactional(Transactional.TxType.REQUIRED)
     public List<PublicationWithPublisher> findByPublisher(

sci-publications/src/main/java/org/scientificcms/publications/PublisherRepository.java

@@ -47,8 +47,10 @@ public class PublisherRepository
 
     @Override
     protected void initNewEntity(final Publisher entity) {
+        if (entity.getUuid() == null) {
             entity.setUuid(UUID.randomUUID().toString());
         }
+    }
 
     @Transactional(Transactional.TxType.REQUIRED)
     public Optional<Publisher> findByUuid(final String uuid) {

sci-publications/src/main/java/org/scientificcms/publications/SeriesRepository.java

@@ -45,8 +45,10 @@ public class SeriesRepository
 
     @Override
     public void initNewEntity(final Series entity) {
+        if (entity.getUuid() == null) {
             entity.setUuid(UUID.randomUUID().toString());
         }
+    }
 
     @Transactional(Transactional.TxType.REQUIRED)
     public Optional<Series> findByUuid(final String uuid) {

sci-types-department/src/main/java/org/scientificcms/contenttypes/scidepartment/ContactRepository.java

@@ -46,8 +46,10 @@ public class ContactRepository
 
     @Override
     public void initNewEntity(final Contact contact) {
+        if (contact.getUuid() == null) {
             contact.setUuid(UUID.randomUUID().toString());
         }
+    }
 
     @Transactional(Transactional.TxType.REQUIRED)
     public Optional<Contact> findByUuid(final String uuid) {

sci-types-department/src/main/java/org/scientificcms/contenttypes/scidepartment/DepartmentProjectRepository.java

@@ -46,8 +46,10 @@ public class DepartmentProjectRepository
 
     @Override
     public void initNewEntity(final DepartmentProject project) {
+        if (project.getUuid() == null) {
             project.setUuid(UUID.randomUUID().toString());
         }
+    }
 
     @Transactional(Transactional.TxType.REQUIRED)
     public Optional<DepartmentProject> findByUuid(final String uuid) {

sci-types-department/src/main/java/org/scientificcms/contenttypes/scidepartment/MembershipRepository.java

@@ -46,8 +46,10 @@ public class MembershipRepository
 
     @Override
     public void initNewEntity(final Membership membership) {
+        if (membership.getUuid() == null) {
             membership.setUuid(UUID.randomUUID().toString());
         }
+    }
 
     @Transactional(Transactional.TxType.REQUIRED)
     public Optional<Membership> findByUuid(final String uuid) {

sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ContactRepository.java

@@ -46,19 +46,22 @@ public class ContactRepository
 
     @Override
     public void initNewEntity(final Contact contact) {
+        if (contact.getUuid() == null) {
             contact.setUuid(UUID.randomUUID().toString());
         }
+    }
 
     @Transactional(Transactional.TxType.REQUIRED)
     public Optional<Contact> findByUuid(final String uuid) {
         try {
             return Optional.of(
                 getEntityManager()
-            .createNamedQuery("SciProjectContact.findByUuid", Contact.class)
+                    .createNamedQuery("SciProjectContact.findByUuid",
+                                      Contact.class)
                     .setParameter("uuid", uuid)
                     .getSingleResult()
             );
-       } catch(NoResultException ex) {
+        } catch (NoResultException ex) {
             return Optional.empty();
         }
     }