Pārlūkot izejas kodu

Use name as log topic

Lortseam 4 gadi atpakaļ
vecāks
revīzija
71732add73

+ 2 - 2
lib/src/main/java/me/lortseam/completeconfig/CompleteConfig.java

@@ -19,7 +19,7 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-@Log4j2
+@Log4j2(topic = "CompleteConfig")
 @UtilityClass
 public final class CompleteConfig {
 
@@ -58,7 +58,7 @@ public final class CompleteConfig {
         try {
             registerExtension(ReflectionUtils.instantiateClass(extension));
         } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-            logger.error("[CompleteConfig] Failed to instantiate extension " + extension, e);
+            logger.error("Failed to instantiate extension " + extension, e);
         }
     }
 

+ 3 - 3
lib/src/main/java/me/lortseam/completeconfig/data/BoundedEntry.java

@@ -6,7 +6,7 @@ import me.lortseam.completeconfig.data.entry.EntryOrigin;
 
 import java.math.BigDecimal;
 
-@Log4j2
+@Log4j2(topic = "CompleteConfig")
 public class BoundedEntry<T extends Number> extends Entry<T> {
 
     @Getter
@@ -15,10 +15,10 @@ public class BoundedEntry<T extends Number> extends Entry<T> {
     public BoundedEntry(EntryOrigin origin, T min, T max) {
         super(origin, value -> {
             if (new BigDecimal(value.toString()).compareTo(new BigDecimal(min.toString())) < 0) {
-                logger.warn("[CompleteConfig] Tried to set value of field " + origin.getField() + " to a value less than lower bound, setting to minimum now");
+                logger.warn("Tried to set value of field " + origin.getField() + " to a value less than lower bound, setting to minimum now");
                 return min;
             } else if (new BigDecimal(value.toString()).compareTo(new BigDecimal(max.toString())) > 0) {
-                logger.warn("[CompleteConfig] Tried to set value of field " + origin.getField() + " to a value greater than upper bound, setting to maximum now");
+                logger.warn("Tried to set value of field " + origin.getField() + " to a value greater than upper bound, setting to maximum now");
                 return max;
             }
             return value;

+ 1 - 1
lib/src/main/java/me/lortseam/completeconfig/data/Collection.java

@@ -12,7 +12,7 @@ import org.spongepowered.configurate.CommentedConfigurationNode;
 import java.util.Arrays;
 import java.util.Optional;
 
-@Log4j2
+@Log4j2(topic = "CompleteConfig")
 public class Collection extends BaseCollection implements Identifiable {
 
     private final String id;

+ 2 - 2
lib/src/main/java/me/lortseam/completeconfig/data/CollectionSet.java

@@ -4,7 +4,7 @@ import lombok.extern.log4j.Log4j2;
 import me.lortseam.completeconfig.api.ConfigGroup;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
 
-@Log4j2
+@Log4j2(topic = "CompleteConfig")
 public class CollectionSet extends DataSet<Collection> {
 
     protected CollectionSet(TranslationIdentifier translation) {
@@ -16,7 +16,7 @@ public class CollectionSet extends DataSet<Collection> {
         Collection collection = new Collection(groupID, translation.append(groupID), group.getTooltipTranslationKeys(), group.getComment());
         collection.resolveContainer(group);
         if (collection.isEmpty()) {
-            logger.warn("[CompleteConfig] Group " + groupID + " is empty");
+            logger.warn("Group " + groupID + " is empty");
             return;
         }
         add(collection);

+ 4 - 4
lib/src/main/java/me/lortseam/completeconfig/data/Config.java

@@ -10,7 +10,7 @@ import net.fabricmc.loader.api.metadata.ModMetadata;
 
 import java.util.*;
 
-@Log4j2
+@Log4j2(topic = "CompleteConfig")
 public final class Config extends BaseCollection {
 
     private static final Map<String, Config> mainConfigs = new HashMap<>();
@@ -68,7 +68,7 @@ public final class Config extends BaseCollection {
         source.save(this);
     }
 
-    @Log4j2
+    @Log4j2(topic = "CompleteConfig")
     public final static class Builder {
 
         private final String modID;
@@ -139,12 +139,12 @@ public final class Config extends BaseCollection {
          */
         public Config build() {
             if (children.isEmpty()) {
-                logger.warn("[CompleteConfig] Mod " + modID + " tried to create an empty config");
+                logger.warn("Mod " + modID + " tried to create an empty config");
                 return null;
             }
             Config config = new Config(new ConfigSource(modID, branch), children.toArray(new ConfigContainer[0]));
             if (config.isEmpty()) {
-                logger.warn("[CompleteConfig] Config of " + config.source + " is empty");
+                logger.warn("Config of " + config.source + " is empty");
                 return null;
             }
             config.load();

+ 3 - 3
lib/src/main/java/me/lortseam/completeconfig/data/Entry.java

@@ -29,7 +29,7 @@ import java.util.*;
 import java.util.Collection;
 import java.util.function.UnaryOperator;
 
-@Log4j2
+@Log4j2(topic = "CompleteConfig")
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Entry<T> implements DataPart, Identifiable {
 
@@ -223,7 +223,7 @@ public class Entry<T> implements DataPart, Identifiable {
             if(value == null) return;
             setValue(value);
         } catch (SerializationException e) {
-            logger.error("[CompleteConfig] Failed to apply value to entry", e);
+            logger.error("Failed to apply value to entry", e);
         }
     }
 
@@ -235,7 +235,7 @@ public class Entry<T> implements DataPart, Identifiable {
                 node.comment(comment);
             }
         } catch (SerializationException e) {
-            logger.error("[CompleteConfig] Failed to fetch value from entry", e);
+            logger.error("Failed to fetch value from entry", e);
         }
     }
 

+ 1 - 1
lib/src/main/java/me/lortseam/completeconfig/data/EntrySet.java

@@ -10,7 +10,7 @@ import me.lortseam.completeconfig.exception.IllegalModifierException;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
 
-@Log4j2
+@Log4j2(topic = "CompleteConfig")
 public class EntrySet extends DataSet<Entry> {
 
     EntrySet(TranslationIdentifier translation) {

+ 3 - 3
lib/src/main/java/me/lortseam/completeconfig/io/ConfigSource.java

@@ -19,7 +19,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-@Log4j2
+@Log4j2(topic = "CompleteConfig")
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @ToString(onlyExplicitlyIncluded = true)
 public final class ConfigSource {
@@ -77,7 +77,7 @@ public final class ConfigSource {
                 config.apply(root);
             }
         } catch (ConfigurateException e) {
-            logger.error("[CompleteConfig] Failed to load config from file", e);
+            logger.error("Failed to load config from file", e);
         }
         save(config);
     }
@@ -88,7 +88,7 @@ public final class ConfigSource {
         try {
             loader.save(root);
         } catch (ConfigurateException e) {
-            logger.error("[CompleteConfig] Failed to save config to file", e);
+            logger.error("Failed to save config to file", e);
         }
     }
 

+ 1 - 1
lib/src/test/java/me/lortseam/completeconfig/data/BaseCollectionTest.java

@@ -109,7 +109,7 @@ public class BaseCollectionTest {
     @Test
     public void resolve_logWarningIfEmpty() {
         baseCollection.resolve(new EmptyGroup());
-        assertThat(logCaptor.getWarnLogs()).contains("[CompleteConfig] Group emptyGroup is empty");
+        assertThat(logCaptor.getWarnLogs()).contains("Group emptyGroup is empty");
     }
 
     @Test

+ 2 - 2
lib/src/test/java/me/lortseam/completeconfig/data/ConfigTest.java

@@ -62,13 +62,13 @@ public class ConfigTest {
         @Test
         public void build_logWarningAndReturnNullIfChildrenEmpty() {
             assertNull(builder.build());
-            assertThat(logCaptor.getWarnLogs()).contains("[CompleteConfig] Mod " + MOD_ID + " tried to create an empty config");
+            assertThat(logCaptor.getWarnLogs()).contains("Mod " + MOD_ID + " tried to create an empty config");
         }
 
         @Test
         public void build_logWarningAndReturnNullIfEmpty() {
             assertNull(builder.add(new EmptyContainer()).build());
-            assertThat(logCaptor.getWarnLogs()).containsExactly("[CompleteConfig] Config of ConfigSource(modID=" + MOD_ID + ", branch=[]) is empty");
+            assertThat(logCaptor.getWarnLogs()).containsExactly("Config of ConfigSource(modID=" + MOD_ID + ", branch=[]) is empty");
         }
 
     }