#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

72.73

/src/main/java/jp/co/future/uroborosql/client/command/HistoryCommand.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.client.command;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;

import org.jline.reader.LineReader;
import org.jline.terminal.Terminal;

import jp.co.future.uroborosql.config.SqlConfig;

/**
 * Show command history Command
 *
 * @author H.Sugimoto
 */
public class HistoryCommand extends ReplCommand {

        /**
         * Constructor
         */
        @SuppressWarnings("unchecked")
        public HistoryCommand() {
                super(false);
        }

        /**
         * {@inheritDoc}
         *
         * @see jp.co.future.uroborosql.client.command.ReplCommand#execute(org.jline.reader.LineReader, java.lang.String[], jp.co.future.uroborosql.config.SqlConfig, java.util.Properties)
         */
        @Override
        public boolean execute(final LineReader reader, final String[] parts, final SqlConfig sqlConfig,
                        final Properties props) {
                var writer = reader.getTerminal().writer();
                writer.println("HISTORY:");
                writer.flush();

                var keywords = new ArrayList<String>();
                if (parts.length > 1) {
                        keywords.addAll(List.of(Arrays.copyOfRange(parts, 1, parts.length)));
                }

                var sizeLen = String.valueOf(reader.getHistory().size()).length();
                reader.getHistory().forEach(entry -> {
                        try {
                                var value = entry.line();
                                if (keywords.isEmpty() || keywords.stream().anyMatch(s -> value.contains(s))) {
                                        writer.println(String.format("%" + sizeLen + "d : %s", entry.index() + 1, value));
                                }
                        } catch (Exception ex) {
                                // do nothing
                        }
                });
                writer.flush();
                return true;
        }

        /**
         * {@inheritDoc}
         *
         * @see jp.co.future.uroborosql.client.command.ReplCommand#showHelp(org.jline.terminal.Terminal)
         */
        @Override
        public void showHelp(final Terminal terminal) {
                terminal.writer().println("\t" + this.toString() + "\t: list command history.");
                terminal.writer().println("\t\tex1) history<Enter> : Show all command history.");
                terminal.writer().println("\t\tex2) history keyword<Enter> : Show command history filter by keyword.");
        }
}

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.client.command;
8
9	import java.util.ArrayList;
10	import java.util.Arrays;
11	import java.util.List;
12	import java.util.Properties;
13
14	import org.jline.reader.LineReader;
15	import org.jline.terminal.Terminal;
16
17	import jp.co.future.uroborosql.config.SqlConfig;
18
19	/**
20	* Show command history Command
21	*
22	* @author H.Sugimoto
23	*/
24	public class HistoryCommand extends ReplCommand {
25
26	/**
27	* Constructor
28	*/
29	@SuppressWarnings("unchecked")
30	public HistoryCommand() {
31	super(false);	1✔
32	}	1✔
33
34	/**
35	* {@inheritDoc}
36	*
37	* @see jp.co.future.uroborosql.client.command.ReplCommand#execute(org.jline.reader.LineReader, java.lang.String[], jp.co.future.uroborosql.config.SqlConfig, java.util.Properties)
38	*/
39	@Override
40	public boolean execute(final LineReader reader, final String[] parts, final SqlConfig sqlConfig,
41	final Properties props) {
42	var writer = reader.getTerminal().writer();	1✔
43	writer.println("HISTORY:");	1✔
44	writer.flush();	1✔
45
46	var keywords = new ArrayList<String>();	1✔
47	if (parts.length > 1) {	1✔
48	keywords.addAll(List.of(Arrays.copyOfRange(parts, 1, parts.length)));	1✔
49	}
50
51	var sizeLen = String.valueOf(reader.getHistory().size()).length();	1✔
52	reader.getHistory().forEach(entry -> {	1✔
53	try {
54	var value = entry.line();	×
55	if (keywords.isEmpty() \|\| keywords.stream().anyMatch(s -> value.contains(s))) {	×
56	writer.println(String.format("%" + sizeLen + "d : %s", entry.index() + 1, value));	×
57	}
NEW 58	} catch (Exception ex) {	×
59	// do nothing
60	}	×
61	});	×
62	writer.flush();	1✔
63	return true;	1✔
64	}
65
66	/**
67	* {@inheritDoc}
68	*
69	* @see jp.co.future.uroborosql.client.command.ReplCommand#showHelp(org.jline.terminal.Terminal)
70	*/
71	@Override
72	public void showHelp(final Terminal terminal) {
73	terminal.writer().println("\t" + this.toString() + "\t: list command history.");	1✔
74	terminal.writer().println("\t\tex1) history<Enter> : Show all command history.");	1✔
75	terminal.writer().println("\t\tex2) history keyword<Enter> : Show command history filter by keyword.");	1✔
76	}	1✔
77	}

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