#743

Committed 28 Jun 2024 04:17PM UTC coverage: 90.988% (+0.5%) from 90.484%

Build # #743

Build Type

push

Committed by

Commit Message

add paramIfNotEmpty method (#318)

* v0.x to master merge

* fix nanoseconds diff (java8 to java11)

* eclipse cleanup and  optimize import

* eclipse format

* optimize Imports

* remove unused annotation

* library version up

* migrate v0.x to master
- update java version 8 to 11
- update junit4 to junit5
- library version update

* fix test failed

* remove unused annotation

* fixed bug

* use var

* fix java8 coding style

* Refactoring TransactionContextManager

* Refactoring SqlAgent

* 途中コミット

* fix testcase

* fix review

* fix javadoc comments

* merge v0.x PR

* cleanup code

* cleanup test code

* change build status badge

* - agent.query, update, proc, batch にそれぞれSupplierを引数にとるメソッドを追加
- SqlQuery.paramとSqlEntityUpdate.setにFunctionを受け取るメソッドを追加

* testcaseの整形

* - SqlFluent と ExtractionCondition の分離
- Arrays.asList -> List.of への変更
- テストの整形

* - v0.x系の不具合対応の追いつき
- ログ出力の整理

* - SqlKindの整理（ENTITY_XXXの追加）
- REPL_LOGの追加
- Deprecatedメソッドの削除（SqlAgent）
- SqlAgent, ExecutionContextでsetterをfluent APIに変更

* DB接続URLの修正

* add and fix testcases.

* add event testcases.

* fix typo

* add paramIfNotEmpty method and StringUtils rename ObjectUtils

* fix review comments.

* remove unused import

Run Details

1695 of 1958 new or added lines in 97 files covered. (86.57%)

26 existing lines in 10 files now uncovered.

8249 of 9066 relevant lines covered (90.99%)

0.91 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

77.27

/src/main/java/jp/co/future/uroborosql/mapping/mapper/DomainPropertyMapper.java

/**
 * Copyright (c) 2017-present, Future Corporation
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 */
package jp.co.future.uroborosql.mapping.mapper;

import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier;
import java.sql.ResultSet;
import java.sql.SQLException;

import jp.co.future.uroborosql.exception.UroborosqlRuntimeException;
import jp.co.future.uroborosql.mapping.JavaType;
import jp.co.future.uroborosql.mapping.annotations.Domain;
import jp.co.future.uroborosql.utils.ObjectUtils;

/**
 * {@link Domain}用{@link PropertyMapper}
 *
 * @author ota
 */
public class DomainPropertyMapper implements PropertyMapper<Object> {

        @Override
        public boolean canAccept(final Class<?> type) {
                return type.getAnnotation(Domain.class) != null;
        }

        @Override
        public Object getValue(final JavaType type, final ResultSet rs, final int columnIndex,
                        final PropertyMapperManager mapperManager) throws SQLException {
                Class<?> rawType = type.getRawType();
                var domain = rawType.getAnnotation(Domain.class);
                var value = mapperManager.getValue(JavaType.of(domain.valueType()), rs, columnIndex);

                if (value == null && !domain.nullable()) {
                        return null;
                }
                return toDomain(rawType, domain, value);

        }

        private Object toDomain(final Class<?> type, final Domain domain, final Object value) {
                try {
                        var methodName = domain.factoryMethod();
                        if (ObjectUtils.isBlank(methodName)) {
                                // default
                                if (!type.isEnum()) {
                                        return type.getConstructor(domain.valueType()).newInstance(value);
                                } else {
                                        // Enumの場合valueOfメソッドをcallする
                                        methodName = "valueOf";
                                }
                        }
                        var method = type.getMethod(methodName, domain.valueType());
                        if (!Modifier.isStatic(method.getModifiers())) {
                                throw new IllegalStateException("not static method. [" + type.getSimpleName() + "#" + methodName + "]");
                        } else if (!type.isAssignableFrom(method.getReturnType())) {
                                throw new IllegalStateException(
                                                "unmatch method result type. [" + type.getSimpleName() + "#" + methodName + "]");
                        }
                        return method.invoke(null, value);
                } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException
                                | SecurityException ex) {
                        throw new UroborosqlRuntimeException(ex);
                }
        }

}

1	/**
2	* Copyright (c) 2017-present, Future Corporation
3	*
4	* This source code is licensed under the MIT license found in the
5	* LICENSE file in the root directory of this source tree.
6	*/
7	package jp.co.future.uroborosql.mapping.mapper;
8
9	import java.lang.reflect.InvocationTargetException;
10	import java.lang.reflect.Modifier;
11	import java.sql.ResultSet;
12	import java.sql.SQLException;
13
14	import jp.co.future.uroborosql.exception.UroborosqlRuntimeException;
15	import jp.co.future.uroborosql.mapping.JavaType;
16	import jp.co.future.uroborosql.mapping.annotations.Domain;
17	import jp.co.future.uroborosql.utils.ObjectUtils;
18
19	/**
20	* {@link Domain}用{@link PropertyMapper}
21	*
22	* @author ota
23	*/
24	public class DomainPropertyMapper implements PropertyMapper<Object> {	1✔
25
26	@Override
27	public boolean canAccept(final Class<?> type) {
28	return type.getAnnotation(Domain.class) != null;	1✔
29	}
30
31	@Override
32	public Object getValue(final JavaType type, final ResultSet rs, final int columnIndex,
33	final PropertyMapperManager mapperManager) throws SQLException {
34	Class<?> rawType = type.getRawType();	1✔
35	var domain = rawType.getAnnotation(Domain.class);	1✔
36	var value = mapperManager.getValue(JavaType.of(domain.valueType()), rs, columnIndex);	1✔
37
38	if (value == null && !domain.nullable()) {	1✔
39	return null;	1✔
40	}
41	return toDomain(rawType, domain, value);	1✔
42
43	}
44
45	private Object toDomain(final Class<?> type, final Domain domain, final Object value) {
46	try {
47	var methodName = domain.factoryMethod();	1✔
48	if (ObjectUtils.isBlank(methodName)) {	1✔
49	// default
50	if (!type.isEnum()) {	1✔
51	return type.getConstructor(domain.valueType()).newInstance(value);	1✔
52	} else {
53	// Enumの場合valueOfメソッドをcallする
54	methodName = "valueOf";	1✔
55	}
56	}
57	var method = type.getMethod(methodName, domain.valueType());	1✔
58	if (!Modifier.isStatic(method.getModifiers())) {	1✔
59	throw new IllegalStateException("not static method. [" + type.getSimpleName() + "#" + methodName + "]");	×
60	} else if (!type.isAssignableFrom(method.getReturnType())) {	1✔
61	throw new IllegalStateException(	×
62	"unmatch method result type. [" + type.getSimpleName() + "#" + methodName + "]");	×
63	}
64	return method.invoke(null, value);	1✔
65	} catch (InstantiationException \| IllegalAccessException \| InvocationTargetException \| NoSuchMethodException	×
66	\| SecurityException ex) {
NEW 67	throw new UroborosqlRuntimeException(ex);	×
68	}
69	}
70
71	}

future-architect / uroborosql / #743

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous