From bafe40e096468dea85ab4d3a4c942fb9d732366b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 2 Jul 2024 16:35:58 +0900 Subject: [PATCH] =?UTF-8?q?ChildLogger=E6=A9=9F=E8=83=BD=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4,=20FactoryInjection=E3=81=AB=E5=88=87=E3=82=8A?= =?UTF-8?q?=E6=9B=BF=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/kidshift/utils/KSLogger.java | 3 -- .../utils/factory/KSLoggerFactory.java | 10 +++++++ .../nem/kidshift/utils/impl/KSLoggerImpl.java | 29 ++++--------------- .../utils/modules/KSLoggerModule.java | 16 ---------- 4 files changed, 15 insertions(+), 43 deletions(-) create mode 100644 utils/src/main/java/one/nem/kidshift/utils/factory/KSLoggerFactory.java delete mode 100644 utils/src/main/java/one/nem/kidshift/utils/modules/KSLoggerModule.java diff --git a/utils/src/main/java/one/nem/kidshift/utils/KSLogger.java b/utils/src/main/java/one/nem/kidshift/utils/KSLogger.java index 5d54822..7d7c62e 100644 --- a/utils/src/main/java/one/nem/kidshift/utils/KSLogger.java +++ b/utils/src/main/java/one/nem/kidshift/utils/KSLogger.java @@ -5,9 +5,6 @@ import java.util.List; import one.nem.kidshift.utils.models.LogModel; public interface KSLogger { - KSLogger getChildLogger(String tag); - KSLogger get(String tag); - KSLogger setTag(String tag); KSLogger addTag(String tag); List getHistory(); void info(String message); diff --git a/utils/src/main/java/one/nem/kidshift/utils/factory/KSLoggerFactory.java b/utils/src/main/java/one/nem/kidshift/utils/factory/KSLoggerFactory.java new file mode 100644 index 0000000..4d036ee --- /dev/null +++ b/utils/src/main/java/one/nem/kidshift/utils/factory/KSLoggerFactory.java @@ -0,0 +1,10 @@ +package one.nem.kidshift.utils.factory; + +import dagger.assisted.AssistedFactory; +import one.nem.kidshift.utils.impl.KSLoggerImpl; + +@AssistedFactory +public interface KSLoggerFactory { + + KSLoggerImpl create(String name); +} diff --git a/utils/src/main/java/one/nem/kidshift/utils/impl/KSLoggerImpl.java b/utils/src/main/java/one/nem/kidshift/utils/impl/KSLoggerImpl.java index 2413577..1c2b511 100644 --- a/utils/src/main/java/one/nem/kidshift/utils/impl/KSLoggerImpl.java +++ b/utils/src/main/java/one/nem/kidshift/utils/impl/KSLoggerImpl.java @@ -5,10 +5,12 @@ import static one.nem.kidshift.utils.enums.LogLevelEnum.INFO; import android.util.Log; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import javax.inject.Inject; +import dagger.assisted.Assisted; import one.nem.kidshift.utils.KSLogger; import one.nem.kidshift.utils.SharedPrefUtils; import one.nem.kidshift.utils.enums.LogLevelEnum; @@ -22,31 +24,10 @@ public class KSLoggerImpl implements KSLogger { private SharedPrefUtils sharedPrefUtils; @Inject - public KSLoggerImpl(SharedPrefUtilsFactory sharedPrefUtilsFactory) { - tags.add("UNTAGGED"); - this.sharedPrefUtils = sharedPrefUtilsFactory.create("KSLogger"); - } - - public KSLoggerImpl(String tag) { - tags.add(tag); - } - - @Override - public KSLogger getChildLogger(String tag) { - tags.add(tag); - return this; - } - - @Override - public KSLogger get(String tag) { - return new KSLoggerImpl(tag); - } - - @Override - public KSLogger setTag(String tag) { + public KSLoggerImpl(SharedPrefUtilsFactory sharedPrefUtilsFactory, @Assisted String name) { + sharedPrefUtils = sharedPrefUtilsFactory.create("KSLogger"); tags.clear(); - tags.add(tag); - return this; + tags.add(name); } @Override diff --git a/utils/src/main/java/one/nem/kidshift/utils/modules/KSLoggerModule.java b/utils/src/main/java/one/nem/kidshift/utils/modules/KSLoggerModule.java deleted file mode 100644 index 87261f8..0000000 --- a/utils/src/main/java/one/nem/kidshift/utils/modules/KSLoggerModule.java +++ /dev/null @@ -1,16 +0,0 @@ -package one.nem.kidshift.utils.modules; - -import dagger.Binds; -import dagger.Module; -import dagger.hilt.InstallIn; -import dagger.hilt.components.SingletonComponent; -import one.nem.kidshift.utils.KSLogger; -import one.nem.kidshift.utils.impl.KSLoggerImpl; - -@Module -@InstallIn(SingletonComponent.class) -abstract public class KSLoggerModule { - - @Binds - public abstract KSLogger bindKSLogger(KSLoggerImpl ksLoggerImpl); -}