From 1fbd337c22cd0810b5b6fe84cb0b9a7769ca5474 Mon Sep 17 00:00:00 2001 From: Francesco Date: Tue, 7 Nov 2023 15:50:01 +0100 Subject: [PATCH] More 'dbAdmin' renaming --- .../external/controller/DataExportController.java | 4 ++-- .../external/controller/FileDownloadController.java | 6 +++--- .../external/controller/GlobalController.java | 10 +++++----- .../controller/rest/AutocompleteController.java | 4 ++-- .../external/dbmapping/SnapAdminRepository.java | 4 ++-- .../external/dbmapping/query/DbQueryOutputField.java | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/DataExportController.java b/src/main/java/tech/ailef/snapadmin/external/controller/DataExportController.java index d4ef3f5..30c3325 100644 --- a/src/main/java/tech/ailef/snapadmin/external/controller/DataExportController.java +++ b/src/main/java/tech/ailef/snapadmin/external/controller/DataExportController.java @@ -76,7 +76,7 @@ public class DataExportController { private static final Logger logger = LoggerFactory.getLogger(DataExportFormat.class); @Autowired - private SnapAdmin dbAdmin; + private SnapAdmin snapAdmin; @Autowired private SnapAdminRepository repository; @@ -131,7 +131,7 @@ public class DataExportController { @RequestParam MultiValueMap otherParams) { if (raw == null) raw = false; - DbObjectSchema schema = dbAdmin.findSchemaByClassName(className); + DbObjectSchema schema = snapAdmin.findSchemaByClassName(className); if (!schema.isExportEnabled()) { throw new SnapAdminException("Export is not enabled for this table: " + schema.getTableName()); diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/FileDownloadController.java b/src/main/java/tech/ailef/snapadmin/external/controller/FileDownloadController.java index 0efb32b..e719130 100644 --- a/src/main/java/tech/ailef/snapadmin/external/controller/FileDownloadController.java +++ b/src/main/java/tech/ailef/snapadmin/external/controller/FileDownloadController.java @@ -53,7 +53,7 @@ public class FileDownloadController { private SnapAdminRepository repository; @Autowired - private SnapAdmin dbAdmin; + private SnapAdmin snapAdmin; /** @@ -68,7 +68,7 @@ public class FileDownloadController { public ResponseEntity serveImage(@PathVariable String className, @PathVariable String fieldName, @PathVariable String id) { - DbObjectSchema schema = dbAdmin.findSchemaByClassName(className); + DbObjectSchema schema = snapAdmin.findSchemaByClassName(className); Optional object = repository.findById(schema, id); @@ -99,7 +99,7 @@ public class FileDownloadController { public ResponseEntity serveFile(@PathVariable String className, @PathVariable String fieldName, @PathVariable String id) { - DbObjectSchema schema = dbAdmin.findSchemaByClassName(className); + DbObjectSchema schema = snapAdmin.findSchemaByClassName(className); Optional object = repository.findById(schema, id); diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java b/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java index f3fde7c..2166258 100644 --- a/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java +++ b/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java @@ -49,7 +49,7 @@ public class GlobalController { private UserConfiguration userConf; @Autowired - private SnapAdmin dbAdmin; + private SnapAdmin snapAdmin; @ExceptionHandler(SnapAdminException.class) public String handleException(Exception e, Model model, HttpServletResponse response) { @@ -58,7 +58,7 @@ public class GlobalController { model.addAttribute("message", e.getMessage()); model.addAttribute("snapadmin_userConf", userConf); model.addAttribute("snapadmin_baseUrl", getBaseUrl()); - model.addAttribute("snapadmin_version", dbAdmin.getVersion()); + model.addAttribute("snapadmin_version", snapAdmin.getVersion()); model.addAttribute("snapadmin_properties", props); return "other/error"; } @@ -70,7 +70,7 @@ public class GlobalController { model.addAttribute("message", e.getMessage()); model.addAttribute("snapadmin_userConf", userConf); model.addAttribute("snapadmin_baseUrl", getBaseUrl()); - model.addAttribute("snapadmin_version", dbAdmin.getVersion()); + model.addAttribute("snapadmin_version", snapAdmin.getVersion()); model.addAttribute("snapadmin_properties", props); response.setStatus(404); return "other/error"; @@ -78,7 +78,7 @@ public class GlobalController { @ModelAttribute("snapadmin_version") public String getVersion() { - return dbAdmin.getVersion(); + return snapAdmin.getVersion(); } /** @@ -128,7 +128,7 @@ public class GlobalController { @ModelAttribute("snapadmin_authenticated") public boolean isAuthenticated() { - return dbAdmin.isAuthenticated(); + return snapAdmin.isAuthenticated(); } } diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/rest/AutocompleteController.java b/src/main/java/tech/ailef/snapadmin/external/controller/rest/AutocompleteController.java index 55ea8a6..464c6e8 100644 --- a/src/main/java/tech/ailef/snapadmin/external/controller/rest/AutocompleteController.java +++ b/src/main/java/tech/ailef/snapadmin/external/controller/rest/AutocompleteController.java @@ -42,7 +42,7 @@ import tech.ailef.snapadmin.external.dto.AutocompleteSearchResult; @RequestMapping(value= {"/${snapadmin.baseUrl}/api/autocomplete", "/${snapadmin.baseUrl}/api/autocomplete/"}) public class AutocompleteController { @Autowired - private SnapAdmin dbAdmin; + private SnapAdmin snapAdmin; @Autowired private SnapAdminRepository repository; @@ -55,7 +55,7 @@ public class AutocompleteController { */ @GetMapping("/{className}") public ResponseEntity autocomplete(@PathVariable String className, @RequestParam String query) { - DbObjectSchema schema = dbAdmin.findSchemaByClassName(className); + DbObjectSchema schema = snapAdmin.findSchemaByClassName(className); List search = repository.search(schema, query) .stream().map(x -> new AutocompleteSearchResult(x)) diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/SnapAdminRepository.java b/src/main/java/tech/ailef/snapadmin/external/dbmapping/SnapAdminRepository.java index 64e6e69..ef79afc 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/SnapAdminRepository.java +++ b/src/main/java/tech/ailef/snapadmin/external/dbmapping/SnapAdminRepository.java @@ -66,7 +66,7 @@ public class SnapAdminRepository { private JdbcTemplate jdbcTemplate; @Autowired - private SnapAdmin dbAdmin; + private SnapAdmin snapAdmin; public SnapAdminRepository() { } @@ -304,7 +304,7 @@ public class SnapAdminRepository { Object o = rs.getObject(i + 1); String columnName = metaData.getColumnName(i + 1); String tableName = metaData.getTableName(i + 1); - DbQueryOutputField field = new DbQueryOutputField(columnName, tableName, dbAdmin); + DbQueryOutputField field = new DbQueryOutputField(columnName, tableName, snapAdmin); result.put(field, o); } diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryOutputField.java b/src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryOutputField.java index 96b5aca..7e44755 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryOutputField.java +++ b/src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryOutputField.java @@ -39,12 +39,12 @@ public class DbQueryOutputField { private DbQueryResultRow result; - public DbQueryOutputField(String name, String table, SnapAdmin dbAdmin) { + public DbQueryOutputField(String name, String table, SnapAdmin snapAdmin) { this.name = name; this.table = table; try { - DbObjectSchema schema = dbAdmin.findSchemaByTableName(table); + DbObjectSchema schema = snapAdmin.findSchemaByTableName(table); DbField dbField = schema.getFieldByName(name); this.dbField = dbField; } catch (SnapAdminException e) {