diff --git a/pom.xml b/pom.xml index 42468b1..6640418 100644 --- a/pom.xml +++ b/pom.xml @@ -92,6 +92,11 @@ 3.4.1 test + + log4j + log4j + 1.2.17 + diff --git a/src/main/java/com/apside/assistDbBackend/controller/InfoColumnController.java b/src/main/java/com/apside/assistDbBackend/controller/InfoColumnController.java index 5166afa..ea49385 100644 --- a/src/main/java/com/apside/assistDbBackend/controller/InfoColumnController.java +++ b/src/main/java/com/apside/assistDbBackend/controller/InfoColumnController.java @@ -2,6 +2,7 @@ package com.apside.assistDbBackend.controller; import com.apside.assistDbBackend.model.InfoColumn; import com.apside.assistDbBackend.service.InfoColumnService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -12,6 +13,7 @@ import java.util.Optional; @RestController @RequestMapping("/api") +@Slf4j public class InfoColumnController { @Autowired private InfoColumnService infoColumnService; @@ -23,6 +25,7 @@ public class InfoColumnController { */ @GetMapping("/column/{id}") public InfoColumn getColumn(@PathVariable("id") final Long id) { + log.debug("Start GetColumn - Get Request - with id: " + id); Optional infoColumn = infoColumnService.getColumn(id); if(infoColumn.isPresent()) { return infoColumn.get(); @@ -37,6 +40,7 @@ public class InfoColumnController { */ @GetMapping("/columns/all") public Iterable getColumns() { + log.debug("Start getColumns - Get Request"); return infoColumnService.getAllColumns(); } @@ -46,16 +50,20 @@ public class InfoColumnController { */ @GetMapping("/columns/{schema}/{table}") public Iterable getSelectedColumns(@PathVariable("schema") final String schema, @PathVariable("table") final String table) { + log.debug("Start GetSelectedColumns - Get Request - with schema: {}, table: {}", schema, table); return infoColumnService.getSelectedColumns(table, schema); } @GetMapping("/columns/{firstSchema}/{secondSchema}/{firstTable}/{secondTable}") public Iterable getColumnsForJoin(@PathVariable("firstTable") final String firstTable, @PathVariable("secondTable") final String secondTable, @PathVariable("firstSchema") final String firstSchema, @PathVariable("secondSchema") final String secondSchema) { + log.debug("Start GetColumnsForJoin - Get Request - with firstTable: {}, secondTable: {}, firstSchema: {}, secondSchema: {}", firstTable, secondTable, firstSchema, secondSchema); + return infoColumnService.getColumnsForJoin(firstTable, secondTable, firstSchema, secondSchema); } @GetMapping("/columns/joins") public Iterable getColumnsForJoinTwo(@RequestParam("tables") String tables, @RequestParam("schemas") String schemas) { + log.debug("Start GetColumnsForJoinTwo - Get Request - with tables: {}, schemas: {}", tables, schemas); List tablesList = new ArrayList<>(Arrays.asList(tables.split(","))); List schemasList = new ArrayList<>(Arrays.asList(schemas.split(","))); return infoColumnService.getColumnsForJoinTwo(tablesList, schemasList); @@ -63,6 +71,7 @@ public class InfoColumnController { @DeleteMapping("/columns/deleteAll") public void deleteAllColumns() { + log.debug("DeleteAllColumns called"); infoColumnService.deleteAllColumn(); } diff --git a/src/main/java/com/apside/assistDbBackend/controller/InfoTableController.java b/src/main/java/com/apside/assistDbBackend/controller/InfoTableController.java index 97d97b5..32a934d 100644 --- a/src/main/java/com/apside/assistDbBackend/controller/InfoTableController.java +++ b/src/main/java/com/apside/assistDbBackend/controller/InfoTableController.java @@ -2,13 +2,16 @@ package com.apside.assistDbBackend.controller; import com.apside.assistDbBackend.service.InfoTableService; import com.apside.assistDbBackend.model.InfoTable; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.*; import java.util.Optional; @RestController @RequestMapping("/api") +@Slf4j public class InfoTableController { @Autowired private InfoTableService infoTableService; @@ -21,6 +24,7 @@ public class InfoTableController { */ @GetMapping("/table/{id}") public InfoTable getTable(@PathVariable("id") final Long id) { + log.debug("Start getTable - Get Request - with id: " + id); Optional infoTable = infoTableService.getTable(id); if(infoTable.isPresent()) { return infoTable.get(); @@ -44,6 +48,7 @@ public class InfoTableController { */ @GetMapping("/schemas/all") public Iterable getSchemas() { + log.debug("Start getSchemas - Get Request"); return infoTableService.getAllSchemas(); } @@ -52,17 +57,20 @@ public class InfoTableController { * @return - An Iterable object of InfoTable full filled */ @GetMapping("/tables/{schema}") - public Iterable getTables(@PathVariable("schema") final String schema) { + public Iterable getTablesBySchemaName(@PathVariable("schema") final String schema) { + log.debug("Start getTablesBySchemaName - Get Request - with schema: {}", schema); return infoTableService.getTablesBySchemaName(schema); } @GetMapping("/schemas/{table}") public Iterable getSchemaByTableName(@PathVariable("table") final String table) { + log.debug("Start getSchemaByTableName - Get Request - with table: {}", table); return infoTableService.getSchemaByTableName(table); } @DeleteMapping("/tables/deleteAll") public void deleteAllTables() { + log.debug("DeleteAllTables called"); infoTableService.deleteAllTable(); } diff --git a/src/main/java/com/apside/assistDbBackend/controller/LinkInfoController.java b/src/main/java/com/apside/assistDbBackend/controller/LinkInfoController.java index 307664d..06927d5 100644 --- a/src/main/java/com/apside/assistDbBackend/controller/LinkInfoController.java +++ b/src/main/java/com/apside/assistDbBackend/controller/LinkInfoController.java @@ -2,13 +2,15 @@ package com.apside.assistDbBackend.controller; import com.apside.assistDbBackend.model.LinkInfo; import com.apside.assistDbBackend.service.LinkInfoService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.*; import java.util.Optional; +@RestController +@RequestMapping("/api") +@Slf4j public class LinkInfoController { @Autowired @@ -22,6 +24,7 @@ public class LinkInfoController { */ @GetMapping("/link/{id}") public LinkInfo getLinkInfo(@PathVariable("id") final Long id) { + log.debug("Start getLinkInfo - Get Request - with id: " + id); Optional linkInfo = linkInfoService.getLinkInfo(id); if(linkInfo.isPresent()) { return linkInfo.get(); @@ -36,11 +39,13 @@ public class LinkInfoController { */ @GetMapping("/links/all") public Iterable getLinksInfos() { + log.debug("Start getLinksInfos - Get Request"); return linkInfoService.getAllLinksInfos(); } @DeleteMapping("/links/deleteAll") public void deleteAllLinks() { + log.debug("DeleteAllLinks called"); linkInfoService.deleteAllLinks(); } } diff --git a/src/main/java/com/apside/assistDbBackend/controller/ResetDataController.java b/src/main/java/com/apside/assistDbBackend/controller/ResetDataController.java index e560757..1efe24a 100644 --- a/src/main/java/com/apside/assistDbBackend/controller/ResetDataController.java +++ b/src/main/java/com/apside/assistDbBackend/controller/ResetDataController.java @@ -3,11 +3,13 @@ package com.apside.assistDbBackend.controller; import java.io.IOException; import com.apside.assistDbBackend.service.ResetDataService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api") +@Slf4j public class ResetDataController { @Autowired private ResetDataService resetDataService; @@ -15,6 +17,7 @@ public class ResetDataController { @PostMapping("/reset") public void resetData() throws IOException { + log.debug("ResetData called"); resetDataService.deleteEverything(); resetDataService.insertEverything(); resetDataService.checkAndInsertLinks(); diff --git a/src/main/java/com/apside/assistDbBackend/controller/ScriptController.java b/src/main/java/com/apside/assistDbBackend/controller/ScriptController.java index 7ed6ee8..c91fe9e 100644 --- a/src/main/java/com/apside/assistDbBackend/controller/ScriptController.java +++ b/src/main/java/com/apside/assistDbBackend/controller/ScriptController.java @@ -3,8 +3,10 @@ package com.apside.assistDbBackend.controller; import com.apside.assistDbBackend.model.LinkScriptTag; import com.apside.assistDbBackend.model.Script; import com.apside.assistDbBackend.service.ScriptsService; +import lombok.extern.slf4j.Slf4j; import org.eclipse.jgit.api.errors.GitAPIException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.*; import java.io.IOException; @@ -13,34 +15,40 @@ import java.util.List; @RestController @RequestMapping("/api") +@Slf4j public class ScriptController { @Autowired ScriptsService scriptsService; @GetMapping("/scripts") public List