From 970f62f44f6c502bf62f10f1ad8ef69bdd295bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Tue, 5 May 2020 20:23:17 +0200 Subject: [PATCH] add lambdas to logging API --- gradle.properties | 2 +- src/main/java/org/xbib/marc/label/BibliographicLevel.java | 2 +- .../java/org/xbib/marc/label/DescriptiveCatalogingForm.java | 2 +- src/main/java/org/xbib/marc/label/Encoding.java | 2 +- src/main/java/org/xbib/marc/label/EncodingLevel.java | 2 +- .../java/org/xbib/marc/label/MultipartResourceRecordLevel.java | 2 +- src/main/java/org/xbib/marc/label/RecordStatus.java | 2 +- src/main/java/org/xbib/marc/label/TypeOfControl.java | 2 +- src/main/java/org/xbib/marc/label/TypeOfRecord.java | 2 +- .../org/xbib/marc/transformer/field/MarcFieldTransformer.java | 3 +-- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index 52ad92a..9dfc534 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group = org.xbib name = marc -version = 2.2.0 +version = 2.2.1 # main xbib-content.version = 2.0.5 diff --git a/src/main/java/org/xbib/marc/label/BibliographicLevel.java b/src/main/java/org/xbib/marc/label/BibliographicLevel.java index a92fe16..0c70e10 100644 --- a/src/main/java/org/xbib/marc/label/BibliographicLevel.java +++ b/src/main/java/org/xbib/marc/label/BibliographicLevel.java @@ -114,7 +114,7 @@ public enum BibliographicLevel { case 's': return SERIAL; default: - logger.log(Level.FINEST, "unknown bibliographic level: " + ch); + logger.log(Level.FINEST, () -> "unknown bibliographic level: " + ch); return UNSPECIFIED; } } diff --git a/src/main/java/org/xbib/marc/label/DescriptiveCatalogingForm.java b/src/main/java/org/xbib/marc/label/DescriptiveCatalogingForm.java index e7b2ae7..9320721 100644 --- a/src/main/java/org/xbib/marc/label/DescriptiveCatalogingForm.java +++ b/src/main/java/org/xbib/marc/label/DescriptiveCatalogingForm.java @@ -81,7 +81,7 @@ public enum DescriptiveCatalogingForm { case 'u': return UNKNOWN; default: - logger.log(Level.FINEST, "unknown descriptive cataloging form: " + ch); + logger.log(Level.FINEST, () -> "unknown descriptive cataloging form: " + ch); return NON_ISBD; } } diff --git a/src/main/java/org/xbib/marc/label/Encoding.java b/src/main/java/org/xbib/marc/label/Encoding.java index 1f4a3e6..2530079 100644 --- a/src/main/java/org/xbib/marc/label/Encoding.java +++ b/src/main/java/org/xbib/marc/label/Encoding.java @@ -63,7 +63,7 @@ public enum Encoding { case 'a': return UCS_UNICODE; default: - logger.log(Level.FINEST, "unknown encoding: " + ch); + logger.log(Level.FINEST, () -> "unknown encoding: " + ch); return MARC8; } } diff --git a/src/main/java/org/xbib/marc/label/EncodingLevel.java b/src/main/java/org/xbib/marc/label/EncodingLevel.java index af734f7..83f4ec9 100644 --- a/src/main/java/org/xbib/marc/label/EncodingLevel.java +++ b/src/main/java/org/xbib/marc/label/EncodingLevel.java @@ -126,7 +126,7 @@ public enum EncodingLevel { case 'z': return NOT_APPLICABLE; default: - logger.log(Level.FINEST, "unknown encoding level " + ch); + logger.log(Level.FINEST, () -> "unknown encoding level " + ch); return FULL; } } diff --git a/src/main/java/org/xbib/marc/label/MultipartResourceRecordLevel.java b/src/main/java/org/xbib/marc/label/MultipartResourceRecordLevel.java index 9296fd5..44ddc69 100644 --- a/src/main/java/org/xbib/marc/label/MultipartResourceRecordLevel.java +++ b/src/main/java/org/xbib/marc/label/MultipartResourceRecordLevel.java @@ -71,7 +71,7 @@ public enum MultipartResourceRecordLevel { case 'c': return PART_WITH_DEPENDENT_TITLE; default: - logger.log(Level.FINEST, "unknown multipart resource record level: " + ch); + logger.log(Level.FINEST, () -> "unknown multipart resource record level: " + ch); return NOT_SPECIFIED; } } diff --git a/src/main/java/org/xbib/marc/label/RecordStatus.java b/src/main/java/org/xbib/marc/label/RecordStatus.java index ceca3fe..2ae4814 100644 --- a/src/main/java/org/xbib/marc/label/RecordStatus.java +++ b/src/main/java/org/xbib/marc/label/RecordStatus.java @@ -82,7 +82,7 @@ public enum RecordStatus { case 'p': return INCREASE_IN_ENCODING_LEVEL_FROM_PREPUBLICATION; default: - logger.log(Level.FINEST, "unknown record status: " + ch); + logger.log(Level.FINEST, () -> "unknown record status: " + ch); return UNKNOWN; } } diff --git a/src/main/java/org/xbib/marc/label/TypeOfControl.java b/src/main/java/org/xbib/marc/label/TypeOfControl.java index 6246803..77f91cb 100644 --- a/src/main/java/org/xbib/marc/label/TypeOfControl.java +++ b/src/main/java/org/xbib/marc/label/TypeOfControl.java @@ -55,7 +55,7 @@ public enum TypeOfControl { case 'a' : return ARCHIVAL; default: - logger.log(Level.FINEST, "unknown type of control: " + ch); + logger.log(Level.FINEST, () -> "unknown type of control: " + ch); return UNSPECIFIED; } } diff --git a/src/main/java/org/xbib/marc/label/TypeOfRecord.java b/src/main/java/org/xbib/marc/label/TypeOfRecord.java index 3ea58f5..61dbcc3 100644 --- a/src/main/java/org/xbib/marc/label/TypeOfRecord.java +++ b/src/main/java/org/xbib/marc/label/TypeOfRecord.java @@ -200,7 +200,7 @@ public enum TypeOfRecord { case 't': return LANGUAGE_MATERIAL_MANUSCRIPT_MARC21; default: - logger.log(Level.FINEST, "unknown type of record: " + ch); + logger.log(Level.FINEST, () -> "unknown type of record: " + ch); return UNSPECIFIED; } } diff --git a/src/main/java/org/xbib/marc/transformer/field/MarcFieldTransformer.java b/src/main/java/org/xbib/marc/transformer/field/MarcFieldTransformer.java index 581b4ed..a3d0678 100644 --- a/src/main/java/org/xbib/marc/transformer/field/MarcFieldTransformer.java +++ b/src/main/java/org/xbib/marc/transformer/field/MarcFieldTransformer.java @@ -225,7 +225,7 @@ public class MarcFieldTransformer extends LinkedHashMap { if (m.find()) { if (repeatCounter > 99) { repeatCounter = 99; - logger.log(Level.WARNING, "counter > 99, overflow in %s", marcField); + logger.log(Level.WARNING, () -> "counter > 99, overflow in " + marcField); } return m.replaceAll(String.format("%02d", repeatCounter)); } @@ -360,7 +360,6 @@ public class MarcFieldTransformer extends LinkedHashMap { * @param map a map of mappable tags * @return a MARC field tranformer */ - @SuppressWarnings("unchecked") public Builder from(Map map) { for (Map.Entry entry : map.entrySet()) { fromTo(entry.getKey(), entry.getValue());