Skip to content
Snippets Groups Projects
Commit a81162e6 authored by Martin Schmollinger's avatar Martin Schmollinger
Browse files

Added logging

parent 6a5a1cdc
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,8 @@ package io.ds.myaktion; ...@@ -2,6 +2,8 @@ package io.ds.myaktion;
import java.util.List; import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner; import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
...@@ -22,14 +24,16 @@ public class MyaktionApplication { ...@@ -22,14 +24,16 @@ public class MyaktionApplication {
@Autowired @Autowired
private DonationService donationService; private DonationService donationService;
private Logger log = LoggerFactory.getLogger(MyaktionApplication.class);
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(MyaktionApplication.class, args); SpringApplication.run(MyaktionApplication.class, args);
} }
@Bean @Bean
CommandLineRunner initLoggerBean() { CommandLineRunner initLoggerBean() {
return (args) -> { return (args)->{
System.out.println("Create sample data!"); log.info("Adding Sample data to DB");
Account account1 = new Account(); Account account1 = new Account();
account1.setName("Jogi Löw"); account1.setName("Jogi Löw");
account1.setNameOfBank("KSK Freiburg"); account1.setNameOfBank("KSK Freiburg");
...@@ -60,8 +64,8 @@ public class MyaktionApplication { ...@@ -60,8 +64,8 @@ public class MyaktionApplication {
donation1.setCampaign(campaign1); donation1.setCampaign(campaign1);
campaign1.addDonation(donation1); campaign1.addDonation(donation1);
// Write campaign to DB //Write campaign to DB
System.out.println("Add campaign to DB"); log.debug("Add campaign to DB");
Campaign savedCampaign = campaignService.addCampaign(campaign1); Campaign savedCampaign = campaignService.addCampaign(campaign1);
// Add another donation to campaign // Add another donation to campaign
...@@ -71,15 +75,14 @@ public class MyaktionApplication { ...@@ -71,15 +75,14 @@ public class MyaktionApplication {
donation2.setDonorName("Hansi Flick"); donation2.setDonorName("Hansi Flick");
donation2.setReceiptRequested(true); donation2.setReceiptRequested(true);
donation2.setStatus(Donation.Status.IN_PROCESS); donation2.setStatus(Donation.Status.IN_PROCESS);
System.out.println("Read all campaigns");
log.debug("Add donation of campaign to DB");
System.out.println("Add donation of campaign to DB");
donationService.addDonation(donation2, savedCampaign.getId()); donationService.addDonation(donation2, savedCampaign.getId());
// Read data from db and print to screen // Read data from db and print to screen
List<Campaign> campaigns = campaignService.getCampaigns(); List<Campaign> campaigns = campaignService.getCampaigns();
System.out.println("Read all campaigns again"); log.debug("Read all campaigns again");
System.out.println(campaigns.toString()); log.trace(campaigns.toString());
}; };
} }
} }
...@@ -2,6 +2,8 @@ package io.ds.myaktion.services; ...@@ -2,6 +2,8 @@ package io.ds.myaktion.services;
import java.util.List; import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -13,12 +15,17 @@ public class CampaignService { ...@@ -13,12 +15,17 @@ public class CampaignService {
@Autowired @Autowired
private CampaignRepository campaignRepository; private CampaignRepository campaignRepository;
private Logger log = LoggerFactory.getLogger(CampaignService.class);
public Campaign addCampaign(Campaign campaign) { public Campaign addCampaign(Campaign campaign) {
Campaign savedCampaign = campaignRepository.save(campaign); Campaign savedCampaign = campaignRepository.save(campaign);
return savedCampaign; log.trace("Saved campaign: "+ savedCampaign.toString());
return savedCampaign;
} }
public List<Campaign> getCampaigns() { public List<Campaign> getCampaigns() {
return campaignRepository.findAll(); List<Campaign> campaigns = campaignRepository.findAll();
log.trace("Read campaigns: "+ campaigns.toString());
return campaigns;
} }
} }
...@@ -2,6 +2,8 @@ package io.ds.myaktion.services; ...@@ -2,6 +2,8 @@ package io.ds.myaktion.services;
import java.util.Optional; import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -20,14 +22,19 @@ public class DonationService { ...@@ -20,14 +22,19 @@ public class DonationService {
@Autowired @Autowired
private DonationRepository donationRepository; private DonationRepository donationRepository;
private Logger log = LoggerFactory.getLogger(DonationService.class);
public Donation addDonation(Donation donation, Long campaignId) { public Donation addDonation(Donation donation, Long campaignId) {
Optional<Campaign> result = campaignRepository.findById(campaignId); Optional<Campaign> result = campaignRepository.findById(campaignId);
if (result.isEmpty()) if (result.isEmpty()) {
throw new CampaignNotFoundException("Campaign not found!"); CampaignNotFoundException e = new CampaignNotFoundException("Campaign not found!");
log.error(e.getMessage(), e);
throw e;
}
Campaign existingCampaign = result.get(); Campaign existingCampaign = result.get();
donation.setCampaign(existingCampaign); donation.setCampaign(existingCampaign);
Donation savedDonation = donationRepository.save(donation); Donation savedDonation = donationRepository.save(donation);
System.out.println("Saved Donation: " + savedDonation.toString()); log.trace("Saved Donation: "+savedDonation.toString());
return savedDonation; return savedDonation;
} }
} }
...@@ -2,3 +2,6 @@ ...@@ -2,3 +2,6 @@
spring.h2.console.enabled=true spring.h2.console.enabled=true
spring.datasource.url=jdbc:h2:mem:testdb spring.datasource.url=jdbc:h2:mem:testdb
spring.datasource.generate-unique-name=false spring.datasource.generate-unique-name=false
#Set logging level for package io.ds.myaktion
logging.level.io.ds.myaktion=TRACE
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment