From d6a363139e6e25a2ebc4f58a3f5cd60c850b6b43 Mon Sep 17 00:00:00 2001
From: dre0059 <eliska.dreveniakova@vsb.cz>
Date: Fri, 7 Mar 2025 16:19:23 +0100
Subject: [PATCH] Oprava - local history
---
.../repository/DocumentRepository.java | 3 ---
.../service/DocumentService.java | 25 -------------------
2 files changed, 28 deletions(-)
diff --git a/src/main/java/com/dre0059/articleprocessor/repository/DocumentRepository.java b/src/main/java/com/dre0059/articleprocessor/repository/DocumentRepository.java
index 849fe54..306c37f 100644
--- a/src/main/java/com/dre0059/articleprocessor/repository/DocumentRepository.java
+++ b/src/main/java/com/dre0059/articleprocessor/repository/DocumentRepository.java
@@ -32,8 +32,6 @@ public interface DocumentRepository extends JpaRepository<Dokument, Long> {
)
Optional<Dokument> findByTitleAndAuthorsIn(@Param("title") String title, @Param("lastNames") List<String> lastNames);
-<<<<<<< HEAD
-=======
@Query(
"""
@@ -44,7 +42,6 @@ public interface DocumentRepository extends JpaRepository<Dokument, Long> {
)
List<Dokument> getReferencedDocumentsById(@Param("id") Long id);
->>>>>>> 9e1c76c (Categories of PDF initialized)
}
/*
diff --git a/src/main/java/com/dre0059/articleprocessor/service/DocumentService.java b/src/main/java/com/dre0059/articleprocessor/service/DocumentService.java
index 24292a5..e32a09d 100644
--- a/src/main/java/com/dre0059/articleprocessor/service/DocumentService.java
+++ b/src/main/java/com/dre0059/articleprocessor/service/DocumentService.java
@@ -1,36 +1,12 @@
package com.dre0059.articleprocessor.service;
-<<<<<<< HEAD
-=======
import com.dre0059.articleprocessor.dto.DocumentDto;
import com.dre0059.articleprocessor.dto.SimpleDocumentDto;
import com.dre0059.articleprocessor.mapper.DocumentMapper;
->>>>>>> 9e1c76c (Categories of PDF initialized)
import com.dre0059.articleprocessor.repository.*;
import com.dre0059.articleprocessor.model.*;
import jakarta.transaction.Transactional;
-<<<<<<< HEAD
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-@Service
-public class DocumentService {
- @Autowired
- private DocumentRepository documentRepository;
- @Autowired
- private AuthorRepository authorRepository;
-
- @Transactional
- public Dokument saveDocument(Dokument document) {
- Dokument dok = new Dokument();
- return dok;
- }
-=======
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -69,5 +45,4 @@ public class DocumentService {
Dokument dok = new Dokument();
return dok;
}
->>>>>>> 9e1c76c (Categories of PDF initialized)
}
--
GitLab