forked from sakaiproject/sakai
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SAK-44379 Move file conversion service to session factory (sakaiproje…
…ct#8637) * SAK-44379 Move file conversion service to session factory https://jira.sakaiproject.org/browse/SAK-44379 * remove session.close() Co-authored-by: Earle Nietzel <[email protected]>
- Loading branch information
1 parent
6e16ac4
commit 092ebe5
Showing
16 changed files
with
374 additions
and
187 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
...c/main/java/org/sakaiproject/content/api/persistence/FileConversionServiceRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package org.sakaiproject.content.api.persistence; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.sakaiproject.springframework.data.SpringCrudRepository; | ||
|
|
||
| public interface FileConversionServiceRepository extends SpringCrudRepository<FileConversionQueueItem, Long> { | ||
|
|
||
| List<FileConversionQueueItem> findByStatus(FileConversionQueueItem.Status status); | ||
| } |
31 changes: 0 additions & 31 deletions
31
.../main/java/org/sakaiproject/content/api/repository/FileConversionQueueItemRepository.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
109 changes: 109 additions & 0 deletions
109
kernel/api/src/main/java/org/sakaiproject/springframework/data/SpringCrudRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /** | ||
| * Copyright (c) 2003-2017 The Apereo Foundation | ||
| * | ||
| * Licensed under the Educational Community License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://opensource.org/licenses/ecl2 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.sakaiproject.springframework.data; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| /** | ||
| * This is modeled after Spring's CrudRepository. The idea here is using this api will | ||
| * make for an easier migration to spring-data in the future. | ||
| */ | ||
| public interface SpringCrudRepository<T, ID extends Serializable> extends Repository<T, ID> { | ||
|
|
||
| /** | ||
| * Returns the number of entities available. | ||
| * | ||
| * @return the number of entities | ||
| */ | ||
| long count(); | ||
|
|
||
| /** | ||
| * Deletes a given entity. | ||
| * | ||
| * @param entity | ||
| * @throws IllegalArgumentException in case the given entity is {@literal null}. | ||
| */ | ||
| void delete(T entity); | ||
|
|
||
| /** | ||
| * Deletes all entities managed by the repository. | ||
| */ | ||
| void deleteAll(); | ||
|
|
||
| /** | ||
| * Deletes the given entities. | ||
| */ | ||
| void deleteAll(Iterable<? extends T> entities); | ||
|
|
||
| /** | ||
| * Deletes the entity with the given id. | ||
| * | ||
| * @param id must not be {@literal null}. | ||
| * @throws IllegalArgumentException in case the given {@code id} is {@literal null} | ||
| */ | ||
| void deleteById(ID id); | ||
|
|
||
| /** | ||
| * Returns whether an entity with the given id exists. | ||
| * | ||
| * @param id must not be {@literal null}. | ||
| * @return true if an entity with the given id exists, {@literal false} otherwise | ||
| * @throws IllegalArgumentException if {@code id} is {@literal null} | ||
| */ | ||
| boolean existsById(ID id); | ||
|
|
||
| /** | ||
| * Returns all instances of the type. | ||
| * | ||
| * @return all entities | ||
| */ | ||
| Iterable<T> findAll(); | ||
|
|
||
| /** | ||
| * Returns all instances of the type T with the given IDs. | ||
| * | ||
| * @param ids | ||
| * @return | ||
| */ | ||
| Iterable<T> findAllById(Iterable<ID> ids); | ||
|
|
||
| /** | ||
| * Retrieves an entity by its id. | ||
| * | ||
| * @param id must not be {@literal null}. | ||
| * @return the entity with the given id or {@literal null} if none found | ||
| * @throws IllegalArgumentException if {@code id} is {@literal null} | ||
| */ | ||
| T findById(ID id); | ||
|
|
||
| /** | ||
| * Saves a given entity. Use the returned instance for further operations as the save operation might have changed the | ||
| * entity instance completely. | ||
| * | ||
| * @param entity | ||
| * @return the saved entity | ||
| */ | ||
| <S extends T> S save(S entity); | ||
|
|
||
| /** | ||
| * Saves all given entities. | ||
| * | ||
| * @param entities | ||
| * @return the saved entities | ||
| * @throws IllegalArgumentException in case the given entity is {@literal null}. | ||
| */ | ||
| <S extends T> Iterable<S> saveAll(Iterable<S> entities); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
...n/java/org/sakaiproject/content/impl/persistence/FileConversionServiceRepositoryImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package org.sakaiproject.content.impl.persistence; | ||
|
|
||
| import org.hibernate.Session; | ||
| import org.hibernate.criterion.Restrictions; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| import org.sakaiproject.content.api.persistence.FileConversionQueueItem; | ||
| import org.sakaiproject.content.api.persistence.FileConversionServiceRepository; | ||
| import org.sakaiproject.springframework.data.SpringCrudRepositoryImpl; | ||
|
|
||
| public class FileConversionServiceRepositoryImpl extends SpringCrudRepositoryImpl<FileConversionQueueItem, Long> implements FileConversionServiceRepository { | ||
|
|
||
| @Transactional | ||
| public List<FileConversionQueueItem> findByStatus(FileConversionQueueItem.Status status) { | ||
|
|
||
| Session session = sessionFactory.getCurrentSession(); | ||
| List<FileConversionQueueItem> items | ||
| = session.createCriteria(FileConversionQueueItem.class) | ||
| .add(Restrictions.eq("status", status)).list(); | ||
| return items; | ||
| } | ||
| } |
71 changes: 0 additions & 71 deletions
71
.../java/org/sakaiproject/content/impl/repository/FileConversionQueueItemRepositoryImpl.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.