2027

Committed 08 Feb 2026 06:52PM UTC coverage: 89.941% (-0.02%) from 89.961%

Build # 2027

Build Type

push

github

Committed by

web-flow

Commit Message

Remove the Eclipse based Java file merger in favor of the merger in the core library (#1443)

* Remove unnecessary extra line in JavaDoc for most cases

* Support unmergeable Java files

* Generic files are never mergeable

* Remove Java merger from the Eclipse plugin

The new merger in the core project is better tested and more capable.

* Package our dependencies in a new plugin

* Remove the old core plugin

There is no need for this to be separated now. It only held the callback implementations after we removed the merger.

* Use Eclipse BND tools to keep binaries out of our source repo

* Revert a little change no longer needed

* Remove the old target platform definitions - no need to keep them around

* Remove deprecated source feature generation

Replace it with an explicit source feature

* Remove deprecated source feature generation

Replace it with an explicit source feature

* Remove unnecessary dependencies

* Restore the function where we add the Java project to the runtime classpath

This seems to have changed in more recent Eclipse versions. The project was getting added to the bootstrap classpath and not the user classpath.

* Documentation Updates

* Setup artifact signing in the release profile

* Refactor the main entry point and shell callback so that Java merging is configurable and optional

* Refactor the main entry point and shell callback so that Java merging is configurable and optional

Coverage Stats

2295 of 3073 branches covered (74.68%)

66 of 96 new or added lines in 8 files covered. (68.75%)

4 existing lines in 3 files now uncovered.

11641 of 12943 relevant lines covered (89.94%)

0.9 hits per line

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

0.0

/core/mybatis-generator-core/src/main/java/org/mybatis/generator/merge/java/JavaMergerFactory.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.merge.java;

import com.github.javaparser.printer.configuration.PrinterConfiguration;
import org.jspecify.annotations.Nullable;
import org.mybatis.generator.internal.util.messages.Messages;

public class JavaMergerFactory {
    public static JavaFileMerger defaultMerger(@Nullable Object printerConfiguration) {
        if (printerConfiguration == null) {
            return new JavaFileMergerJavaParserImpl(new EclipseOrderedPrinterConfiguration());
        } else if (printerConfiguration instanceof PrinterConfiguration pc) {
            return new JavaFileMergerJavaParserImpl(pc);
        } else {
            throw new IllegalArgumentException(Messages.getString("RuntimeError.30")); //$NON-NLS-1$
        }
    }
}

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.merge.java;
17
18	import com.github.javaparser.printer.configuration.PrinterConfiguration;
19	import org.jspecify.annotations.Nullable;
20	import org.mybatis.generator.internal.util.messages.Messages;
21
NEW 22	public class JavaMergerFactory {	×
23	public static JavaFileMerger defaultMerger(@Nullable Object printerConfiguration) {
NEW 24	if (printerConfiguration == null) {	×
NEW 25	return new JavaFileMergerJavaParserImpl(new EclipseOrderedPrinterConfiguration());	×
NEW 26	} else if (printerConfiguration instanceof PrinterConfiguration pc) {	×
NEW 27	return new JavaFileMergerJavaParserImpl(pc);	×
28	} else {
NEW 29	throw new IllegalArgumentException(Messages.getString("RuntimeError.30")); //$NON-NLS-1$	×
30	}
31	}
32	}

mybatis / generator / 2027

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