2213

Committed 14 May 2026 03:10PM UTC coverage: 91.803% (-0.04%) from 91.84%

Build # 2213

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #1514 from jeffgbutler/additive-merger

Allow Configuration for the Java Merger

Coverage Stats

2519 of 3223 branches covered (78.16%)

311 of 325 new or added lines in 24 files covered. (95.69%)

11 existing lines in 4 files now uncovered.

12208 of 13298 relevant lines covered (91.8%)

0.92 hits per line

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

75.68

/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/Configuration.java

/*
 *    Copyright 2006-2026 the original author or authors.
 *
 *    Licensed under the Apache License, Version 2.0 (the "License");
 *    you may not use this file except in compliance with the License.
 *    You may obtain a copy of the License at
 *
 *       https://www.apache.org/licenses/LICENSE-2.0
 *
 *    Unless required by applicable law or agreed to in writing, software
 *    distributed under the License is distributed on an "AS IS" BASIS,
 *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *    See the License for the specific language governing permissions and
 *    limitations under the License.
 */
package org.mybatis.generator.config;

import static org.mybatis.generator.internal.util.StringUtility.stringHasValue;
import static org.mybatis.generator.internal.util.messages.Messages.getString;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

import org.jspecify.annotations.Nullable;
import org.mybatis.generator.exception.InvalidConfigurationException;

public class Configuration {
    private final List<Context> contexts;
    private final List<String> classPathEntries;
    private final @Nullable IndentationConfiguration indentationConfiguration;
    private final @Nullable JavaMergeConfiguration javaMergeConfiguration;

    private Configuration(Builder builder) {
        contexts = builder.contexts;
        classPathEntries = builder.classPathEntries;
        indentationConfiguration = builder.indentationConfiguration;
        javaMergeConfiguration = builder.javaMergeConfiguration;
    }

    public List<String> getClassPathEntries() {
        return classPathEntries;
    }

    public List<Context> getContexts() {
        return contexts;
    }

    public Optional<IndentationConfiguration> getIndentationConfiguration() {
        return Optional.ofNullable(indentationConfiguration);
    }

    public Optional<JavaMergeConfiguration> getJavaMergeConfiguration() {
        return Optional.ofNullable(javaMergeConfiguration);
    }

    /**
     * This method does a simple validation, it makes sure that all required fields have been filled in and that all
     * implementation classes exist and are of the proper type. It does not do any more complex operations such as
     * validating that database tables exist or validating that named columns exist
     *
     * @throws InvalidConfigurationException
     *             the invalid configuration exception
     */
    public void validate() throws InvalidConfigurationException {
        List<String> errors = new ArrayList<>();

        for (String classPathEntry : classPathEntries) {
            if (!stringHasValue(classPathEntry)) {
                errors.add(getString("ValidationError.19")); //$NON-NLS-1$
                // only need to state this error once
                break;
            }
        }

        if (contexts.isEmpty()) {
            errors.add(getString("ValidationError.11")); //$NON-NLS-1$
        } else {
            for (Context context : contexts) {
                context.validate(errors);
            }
        }

        if (!errors.isEmpty()) {
            throw new InvalidConfigurationException(getString("ValidationError.32"), errors); //$NON-NLS-1$
        }
    }

    public static class Builder {
        private final List<Context> contexts = new ArrayList<>();
        private final List<String> classPathEntries = new ArrayList<>();
        private @Nullable IndentationConfiguration indentationConfiguration;
        private @Nullable JavaMergeConfiguration javaMergeConfiguration;

        public Builder withContext(Context context) {
            contexts.add(context);
            return this;
        }

        public Builder withClassPathEntry(@Nullable  String classPathEntry) {
            if (classPathEntry != null) {
                classPathEntries.add(classPathEntry);
            }
            return this;
        }

        public Builder withIndentationConfiguration(IndentationConfiguration indentationConfiguration) {
            this.indentationConfiguration = indentationConfiguration;
            return this;
        }

        public Builder withJavaMergeConfiguration(JavaMergeConfiguration javaMergeConfiguration) {
            this.javaMergeConfiguration = javaMergeConfiguration;
            return this;
        }

        public Configuration build() {
            return new Configuration(this);
        }
    }
}

1	/*
2	* Copyright 2006-2026 the original author or authors.
3	*
4	* Licensed under the Apache License, Version 2.0 (the "License");
5	* you may not use this file except in compliance with the License.
6	* You may obtain a copy of the License at
7	*
8	* https://www.apache.org/licenses/LICENSE-2.0
9	*
10	* Unless required by applicable law or agreed to in writing, software
11	* distributed under the License is distributed on an "AS IS" BASIS,
12	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13	* See the License for the specific language governing permissions and
14	* limitations under the License.
15	*/
16	package org.mybatis.generator.config;
17
18	import static org.mybatis.generator.internal.util.StringUtility.stringHasValue;
19	import static org.mybatis.generator.internal.util.messages.Messages.getString;
20
21	import java.util.ArrayList;
22	import java.util.List;
23	import java.util.Optional;
24
25	import org.jspecify.annotations.Nullable;
26	import org.mybatis.generator.exception.InvalidConfigurationException;
27
28	public class Configuration {
29	private final List<Context> contexts;
30	private final List<String> classPathEntries;
31	private final @Nullable IndentationConfiguration indentationConfiguration;
32	private final @Nullable JavaMergeConfiguration javaMergeConfiguration;
33
34	private Configuration(Builder builder) {	1✔
35	contexts = builder.contexts;	1✔
36	classPathEntries = builder.classPathEntries;	1✔
37	indentationConfiguration = builder.indentationConfiguration;	1✔
38	javaMergeConfiguration = builder.javaMergeConfiguration;	1✔
39	}	1✔
40
41	public List<String> getClassPathEntries() {
42	return classPathEntries;	1✔
43	}
44
45	public List<Context> getContexts() {
46	return contexts;	1✔
47	}
48
49	public Optional<IndentationConfiguration> getIndentationConfiguration() {
50	return Optional.ofNullable(indentationConfiguration);	1✔
51	}
52
53	public Optional<JavaMergeConfiguration> getJavaMergeConfiguration() {
NEW 54	return Optional.ofNullable(javaMergeConfiguration);	×
55	}
56
57	/**
58	* This method does a simple validation, it makes sure that all required fields have been filled in and that all
59	* implementation classes exist and are of the proper type. It does not do any more complex operations such as
60	* validating that database tables exist or validating that named columns exist
61	*
62	* @throws InvalidConfigurationException
63	* the invalid configuration exception
64	*/
65	public void validate() throws InvalidConfigurationException {
66	List<String> errors = new ArrayList<>();	1✔
67
68	for (String classPathEntry : classPathEntries) {	1!
69	if (!stringHasValue(classPathEntry)) {	×
70	errors.add(getString("ValidationError.19")); //$NON-NLS-1$	×
71	// only need to state this error once
72	break;	×
73	}
74	}	×
75
76	if (contexts.isEmpty()) {	1!
77	errors.add(getString("ValidationError.11")); //$NON-NLS-1$	×
78	} else {
79	for (Context context : contexts) {	1✔
80	context.validate(errors);	1✔
81	}	1✔
82	}
83
84	if (!errors.isEmpty()) {	1✔
85	throw new InvalidConfigurationException(getString("ValidationError.32"), errors); //$NON-NLS-1$	1✔
86	}
87	}	1✔
88
89	public static class Builder {	1✔
90	private final List<Context> contexts = new ArrayList<>();	1✔
91	private final List<String> classPathEntries = new ArrayList<>();	1✔
92	private @Nullable IndentationConfiguration indentationConfiguration;
93	private @Nullable JavaMergeConfiguration javaMergeConfiguration;
94
95	public Builder withContext(Context context) {
96	contexts.add(context);	1✔
97	return this;	1✔
98	}
99
100	public Builder withClassPathEntry(@Nullable String classPathEntry) {
101	if (classPathEntry != null) {	×
102	classPathEntries.add(classPathEntry);	×
103	}
104	return this;	×
105	}
106
107	public Builder withIndentationConfiguration(IndentationConfiguration indentationConfiguration) {
108	this.indentationConfiguration = indentationConfiguration;	1✔
109	return this;	1✔
110	}
111
112	public Builder withJavaMergeConfiguration(JavaMergeConfiguration javaMergeConfiguration) {
113	this.javaMergeConfiguration = javaMergeConfiguration;	1✔
114	return this;	1✔
115	}
116
117	public Configuration build() {
118	return new Configuration(this);	1✔
119	}
120	}
121	}

mybatis / generator / 2213

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