Skip to content

Bugfix/issue 101 xtend to java #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 286 commits into from
May 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
286 commits
Select commit Hold shift + click to select a range
eec53c1
rename XMLTools.xtend to XMLTools.java
PhilippSalvisberg May 24, 2020
53894c2
convert XMLTools to Java
PhilippSalvisberg May 24, 2020
a2b2694
use ' instead of " for a char
PhilippSalvisberg May 24, 2020
dc1ba44
use isEmpty() to check for empty array
PhilippSalvisberg May 24, 2020
330d1d3
simplify, return result as early as possible
PhilippSalvisberg May 24, 2020
bf5673a
simplify, do not duplicate type when creating instance
PhilippSalvisberg May 24, 2020
165e602
rename variable to match naming conventions
PhilippSalvisberg May 24, 2020
40f6c13
simplify return result as early as possible
PhilippSalvisberg May 24, 2020
1e10c89
rename GenContext.xtend to GenContext.java
PhilippSalvisberg May 24, 2020
6830956
convert GenContext to Java
PhilippSalvisberg May 24, 2020
57cfe38
rename PlsqlObject.xtend to PlsqlObject.java
PhilippSalvisberg May 24, 2020
156a3dc
value and toString styler for model classes
PhilippSalvisberg May 24, 2020
1187f85
configure styler for model classes
PhilippSalvisberg May 24, 2020
8cfa66c
extend from AbstractModel again and configure styler
PhilippSalvisberg May 24, 2020
9376a4a
convert PlsqlObject to Java
PhilippSalvisberg May 24, 2020
f231205
rename Annotation.xtend to Annotation.java
PhilippSalvisberg May 24, 2020
d03f7ab
convert Annotation to Java
PhilippSalvisberg May 24, 2020
6cca6f4
add newline after object hash
PhilippSalvisberg May 24, 2020
7e917c4
add missing newlines
PhilippSalvisberg May 24, 2020
b3132c5
remove object hash in toString to avoid failing tests
PhilippSalvisberg May 24, 2020
ef41f39
rename Unit.xtend to Unit.java
PhilippSalvisberg May 24, 2020
d1e66f8
convert Unit to Java
PhilippSalvisberg May 24, 2020
6e02a69
rename PreferenceModel.xtend to PreferenceModel.java
PhilippSalvisberg May 24, 2020
81bf821
moved STYLER instance to UtplsqlToStringStyler
PhilippSalvisberg May 24, 2020
d186bfd
convert PreferenceModel to Java
PhilippSalvisberg May 24, 2020
b41166b
rename AbstractModel.xtend to AbstractModel.java
PhilippSalvisberg May 24, 2020
a83536c
convert AbstractModel to Java
PhilippSalvisberg May 24, 2020
f3bf875
rename OutputLines.xtend to OutputLines.java
PhilippSalvisberg May 24, 2020
2808b97
convert OutputLines to Java
PhilippSalvisberg May 24, 2020
e788a9a
rename Counter.xtend to Counter.java
PhilippSalvisberg May 24, 2020
56b3124
convert Counter to Java
PhilippSalvisberg May 24, 2020
a35193f
rename Item.xtend to Item.java
PhilippSalvisberg May 24, 2020
921dbd7
convert Item to Java
PhilippSalvisberg May 24, 2020
483a60e
simplify, remove unnecessary "this." prefixes
PhilippSalvisberg May 24, 2020
a7df2d1
rename STYLER to INSTANCE
PhilippSalvisberg May 25, 2020
eb6d31a
remove AbstractModel and use ToStringStyler.INSTANCE
PhilippSalvisberg May 25, 2020
9674404
rename Expectation.xtend to Expectation.java
PhilippSalvisberg May 25, 2020
1cf53d5
convert Expectation to Java
PhilippSalvisberg May 25, 2020
845bcdd
rename PostEvent.xtend to PostEvent.java
PhilippSalvisberg May 25, 2020
98298fd
convert PostEvent to Java
PhilippSalvisberg May 25, 2020
ada80ad
rename PostRunEvent.xtend to PostRunEvent.java
PhilippSalvisberg May 25, 2020
514d05e
convert PostRunEvent to Java
PhilippSalvisberg May 25, 2020
3e9873f
rename PostSuiteEvent.xtend to PostSuiteEvent.java
PhilippSalvisberg May 25, 2020
e6e7301
convert PostSuiteEvent to Java
PhilippSalvisberg May 25, 2020
817dd1d
add toString() method
PhilippSalvisberg May 25, 2020
99c58e4
rename PostTestEvent.xtend to PostTestEvent.java
PhilippSalvisberg May 25, 2020
5d0386d
convert PostTestEvent to Java
PhilippSalvisberg May 25, 2020
282309e
rename PreRunEvent.xtend to PreRunEvent.java
PhilippSalvisberg May 25, 2020
5ff89db
convert PreRunEvent to Java
PhilippSalvisberg May 25, 2020
00cd3c0
rename PreSuiteEvent.xtend to PreSuiteEvent.java
PhilippSalvisberg May 25, 2020
9677f9c
convert PreSuiteEvent to Java
PhilippSalvisberg May 25, 2020
ffa0b9b
rename PreTestEvent.xtend to PreTestEvent.java
PhilippSalvisberg May 25, 2020
e5540bb
convert PreTestEvent to Java
PhilippSalvisberg May 25, 2020
72b2840
rename RealtimeReporterEvent.xtend to RealtimeReporterEvent.java
PhilippSalvisberg May 25, 2020
295b9a7
convert PreTestEvent to Java
PhilippSalvisberg May 25, 2020
19efd63
rename Run.xtend to Run.java
PhilippSalvisberg May 25, 2020
67013ea
convert Run to Java
PhilippSalvisberg May 25, 2020
d22d0c6
rename Suite.xtend to Suite.java
PhilippSalvisberg May 25, 2020
1b665fb
convert Suite to Java
PhilippSalvisberg May 25, 2020
8afb3ed
rename Test.xtend to Test.java
PhilippSalvisberg May 25, 2020
d8d163a
convert Test to Java
PhilippSalvisberg May 25, 2020
824d1fa
add properties of ancestor in toString() method
PhilippSalvisberg May 25, 2020
4b5eb7f
rename RunGenerator.xtend to RunGenerator.java
PhilippSalvisberg May 25, 2020
cd98961
add getCSV variant passing indent as String
PhilippSalvisberg May 25, 2020
1689fa1
convert RunGenerator to Java
PhilippSalvisberg May 25, 2020
cfbd797
use deduplicated nodes to generate test runs
PhilippSalvisberg May 25, 2020
752f370
rename TestGenerator.xtend to TestGenerator.java
PhilippSalvisberg May 25, 2020
42728a9
use constants for YES and NO
PhilippSalvisberg May 25, 2020
65711fd
convert TestGenerator to Java
PhilippSalvisberg May 25, 2020
e7bf427
rename TestTemplate.xtend to TestTemplate.java
PhilippSalvisberg May 25, 2020
ff5faa2
add methods repeat and replaceTabsWithSpaces
PhilippSalvisberg May 25, 2020
448dbd4
use replaceTabsWithSpaces from StringTools
PhilippSalvisberg May 25, 2020
64945f0
convert TestTemplate to Java
PhilippSalvisberg May 25, 2020
3743931
rename SqlDevParser.xtend to SqlDevParser.java
PhilippSalvisberg May 25, 2020
4bf6d20
convert SqlDevParser to Java
PhilippSalvisberg May 25, 2020
e9e4101
rename UtplsqlParser.xtend to UtplsqlParser.java
PhilippSalvisberg May 26, 2020
a1c4fe9
convert UtplsqlParser to Java
PhilippSalvisberg May 26, 2020
e8989c5
rename UtplsqlResources.xtend to UtplsqlResources.java
PhilippSalvisberg May 26, 2020
27a62cc
convert UtplsqlResources to Java
PhilippSalvisberg May 26, 2020
91d23e5
rename UtplsqlRunner.xtend to UtplsqlRunner.java
PhilippSalvisberg May 26, 2020
e27f837
convert UtplsqlRunner to Java
PhilippSalvisberg May 26, 2020
36934be
use Double.valueOf() instead of new Double()
PhilippSalvisberg May 26, 2020
2bccdc7
rename UtplsqlWorksheetRunner.xtend to UtplsqlWorksheetRunner.java
PhilippSalvisberg May 26, 2020
8370478
convert UtplsqlWorksheetRunner to Java
PhilippSalvisberg May 26, 2020
7287089
end message with period
PhilippSalvisberg May 26, 2020
e9fc29c
add parenthesis to conditional expression and format log messages
PhilippSalvisberg May 26, 2020
00f59dd
rename SnippetMerger.xtend to SnippetMerger.java
PhilippSalvisberg May 26, 2020
1909da4
add SnippetMerger.java generated by Xtend 2.20.0
PhilippSalvisberg May 26, 2020
3c83052
convert SnippetMerger to Java, removing Xtend dependencies
PhilippSalvisberg May 26, 2020
e78202e
rename DirectoryChooser.xtend to DirectoryChooser.java
PhilippSalvisberg May 27, 2020
57238b3
add DirectoryChooser.java generated by Xtend 2.20.0
PhilippSalvisberg May 27, 2020
88234f7
convert DirectoryChooser to Java, removing Xtend dependencies
PhilippSalvisberg May 27, 2020
a99fd8c
rename CodeCoverageReporterDialog.xtend to
PhilippSalvisberg May 27, 2020
af9c237
add CodeCoverageReporterDialog.java generated by Xtend 2.20.0
PhilippSalvisberg May 27, 2020
b760644
convert CodeCoverageReporterDialog to Java, removing Xtend dependencies
PhilippSalvisberg May 27, 2020
1716ff5
rename PreferencePanel.xtend to PreferencePanel.java
PhilippSalvisberg May 27, 2020
ef50787
add PreferencePanel.java generated by Xtend 2.20.0
PhilippSalvisberg May 27, 2020
5ed7fa8
convert PreferencePanel to Java, removing Xtend dependencies
PhilippSalvisberg May 27, 2020
023289f
rename ComboBoxItem.xtend to ComboBoxItem.java
PhilippSalvisberg May 27, 2020
c6f2b3d
add ComboBoxItem.java generated by Xtend 2.20.0
PhilippSalvisberg May 27, 2020
78589fa
convert ComboBoxItem to Java, removing Xtend dependencies
PhilippSalvisberg May 27, 2020
4245dba
rename FailuresTableModel.xtend to FailuresTableModel.java
PhilippSalvisberg May 27, 2020
475e52e
add FailuresTableModel.java generated by Xtend 2.20.0
PhilippSalvisberg May 27, 2020
8e1070d
convert FailuresTableModel to Java, removing Xtend dependencies
PhilippSalvisberg May 27, 2020
5873dc4
rename GradientToolbar.xtend to GradientToolbar.java
PhilippSalvisberg May 27, 2020
a05f01c
add GradientToolbar.java generated by Xtend 2.20.0
PhilippSalvisberg May 27, 2020
d561b70
convert GradientToolbar to Java, removing Xtend dependencies
PhilippSalvisberg May 27, 2020
61f9136
rename RunnerFactory.xtend to RunnerFactory.java
PhilippSalvisberg May 27, 2020
4498c41
add RunnerFactory.java generated by Xtend 2.20.0
PhilippSalvisberg May 27, 2020
e6970ab
convert RunnerFactory to Java, removing Xtend dependencies
PhilippSalvisberg May 27, 2020
2e1c838
rename RunnerPanel.xtend to RunnerPanel.java
PhilippSalvisberg May 27, 2020
331fe38
add RunnerPanel.java generated by Xtend 2.20.0
PhilippSalvisberg May 27, 2020
e4ba479
convert RunnerPanel to Java, removing Xtend dependencies
PhilippSalvisberg May 27, 2020
77a5a28
change return type of all doProcess methods to void
PhilippSalvisberg May 27, 2020
8101e16
add formatDateTime method (removed from RunnerPanel)
PhilippSalvisberg May 27, 2020
773ed0f
move ActionListner, MouseListener, HyperLinkLister to anonymous classes
PhilippSalvisberg May 27, 2020
e8c9b58
move unnecessary private fields to local variables
PhilippSalvisberg May 27, 2020
9eda9e6
rename RunnerTextArea.xtend to RunnerTextArea.java
PhilippSalvisberg May 28, 2020
3450897
add RunnerTextArea.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
1c0033a
convert RunnerTextArea to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
ddbc419
rename RunnerTextField.xtend to RunnerTextField.java
PhilippSalvisberg May 28, 2020
dd3f071
add RunnerTextField.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
345a65b
convert RunnerTextField to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
429e3e5
rename RunnerView.xtend to RunnerView.java
PhilippSalvisberg May 28, 2020
098a722
add RunnerView.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
d54e73f
convert RunnerView to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
6aa0411
rename RunnerTextPane.xtend to RunnerTextPane.java
PhilippSalvisberg May 28, 2020
3d51f9f
add RunnerTextPane.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
d03ba66
convert RunnerTextPane to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
e2e11cd
rename ScrollablePanel.xtend to ScrollablePanel.java
PhilippSalvisberg May 28, 2020
feb329e
add ScrollablePanel.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
df5dd12
convert ScrollablePanel to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
e1a9368
rename SmartTime.xtend to SmartTime.java
PhilippSalvisberg May 28, 2020
ab6b036
add SmartTime.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
8169f19
convert SmartTime to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
9593196
rename TestOverviewTableModel.xtend to TestOverviewTableModel.java
PhilippSalvisberg May 28, 2020
1c77f81
add TestOverviewTableModel.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
85e0a33
convert TestOverviewTableModel to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
db240c4
rename WrapLayout.xtend to WrapLayout.java
PhilippSalvisberg May 28, 2020
dd23e83
add WrapLayout.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
0fe8716
convert WrapLayout to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
c5af17e
rename AbstractJdbcTest.xtend to AbstractJdbcTest.java
PhilippSalvisberg May 28, 2020
4c44e4c
add AbstractJdbcTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
cb4e691
convert AbstractJdbcTest to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
7753a56
rename PrefixToolsTest.xtend to PrefixToolsTest.java
PhilippSalvisberg May 28, 2020
9e12764
add PrefixToolsTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
4c9283e
convert PrefixToolsTest to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
90a5cad
rename ResourceTest.xtend to ResourceTest.java
PhilippSalvisberg May 28, 2020
409dbb6
add ResourceTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
47e82b0
convert ResourceTest to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
2a77ec2
rename SnippetTest.xtend to SnippetTest.java
PhilippSalvisberg May 28, 2020
afed873
add SnippetTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
c44c371
add FileTools.java to wrap checked exceptions
PhilippSalvisberg May 28, 2020
1df2180
convert SnippetTest to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
22c09cf
use FileTools instead of Files
PhilippSalvisberg May 28, 2020
9fc72bb
rename UrlToolsTest.xtend to UrlToolsTest.java
PhilippSalvisberg May 28, 2020
cc343bf
add UrlToolsTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
63fd2b8
convert UrlToolsTest to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
4ff4d53
rename CodeCoverageReporterDialogTest.xtend to
PhilippSalvisberg May 28, 2020
e32bc11
add CodeCoverageReporterDialogTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
5491052
add SystemTools.java to wrap Thread.sleep
PhilippSalvisberg May 28, 2020
479692e
add DatabaseTools.java to wrap getConnection() calls
PhilippSalvisberg May 28, 2020
dfd152c
convert CodeCoverageReporterDialogTest to Java, removing Xtend
PhilippSalvisberg May 28, 2020
02fbed8
rename CodeCoverageReporterTest.xtend to CodeCoverageReporterTest.java
PhilippSalvisberg May 28, 2020
16b9963
add add CodeCoverageReporterDialogTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
b8c1ab5
add waitForThread method
PhilippSalvisberg May 28, 2020
902f5ea
add isConnectionClosed method
PhilippSalvisberg May 28, 2020
6e0d266
add executeAndIgnore method
PhilippSalvisberg May 28, 2020
1f89b8e
convert CodeCoverageReporterTest to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
4897dbe
rename DalBugFixTest.xtend to DalBugFixTest.java
PhilippSalvisberg May 28, 2020
d9d3b0d
add add DalBugFixTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
bcab622
convert DalBugFixTest to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
d041324
add methods createDocumentBuilder, parse
PhilippSalvisberg May 28, 2020
fb6fe36
remove unnecessary final
PhilippSalvisberg May 28, 2020
0dbcad0
add various methods
PhilippSalvisberg May 28, 2020
f5cc951
simplify, use methods from DatabaseTools
PhilippSalvisberg May 28, 2020
b1d6493
simplify, use methods from DatabaseTools
PhilippSalvisberg May 28, 2020
bc70365
change log message
PhilippSalvisberg May 28, 2020
47306e6
simplify, use methods from DatabaseTools
PhilippSalvisberg May 28, 2020
839f847
simplify, use methods from DatabaseTools, SystemTools
PhilippSalvisberg May 28, 2020
f661654
simplify, use methods from XMLTools
PhilippSalvisberg May 28, 2020
d7bd92d
simplify, use methods from DatabaseTools
PhilippSalvisberg May 28, 2020
fde1909
simplify, use methods from DatabaseTools, SystemTools
PhilippSalvisberg May 28, 2020
bae1d00
simplify, use methods from DatabaseTools
PhilippSalvisberg May 28, 2020
736c4bf
simplify, use methods from DatabaseTools
PhilippSalvisberg May 28, 2020
3f42b91
simplify, use methods from DatabaseTools
PhilippSalvisberg May 28, 2020
84b38e3
rename DalTest.xtend to DalTest.java
PhilippSalvisberg May 28, 2020
28c9549
add add DalTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
995363a
typo in SQL (change order of newline and comma)
PhilippSalvisberg May 28, 2020
248fea3
convert DalTest to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
54bc152
rename RealtimeReporterFetchSizeTest.xtend to
PhilippSalvisberg May 28, 2020
d03d21f
add add RealtimeReporterFetchSizeTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
6393993
convert RealtimeReporterFetchSizeTest to Java, removing Xtend
PhilippSalvisberg May 28, 2020
57d6276
rename RealtimeReporterTest.xtend to RealtimeReporterTest.java
PhilippSalvisberg May 28, 2020
16ecbe4
add add RealtimeReporterTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
33a55eb
convert RealtimeReporterTest to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
0b7b883
rename TestRealtimerReporterEventConsumer.xtend to
PhilippSalvisberg May 28, 2020
66a6a57
add TestRealtimerReporterEventConsumer.java generated by Xtend
PhilippSalvisberg May 28, 2020
1003e2b
convert TestRealtimerReporterEventConsumer to Java, removing Xtend
PhilippSalvisberg May 28, 2020
f878245
rename TestRealtimerReporterEventTimedConsumer.xtend to
PhilippSalvisberg May 28, 2020
4cbdbe8
add TestRealtimerReporterEventTimedConsumer.java generated by Xtend
PhilippSalvisberg May 28, 2020
bc78605
convert TestRealtimerReporterEventTimedConsumer to Java, removing Xtend
PhilippSalvisberg May 28, 2020
0e4b3fd
rename SqlDevParserTest.xtend to SqlDevParserTest.java
PhilippSalvisberg May 28, 2020
3a8f229
add SqlDevParserTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
590ca8e
convert SqlDevParserTest to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
721d2f6
add empty line to visualize SQL better
PhilippSalvisberg May 28, 2020
72b0b82
remove unnecessary escaping of apostrophe
PhilippSalvisberg May 28, 2020
48c4060
rename UtplsqlParserBugFixTest.xtend to UtplsqlParserBugFixTest.java
PhilippSalvisberg May 28, 2020
7bd2c80
add UtplsqlParserBugFixTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
a7cb66e
convert UtplsqlParserBugFixTest to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
8fe2cbd
rename UtplsqlParserTest.xtend to UtplsqlParserTest.java
PhilippSalvisberg May 28, 2020
f000d8d
add UtplsqlParserTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 28, 2020
b617a36
convert UtplsqlParserTest to Java, removing Xtend dependencies
PhilippSalvisberg May 28, 2020
d9e1a04
use orElse instead of get to handle !isPresent() for Optionals
PhilippSalvisberg May 28, 2020
26d8fc3
rename PreferenceModelTest.xtend to PreferenceModelTest.java
PhilippSalvisberg May 29, 2020
4642b02
add PreferenceModelTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 29, 2020
32850f4
convert PreferenceModelTest to Java, removing Xtend dependencies
PhilippSalvisberg May 29, 2020
7429f28
rename PreferencePanelTest.xtend to PreferencePanelTest.java
PhilippSalvisberg May 29, 2020
cf83c21
add PreferencePanelTest.java generated by Xtend 2.20.0
PhilippSalvisberg May 29, 2020
82e630e
convert PreferencePanelTest to Java, removing Xtend dependencies
PhilippSalvisberg May 29, 2020
738c947
rename ExpectationTest.xtend to ExpectationTest.java
PhilippSalvisberg May 29, 2020
42ab759
add ExpectationTest generated by Xtend 2.20.0
PhilippSalvisberg May 29, 2020
9aab4fd
convert ExpectationTest to Java, removing Xtend dependencies
PhilippSalvisberg May 29, 2020
a999234
rename SmartTimeTest.xtend to SmartTimeTest.java
PhilippSalvisberg May 29, 2020
5a44e2c
add SmartTimeTest generated by Xtend 2.20.0
PhilippSalvisberg May 29, 2020
6a4dc52
convert SmartTimeTest to Java, removing Xtend dependencies
PhilippSalvisberg May 29, 2020
645e2c2
rename UtplsqlRunnerPanelTest.xtend to UtplsqlRunnerPanelTest.java
PhilippSalvisberg May 29, 2020
431e377
add UtplsqlRunnerPanelTest generated by Xtend 2.20.0
PhilippSalvisberg May 29, 2020
68dcbf2
convert UtplsqlRunnerPanelTest to Java, removing Xtend dependencies
PhilippSalvisberg May 29, 2020
d05dac8
rename UtplsqlRunnerTest.xtend to UtplsqlRunnerTest.java
PhilippSalvisberg May 29, 2020
ec0ae72
add UtplsqlRunnerTest generated by Xtend 2.20.0
PhilippSalvisberg May 29, 2020
99b4d24
convert UtplsqlRunnerTest to Java, removing Xtend dependencies
PhilippSalvisberg May 29, 2020
4b3be10
remove Xtend, update Sprint, change version to 1.2.0-SNAPSHOT
PhilippSalvisberg May 29, 2020
56547c1
replace StringConcatenation usages with StringBuilder
PhilippSalvisberg May 29, 2020
ead3729
replace CollectionLiterals.newArrayList with Arrays.asList
PhilippSalvisberg May 29, 2020
b58c7f5
update versions, fix build warnings, add comments
PhilippSalvisberg May 29, 2020
d9b89b2
show "n/a" instead of null when connection name is not available
PhilippSalvisberg May 29, 2020
3a615cd
add jococo plugin for code coverage with "mvn jacoco:report"
PhilippSalvisberg May 29, 2020
6b60d47
rename UtplsqlToStringStyler to JsonToStringStyler
PhilippSalvisberg May 29, 2020
9b70d25
JsonToStringStyler for model classes used in the utPLSQL project
PhilippSalvisberg May 29, 2020
773d174
using JsonToStringStyler
PhilippSalvisberg May 29, 2020
f771414
using JsonToStringStyler, handle nulls in getTotalNumberOfCompletedTests
PhilippSalvisberg May 29, 2020
5a82224
remove unused UtplsqlValueStyler
PhilippSalvisberg May 29, 2020
0de9b59
add tests for JsonToStringStyler
PhilippSalvisberg May 29, 2020
90e29cf
add bundle oracle.javatools-nodeps
PhilippSalvisberg May 29, 2020
5cc114e
use XMLTools to create DocumentBuilder (less redundancy)
PhilippSalvisberg May 29, 2020
f798f67
use SystemTools.sleep (reduce redundant code)
PhilippSalvisberg May 29, 2020
e9cd7e2
remove usage of com.google.common.base.Objects (not provided)
PhilippSalvisberg May 29, 2020
9d2c623
remove unnecessary parenthesis, valueOf calls for readability
PhilippSalvisberg May 29, 2020
df98a06
change copyright notice from JavaDoc to normal comment
PhilippSalvisberg May 29, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 59 additions & 67 deletions sqldev/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,150 +5,155 @@
<!-- The Basics -->
<groupId>org.utplsql</groupId>
<artifactId>org.utplsql.sqldev</artifactId>
<version>1.1.2-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>1.8</jdk.version>
<jdk.version.test>1.8</jdk.version.test>
<xtend.version>2.20.0</xtend.version>
<!-- requires SQL Developer 4.1.0 or higher (first version based on JDK 1.8) -->
<sqldev.basedir>/Applications/SQLDeveloper19.4.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
<final.name>utplsql_for_SQLDev_${project.version}</final.name>
<!-- arguments to by added by jacoco plugin for test runs with coverage -->
<!-- -noverify is required in some environments to avoid java.lang.VerifyError -->
<argLine>-noverify -Djava.util.logging.config.file=${project.basedir}/src/test/resources/logging.conf</argLine>
</properties>
<dependencies>
<!-- SQL Developer specific dependencies part 1 (not available in public maven repositories) -->
<!-- SQL Developer specific dependencies part 1 (not available in public Maven repositories) -->
<!-- Versions of scope system are based on SQL Developer 19.4.0. -->
<!-- The actual version is not that important, since the these libraries are provided. -->
<!-- Therefore it is not planned to update them with every change of sqldev.basedir. -->
<dependency>
<groupId>oracle</groupId>
<artifactId>idert</artifactId>
<version>12.2.0</version>
<version>13.0.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/ide/lib/idert.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>javatools-nodeps</artifactId>
<version>12.2.0</version>
<version>13.0.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/modules/oracle.javatools/javatools-nodeps.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>javatools</artifactId>
<version>12.2.0</version>
<version>13.0.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/ide/lib/javatools.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>oracle.ide.ceditor</artifactId>
<version>12.2.0</version>
<version>13.0.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.ceditor.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>oracle.ide</artifactId>
<version>12.2.0</version>
<version>13.0.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>uic</artifactId>
<version>12.2.2</version>
<version>13.0.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/ide/lib/uic.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>oracle.ide.navigator</artifactId>
<version>12.2.0</version>
<version>13.0.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.navigator.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>javax-ide</artifactId>
<version>12.2.0</version>
<version>13.0.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/ide/lib/javax-ide.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>oracle.dbtools-common</artifactId>
<version>12.2.0</version>
<version>19.4.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/sqldeveloper/lib/dbtools-common.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>oracle.sqldeveloper</artifactId>
<version>12.2.0</version>
<version>19.3.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>oracle.sqldeveloper.utils</artifactId>
<version>12.2.0</version>
<version>19.3.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.utils.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>oracle.sqldeveloper.worksheet</artifactId>
<version>12.2.0</version>
<version>19.3.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.worksheet.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>ojdbc8</artifactId>
<version>12.2.0.1.0</version>
<version>19.3.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/jdbc/lib/ojdbc8.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>dbapi</artifactId>
<version>12.2.1</version>
<version>19.3.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/ide/lib/dbapi.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>oracle.ide.db</artifactId>
<version>12.2.1</version>
<version>19.3.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.db.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>oracle.jdeveloper.db.connection</artifactId>
<version>12.2.1</version>
<version>19.3.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.db.connection.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>oracle.jdeveloper.java.core.jar</artifactId>
<version>12.2.1</version>
<version>13.0.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.java.core.jar</systemPath>
</dependency>
<!-- SQL Developer specific dependencies part 2 (used for tests only) -->
<dependency>
<groupId>oracle</groupId>
<artifactId>jewt4.jar</artifactId>
<version>12.2.1</version>
<version>13.0.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/modules/oracle.bali.jewt/jewt4.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>share.jar</artifactId>
<version>12.2.1</version>
<version>13.0.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/modules/oracle.bali.share/share.jar</systemPath>
</dependency>
Expand All @@ -162,22 +167,19 @@
</dependency>
<!-- other dependencies -->
<dependency>
<!-- Xtend comes with some runtime dependencies... -->
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId>
<version>${xtend.version}</version>
</dependency>
<dependency>
<!-- used mainly to access the database via JdbcTemplate -->
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>5.2.4.RELEASE</version>
<version>5.2.6.RELEASE</version>
</dependency>
<dependency>
<!-- used for HtmlUtils.htmlEscape in RunnerPanel -->
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>5.2.4.RELEASE</version>
<version>5.2.6.RELEASE</version>
</dependency>
<dependency>
<!-- optional, for RunGenerator and TestGenerator -->
<groupId>org.oddgen</groupId>
<artifactId>org.oddgen.sqldev</artifactId>
<version>0.3.1</version>
Expand All @@ -204,34 +206,6 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<!-- change version might need "mvn -U" to update snapshots -->
<version>${xtend.version}</version>
<executions>
<execution>
<id>main</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<javaSourceVersion>${jdk.version}</javaSourceVersion>
<outputDirectory>${project.basedir}/src/main/xtend-gen</outputDirectory>
</configuration>
</execution>
<execution>
<id>test</id>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<javaSourceVersion>${jdk.version.test}</javaSourceVersion>
<testOutputDirectory>${project.basedir}/src/test/xtend-gen</testOutputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>3.8.1</version>
Expand Down Expand Up @@ -266,9 +240,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<!-- -noverify is required in some environments to avoid java.lang.VerifyError -->
<argLine>-noverify
-Djava.util.logging.config.file=${project.basedir}/src/test/resources/logging.conf</argLine>
<!-- argline moved to properties, to make it work with jacoco plugin -->
<includes>
<include>**/*.java</include>
</includes>
Expand Down Expand Up @@ -296,7 +268,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version><!--$NO-MVN-MAN-VER$-->
<version>3.0.0</version><!--$NO-MVN-MAN-VER$-->
<executions>
<execution>
<phase>prepare-package</phase>
Expand Down Expand Up @@ -424,13 +396,13 @@
org.utplsql.sqldev.resources
</Export-Package>
<_exportcontents>
org.eclipse.xtext.xbase.lib,
org.aspectj.runtime.internal,
org.aspectj.lang,
org.aspectj.runtime,
org.aspectj.lang.reflect
</_exportcontents>
<Require-Bundle>
oracle.javatools,
oracle.javatools-nodeps,
oracle.jdeveloper.db.connection,
oracle.idert,
Expand All @@ -450,7 +422,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.2.0</version><!--$NO-MVN-MAN-VER$-->
<version>3.3.0</version><!--$NO-MVN-MAN-VER$-->
<configuration>
<finalName>${final.name}</finalName>
<appendAssemblyId>false</appendAssemblyId>
Expand All @@ -472,7 +444,7 @@
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.8</version>
<version>1.9</version>
<executions>
<execution>
<id>calculate-checksums</id>
Expand All @@ -483,10 +455,30 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<!-- Dummy plugin used in Eclipse IDE only -->
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
Expand All @@ -497,7 +489,7 @@
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>[3.1.1,)</versionRange>
<versionRange>[3.1.2,)</versionRange>
<goals>
<goal>copy-dependencies</goal>
</goals>
Expand All @@ -515,7 +507,7 @@
build-helper-maven-plugin
</artifactId>
<versionRange>
[3.0.0,)
[3.1.0,)
</versionRange>
<goals>
<goal>parse-version</goal>
Expand Down
Loading