From fb91356b7777dfa5b6088bcc3a48b43924c1c0fd Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Thu, 3 Sep 2026 14:35:10 +0200 Subject: build: apply Spotless plugin (#293) --- .../oshelper/services/DefaultStudienService.java | 94 ++++++++++++---------- 1 file changed, 50 insertions(+), 44 deletions(-) (limited to 'src/main/java/dev/dnpm/oshelper/services/DefaultStudienService.java') diff --git a/src/main/java/dev/dnpm/oshelper/services/DefaultStudienService.java b/src/main/java/dev/dnpm/oshelper/services/DefaultStudienService.java index 463c1e9..2366c10 100644 --- a/src/main/java/dev/dnpm/oshelper/services/DefaultStudienService.java +++ b/src/main/java/dev/dnpm/oshelper/services/DefaultStudienService.java @@ -20,11 +20,10 @@ package dev.dnpm.oshelper.services; import dev.dnpm.oshelper.dto.Studie; -import org.springframework.jdbc.core.JdbcTemplate; - -import javax.sql.DataSource; import java.util.List; import java.util.stream.Collectors; +import javax.sql.DataSource; +import org.springframework.jdbc.core.JdbcTemplate; /** * Standardimplementierung zum Ermitteln von Studien @@ -33,65 +32,72 @@ import java.util.stream.Collectors; */ public class DefaultStudienService implements StudienService { - private final JdbcTemplate jdbcTemplate; + private final JdbcTemplate jdbcTemplate; - public DefaultStudienService(final DataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); - } + public DefaultStudienService(final DataSource dataSource) { + this.jdbcTemplate = new JdbcTemplate(dataSource); + } - @Override - public List findAll() { - var sql = "SELECT pcc.name, pcv.version_number, TRIM(studie.studien_nummer) AS studien_nummer, studie.startdatum, studie.endedatum, pcve.code, pcve.shortdesc, pcve.description, studie.aktiv FROM studie " - + "LEFT JOIN category_entry ce ON ce.version_entry_id = studie.property_version_entry " - + "LEFT JOIN property_catalogue_category pcc ON pcc.id = ce.category_id " - + "JOIN property_catalogue_version_entry pcve ON pcve.id = studie.property_version_entry " - + "JOIN property_catalogue_version pcv ON pcv.id = pcve.property_version_id " - + "JOIN property_catalogue pc ON pc.id = pcv.datacatalog_id " - + "WHERE pc.name = 'OS.Studien'" - + "ORDER BY TRIM(studie.studien_nummer)"; + @Override + public List findAll() { + var sql = + "SELECT pcc.name, pcv.version_number, TRIM(studie.studien_nummer) AS studien_nummer, studie.startdatum, studie.endedatum, pcve.code, pcve.shortdesc, pcve.description, studie.aktiv FROM studie " + + "LEFT JOIN category_entry ce ON ce.version_entry_id = studie.property_version_entry " + + "LEFT JOIN property_catalogue_category pcc ON pcc.id = ce.category_id " + + "JOIN property_catalogue_version_entry pcve ON pcve.id = studie.property_version_entry " + + "JOIN property_catalogue_version pcv ON pcv.id = pcve.property_version_id " + + "JOIN property_catalogue pc ON pc.id = pcv.datacatalog_id " + + "WHERE pc.name = 'OS.Studien'" + + "ORDER BY TRIM(studie.studien_nummer)"; - return this.jdbcTemplate.query(sql, (resultSet, i) -> new Studie( + return this.jdbcTemplate.query( + sql, + (resultSet, i) -> + new Studie( resultSet.getString("name"), resultSet.getInt("version_number"), resultSet.getString("code"), resultSet.getString("studien_nummer"), resultSet.getString("shortdesc"), resultSet.getString("description"), - resultSet.getBoolean("aktiv") - )); - } + resultSet.getBoolean("aktiv"))); + } - @Override - public List findByQuery(String query) { - var sql = "SELECT pcc.name, pcv.version_number, TRIM(studie.studien_nummer) AS studien_nummer, studie.startdatum, studie.endedatum, pcve.code, pcve.shortdesc, pcve.description, studie.aktiv FROM studie " - + "LEFT JOIN category_entry ce ON ce.version_entry_id = studie.property_version_entry " - + "LEFT JOIN property_catalogue_category pcc ON pcc.id = ce.category_id " - + "JOIN property_catalogue_version_entry pcve ON pcve.id = studie.property_version_entry " - + "JOIN property_catalogue_version pcv ON pcv.id = pcve.property_version_id " - + "JOIN property_catalogue pc ON pc.id = pcv.datacatalog_id " - + "WHERE pc.name = 'OS.Studien' AND (pcve.shortdesc LIKE ? OR pcve.description LIKE ? OR studie.studien_nummer LIKE ?)" - + "ORDER BY TRIM(studie.studien_nummer)"; + @Override + public List findByQuery(String query) { + var sql = + "SELECT pcc.name, pcv.version_number, TRIM(studie.studien_nummer) AS studien_nummer, studie.startdatum, studie.endedatum, pcve.code, pcve.shortdesc, pcve.description, studie.aktiv FROM studie " + + "LEFT JOIN category_entry ce ON ce.version_entry_id = studie.property_version_entry " + + "LEFT JOIN property_catalogue_category pcc ON pcc.id = ce.category_id " + + "JOIN property_catalogue_version_entry pcve ON pcve.id = studie.property_version_entry " + + "JOIN property_catalogue_version pcv ON pcv.id = pcve.property_version_id " + + "JOIN property_catalogue pc ON pc.id = pcv.datacatalog_id " + + "WHERE pc.name = 'OS.Studien' AND (pcve.shortdesc LIKE ? OR pcve.description LIKE ? OR studie.studien_nummer LIKE ?)" + + "ORDER BY TRIM(studie.studien_nummer)"; - var like = String.format("%%%s%%", query); + var like = String.format("%%%s%%", query); - return this.jdbcTemplate.query(sql, new Object[]{like, like, like}, (resultSet, i) -> new Studie( + return this.jdbcTemplate.query( + sql, + new Object[] {like, like, like}, + (resultSet, i) -> + new Studie( resultSet.getString("name"), resultSet.getInt("version_number"), resultSet.getString("code"), resultSet.getString("studien_nummer"), resultSet.getString("shortdesc"), resultSet.getString("description"), - resultSet.getBoolean("aktiv") - )); - } + resultSet.getBoolean("aktiv"))); + } - @Override - public List findActive() { - return findAll().stream().filter(Studie::isActive).collect(Collectors.toList()); - } + @Override + public List findActive() { + return findAll().stream().filter(Studie::isActive).collect(Collectors.toList()); + } - @Override - public List findActiveByQuery(String query) { - return findByQuery(query).stream().filter(Studie::isActive).collect(Collectors.toList()); - } + @Override + public List findActiveByQuery(String query) { + return findByQuery(query).stream().filter(Studie::isActive).collect(Collectors.toList()); + } } -- cgit v1.2.3