From 5f064111d0a1013eb77c132adb981ed925c0bacd Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Fri, 10 May 2024 10:26:27 +0200 Subject: [PATCH] refactor: Extrahiere SQLQuery Erzeugung --- .../java/DNPM/analyzer/Merkmalskatalog.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/DNPM/analyzer/Merkmalskatalog.java b/src/main/java/DNPM/analyzer/Merkmalskatalog.java index 071a559..275fccd 100644 --- a/src/main/java/DNPM/analyzer/Merkmalskatalog.java +++ b/src/main/java/DNPM/analyzer/Merkmalskatalog.java @@ -66,17 +66,7 @@ public class Merkmalskatalog extends BackendService { String[] spaltenArray = spalten.get().split("\\s*,\\s*"); try { - SessionFactory sessionFactory = onkostarApi.getSessionFactory(); - Session session = sessionFactory.getCurrentSession(); - - String sql = "SELECT p.id, p.code, p.shortdesc, p.description, p.note, p.synonyms " - + "FROM property_catalogue " - + "LEFT JOIN property_catalogue_version ON property_catalogue_version.datacatalog_id = property_catalogue.id " - + "LEFT JOIN property_catalogue_version_entry p ON p.property_version_id = property_catalogue_version.id " - + "WHERE name = '" + merkmalskatalog.get() + "' AND aktiv = 1 " - + "ORDER BY position ASC"; - - SQLQuery query = session.createSQLQuery(sql); + SQLQuery query = getSqlQuery(merkmalskatalog.get()); for (String s : spaltenArray) { query.addScalar(s, StandardBasicTypes.STRING); @@ -90,4 +80,18 @@ public class Merkmalskatalog extends BackendService { return null; } } + + private SQLQuery getSqlQuery(String merkmalskatalog) { + SessionFactory sessionFactory = onkostarApi.getSessionFactory(); + Session session = sessionFactory.getCurrentSession(); + + String sql = "SELECT p.id, p.code, p.shortdesc, p.description, p.note, p.synonyms " + + "FROM property_catalogue " + + "LEFT JOIN property_catalogue_version ON property_catalogue_version.datacatalog_id = property_catalogue.id " + + "LEFT JOIN property_catalogue_version_entry p ON p.property_version_id = property_catalogue_version.id " + + "WHERE name = '" + merkmalskatalog + "' AND aktiv = 1 " + + "ORDER BY position ASC"; + + return session.createSQLQuery(sql); + } }