From 600d95320972a9cfc4516fd78ef4003b863f7443 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 28 Sep 2024 12:24:32 +0900 Subject: [PATCH 1/2] Remove unused code --- .../apt/annot/SingletonConfigAnnot.java | 33 ---------- .../internal/apt/meta/dao/DaoMetaFactory.java | 2 - .../apt/processor/dao/DaoProcessorTest.java | 1 - .../processor/dao/PlainSingletonConfig.java | 22 ------- .../dao/PlainSingletonConfigDao.java | 6 -- ...oProcessorTest_PlainSingletonConfigDao.txt | 26 -------- .../DaoProcessorTest_SingletonConfigDao.txt | 61 ------------------- 7 files changed, 151 deletions(-) delete mode 100644 doma-processor/src/main/java/org/seasar/doma/internal/apt/annot/SingletonConfigAnnot.java delete mode 100644 doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/PlainSingletonConfig.java delete mode 100644 doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/PlainSingletonConfigDao.java delete mode 100644 doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest_PlainSingletonConfigDao.txt delete mode 100644 doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest_SingletonConfigDao.txt diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/annot/SingletonConfigAnnot.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/annot/SingletonConfigAnnot.java deleted file mode 100644 index 8abbefd77..000000000 --- a/doma-processor/src/main/java/org/seasar/doma/internal/apt/annot/SingletonConfigAnnot.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.seasar.doma.internal.apt.annot; - -import static org.seasar.doma.internal.util.AssertionUtil.assertNonNullValue; - -import java.util.Map; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.AnnotationValue; -import org.seasar.doma.internal.apt.AptIllegalStateException; -import org.seasar.doma.internal.apt.util.AnnotationValueUtil; - -public class SingletonConfigAnnot extends AbstractAnnot { - - private static final String METHOD = "method"; - - private final AnnotationValue method; - - SingletonConfigAnnot(AnnotationMirror annotationMirror, Map values) { - super(annotationMirror); - this.method = assertNonNullValue(values, METHOD); - } - - public AnnotationValue getMethod() { - return method; - } - - public String getMethodValue() { - String methodName = AnnotationValueUtil.toString(method); - if (methodName == null) { - throw new AptIllegalStateException(METHOD); - } - return methodName; - } -} diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/meta/dao/DaoMetaFactory.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/meta/dao/DaoMetaFactory.java index e621e08a0..02c2bb8ad 100644 --- a/doma-processor/src/main/java/org/seasar/doma/internal/apt/meta/dao/DaoMetaFactory.java +++ b/doma-processor/src/main/java/org/seasar/doma/internal/apt/meta/dao/DaoMetaFactory.java @@ -77,8 +77,6 @@ public class DaoMetaFactory implements TypeElementMetaFactory { - private static final String SINGLETON_CONFIG_FIELD_NAME = "INSTANCE"; - private final Context ctx; private final List> providers = diff --git a/doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest.java b/doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest.java index 95fe2c8dc..4360ada93 100644 --- a/doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest.java +++ b/doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest.java @@ -123,7 +123,6 @@ public Stream provideTestTemplateInvocationContex invocationContext(SQLXMLFactoryDao.class), invocationContext(Issue82Dao.class), invocationContext(ResultStreamDao.class), - invocationContext(PlainSingletonConfigDao.class), invocationContext(SqlProcessorDao.class), invocationContext(OnlyDefaultMethodsExtendsDao.class), invocationContext( diff --git a/doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/PlainSingletonConfig.java b/doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/PlainSingletonConfig.java deleted file mode 100644 index 13af501ff..000000000 --- a/doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/PlainSingletonConfig.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.seasar.doma.internal.apt.processor.dao; - -import javax.sql.DataSource; -import org.seasar.doma.jdbc.Config; -import org.seasar.doma.jdbc.dialect.Dialect; - -public class PlainSingletonConfig implements Config { - - public static final PlainSingletonConfig INSTANCE = new PlainSingletonConfig(); - - private PlainSingletonConfig() {} - - @Override - public DataSource getDataSource() { - return null; - } - - @Override - public Dialect getDialect() { - return null; - } -} diff --git a/doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/PlainSingletonConfigDao.java b/doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/PlainSingletonConfigDao.java deleted file mode 100644 index 820a4a4aa..000000000 --- a/doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/PlainSingletonConfigDao.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.seasar.doma.internal.apt.processor.dao; - -import org.seasar.doma.Dao; - -@Dao -public interface PlainSingletonConfigDao {} diff --git a/doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest_PlainSingletonConfigDao.txt b/doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest_PlainSingletonConfigDao.txt deleted file mode 100644 index b8b1fe0cb..000000000 --- a/doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest_PlainSingletonConfigDao.txt +++ /dev/null @@ -1,26 +0,0 @@ -package org.seasar.doma.internal.apt.processor.dao; - -/** */ -@javax.annotation.processing.Generated(value = { "Doma", "@VERSION@" }, date = "1970-01-01T09:00:00.000+0900") -@org.seasar.doma.DaoImplementation -public class PlainSingletonConfigDaoImpl implements org.seasar.doma.internal.apt.processor.dao.PlainSingletonConfigDao, org.seasar.doma.jdbc.ConfigProvider { - - static { - org.seasar.doma.internal.Artifact.validateVersion("@VERSION@"); - } - - private final org.seasar.doma.internal.jdbc.dao.DaoImplSupport __support; - - /** - * @param config the config - */ - public PlainSingletonConfigDaoImpl(org.seasar.doma.jdbc.Config config) { - __support = new org.seasar.doma.internal.jdbc.dao.DaoImplSupport(config); - } - - @Override - public org.seasar.doma.jdbc.Config getConfig() { - return __support.getConfig(); - } - -} diff --git a/doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest_SingletonConfigDao.txt b/doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest_SingletonConfigDao.txt deleted file mode 100644 index 109a415f5..000000000 --- a/doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest_SingletonConfigDao.txt +++ /dev/null @@ -1,61 +0,0 @@ -package org.seasar.doma.internal.apt.processor.dao; - -/** */ -@javax.annotation.processing.Generated(value = { "Doma", "@VERSION@" }, date = "1970-01-01T09:00:00.000+0900") -@org.seasar.doma.DaoImplementation -public class SingletonConfigDaoImpl implements org.seasar.doma.internal.apt.processor.dao.SingletonConfigDao, org.seasar.doma.jdbc.ConfigProvider { - - static { - org.seasar.doma.internal.Artifact.validateVersion("@VERSION@"); - } - - private final org.seasar.doma.internal.jdbc.dao.DaoImplSupport __support; - - /** */ - public SingletonConfigDaoImpl() { - __support = new org.seasar.doma.internal.jdbc.dao.DaoImplSupport(org.seasar.doma.internal.apt.processor.dao.SingletonConfigAnnotatedConfig.singleton()); - } - - /** - * @param connection the connection - */ - public SingletonConfigDaoImpl(java.sql.Connection connection) { - __support = new org.seasar.doma.internal.jdbc.dao.DaoImplSupport(org.seasar.doma.internal.apt.processor.dao.SingletonConfigAnnotatedConfig.singleton(), connection); - } - - /** - * @param dataSource the dataSource - */ - public SingletonConfigDaoImpl(javax.sql.DataSource dataSource) { - __support = new org.seasar.doma.internal.jdbc.dao.DaoImplSupport(org.seasar.doma.internal.apt.processor.dao.SingletonConfigAnnotatedConfig.singleton(), dataSource); - } - - /** - * @param config the configuration - */ - protected SingletonConfigDaoImpl(org.seasar.doma.jdbc.Config config) { - __support = new org.seasar.doma.internal.jdbc.dao.DaoImplSupport(config); - } - - /** - * @param config the configuration - * @param connection the connection - */ - protected SingletonConfigDaoImpl(org.seasar.doma.jdbc.Config config, java.sql.Connection connection) { - __support = new org.seasar.doma.internal.jdbc.dao.DaoImplSupport(config, connection); - } - - /** - * @param config the configuration - * @param dataSource the dataSource - */ - protected SingletonConfigDaoImpl(org.seasar.doma.jdbc.Config config, javax.sql.DataSource dataSource) { - __support = new org.seasar.doma.internal.jdbc.dao.DaoImplSupport(config, dataSource); - } - - @Override - public org.seasar.doma.jdbc.Config getConfig() { - return __support.getConfig(); - } - -} From ab33850f51e62923ec596401ed6f0af56e10ea53 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 28 Sep 2024 12:42:49 +0900 Subject: [PATCH 2/2] Suppress warning --- .../main/java/org/seasar/doma/jdbc/id/IdGenerationConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/id/IdGenerationConfig.java b/doma-core/src/main/java/org/seasar/doma/jdbc/id/IdGenerationConfig.java index 4deb10afa..88b1b58f1 100644 --- a/doma-core/src/main/java/org/seasar/doma/jdbc/id/IdGenerationConfig.java +++ b/doma-core/src/main/java/org/seasar/doma/jdbc/id/IdGenerationConfig.java @@ -24,6 +24,7 @@ public IdGenerationConfig(Config config, EntityType entityType) { this(config, entityType, new UnavailableIdProvider()); } + @Deprecated public IdGenerationConfig(Config config, EntityType entityType, IdProvider idProvider) { assertNotNull(config, entityType, idProvider); this.config = config;