--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java 2016/02/03 15:13:55 2902 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java 2016/02/03 18:45:33 2903 @@ -15,6 +15,7 @@ import dk.daoas.adressevedligehold.beans.Address; import dk.daoas.adressevedligehold.beans.Address.AddressState; import dk.daoas.adressevedligehold.db.DatabaseLayerImplementation; +import dk.daoas.adressevedligehold.tasks.TaskLogger; import dk.daoas.adressevedligehold.util.DeduplicateHelper; import dk.daoas.adressevedligehold.util.MiscUtils; import dk.daoas.adressevedligehold.util.TimingHelper; @@ -28,6 +29,8 @@ public class AddressManager { + private TaskLogger logger = TaskLogger.getInstance(); + List
addressList; @@ -84,7 +87,7 @@ list.trimToSize(); } - System.out.println("AddressManager ready, elapsed " + timer.getElapsed() + "ms"); + logger.info("AddressManager ready, elapsed " + timer.getElapsed() + "ms"); } @@ -190,7 +193,7 @@ } public void writeBackChanges() { - System.out.println("Writing back changes"); + logger.info("Writing back changes"); TimingHelper timer = new TimingHelper(); List
updates = new ArrayList
(1024*1024); @@ -212,7 +215,7 @@ - System.out.println("Writeback done: elapsed " + timer.getElapsed() + "ms."); + logger.info("Writeback done: elapsed " + timer.getElapsed() + "ms."); } @@ -261,7 +264,7 @@ unknownStreets.put(entry.gadeid, entry.vejnavn); } - System.out.println("[Range] Ukendt gadeID " + entry); + logger.info("[Range] Ukendt gadeID " + entry); return; } @@ -301,7 +304,7 @@ private void updateAddress(Address addr, AddressSourceEntry entry) { if ( addr.distributor != null && addr.distributor.equals(entry.distributor) == false) { rejectedEntries.add(entry); - System.out.println("Afviser " + entry); + logger.info("Afviser " + entry); return; } @@ -323,7 +326,7 @@ } } } else { - System.out.println( "Double visit monday " + addr); + logger.info( "Double visit monday " + addr); } } @@ -345,7 +348,7 @@ } } } else { - System.out.println( "Double visit tuesday " + addr); + logger.info( "Double visit tuesday " + addr); } } @@ -365,7 +368,7 @@ } } } else { - System.out.println( "Double visit wednesday " + addr); + logger.info( "Double visit wednesday " + addr); } } @@ -387,7 +390,7 @@ } } } else { - System.out.println( "Double visit thursday " + addr); + logger.info( "Double visit thursday " + addr); } } @@ -408,7 +411,7 @@ } } } else { - System.out.println( "Double visit friday " + addr); + logger.info( "Double visit friday " + addr); } } @@ -430,7 +433,7 @@ } } } else { - System.out.println( "Double visit saturday " + addr); + logger.info( "Double visit saturday " + addr); } } @@ -451,7 +454,7 @@ } } } else { - System.out.println( "Double visit sunday " + addr); + logger.info( "Double visit sunday " + addr); } } @@ -503,7 +506,7 @@ - System.out.println("Opretter adresse ud fra " + entry); + logger.info("Opretter adresse ud fra " + entry); Address a = new Address(); a.state = AddressState.CREATED; @@ -617,11 +620,11 @@ bane = 204; break; default: - throw new RuntimeException("Ukendt distributor" + a.distributor); //Silence findBugs + throw new RuntimeException("Ukendt distributor: " + a.distributor); //Silence findBugs } if (bane == null) { - throw new RuntimeException("Ukendt bane for postnr" + a.postnr); + throw new RuntimeException("Ukendt bane for postnr: " + a.postnr); } if (a.dbkBane != bane) {