Skip to content
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

Merge metafacture-fix. #586

Draft
wants to merge 1,080 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1080 commits
Select commit Hold shift + click to select a range
1819aff
Add follow URL redirections (metafacture-core#415)
dr0i Sep 6, 2022
5dea28e
Clean up formatting for SKOS lookup tests. (#229)
blackwinter Sep 8, 2022
7826062
Use camelCase (metafacture-core#415)
dr0i Sep 15, 2022
4b34178
Use withOption(...)
dr0i Sep 15, 2022
1d34730
Rename method (metafacture-core#415)
dr0i Sep 16, 2022
b11a77e
Set default value if not defined (metafacture-core#415)
dr0i Sep 16, 2022
234ab5a
Fix put_rdfmap (metafacture-core#415)
dr0i Sep 20, 2022
c3418a4
Remove static defaultValue (metafacture-core#415)
dr0i Sep 20, 2022
94ae82a
Extract lookup into FixFunction (metafacture-core#415)
dr0i Sep 20, 2022
62da8a0
Add slf4j-log4j12 dependency
dr0i Sep 22, 2022
29d1360
Fix order; rename variable; remove empty line (metafacture-core#415)
dr0i Sep 23, 2022
5d70f14
Fix typos (metafacture-core#415)
dr0i Sep 23, 2022
9dd9762
Add integration tests for Skos-Lookup
TobiasNx Sep 29, 2022
b166fd2
Enable further use cases
dr0i Oct 7, 2022
219f2bf
Fix test lookupRdfDefinedPropertyToProperty
TobiasNx Oct 27, 2022
d94728b
Add optional parameter "select"
dr0i Nov 4, 2022
1d0e542
Enable further test and fix Fix (metafacture-core#415)
dr0i Nov 18, 2022
b49445d
Rename "target_language" to "select_language"
dr0i Nov 22, 2022
9251ca3
Rename integration tests for rdf lookup
TobiasNx Nov 25, 2022
c81ae7d
Tweak rdf lookup (metafacture-core#415)
dr0i Dec 13, 2022
253e25c
Add wiremock to test RDF url (metafacture-core#415)
dr0i Dec 27, 2022
e7ff7fd
Add unit tests for "string transformers" with programmatically added …
blackwinter Jan 6, 2023
87e30a7
Don't append scopeVariable name, set base path on new values (#278)
fsteeg Jan 13, 2023
416ba75
Set full paths on new values in set_array (#278)
fsteeg Jan 13, 2023
d611014
Add integration test for #278
TobiasNx Jan 17, 2023
698a344
Merge pull request #280 from metafacture/278-addIntegrationTest
TobiasNx Jan 17, 2023
7e43938
Merge pull request #281 from metafacture/278-stringTransformersWithPr…
fsteeg Jan 17, 2023
e944e27
Delete todo.txt for succesful test #278
TobiasNx Jan 23, 2023
eaf08c2
Drop unused methods. (94ae82a)
blackwinter Feb 9, 2023
0987eb0
Drop special treatment of RDF maps in `lookup()`. (#229)
blackwinter Feb 9, 2023
dc9e63d
Drop special treatment of map name in `put_rdfmap()`. (#229)
blackwinter Feb 9, 2023
897c21d
Unify URI identification logic for RDF maps. (#229)
blackwinter Feb 9, 2023
7da6541
A little cleanup. (#229)
blackwinter Feb 9, 2023
3c09175
Fix logging setup. (62da8a0)
blackwinter Feb 10, 2023
b5b8cc9
Merge #229 from branch 'WIP-metafacture-core-415-addSkosLookup' of ht…
dr0i Feb 13, 2023
6021dbf
Update to latest metafacture-core release (5.5.0)
blackwinter Mar 7, 2023
0340030
Update README.md
TobiasNx Mar 7, 2023
c7d1d17
Publish 0.4.0 from master branch (#286)
fsteeg Mar 7, 2023
ad5be32
Add instructions on releasing to README (#286)
fsteeg Mar 7, 2023
7904e50
Update to next development version (#286)
fsteeg Mar 7, 2023
ffa4a3d
Move instructions on releasing to MAINTAINING.md (#286)
fsteeg Mar 7, 2023
8852ff6
Merge pull request #289 from metafacture/286-release
fsteeg Mar 7, 2023
b1aa60d
Merge pull request #288 from metafacture/TobiasNx-patch-2
TobiasNx Mar 24, 2023
711b787
Add all metafacture modules to metafix-runner (#275)
fsteeg Mar 29, 2023
4b67fbe
Merge pull request #293 from metafacture/275-runner
fsteeg Mar 30, 2023
aa7f9fd
Update vsc extension to new fix #291
katauber Apr 27, 2023
1741ca8
Add `entityMemberName` option to Metafix (#294)
fsteeg May 4, 2023
935f05f
Move tests to MetafixRecordTest, fix member order & newline (#294)
fsteeg May 4, 2023
847bc0e
Merge pull request #299 from metafacture/294-entityMemberName
fsteeg May 4, 2023
3d7b16a
Initial setup for a flux command to list available fix paths
fsteeg May 4, 2023
f906faf
Add `count` and `index` options to MetafixListPaths
fsteeg May 5, 2023
17b836d
Sort only if we count, and sort by highest frequency first
fsteeg May 5, 2023
367f236
Add documentation annotations on MetafixListPaths
fsteeg May 5, 2023
df677cc
Fix link to fix conditionals #291
katauber May 8, 2023
7d2d8c2
Change scope selectors to style methods, binds and conditionals diffe…
katauber May 8, 2023
8c4f718
Add flux command to list values for a given fix path
fsteeg May 8, 2023
5927b7c
Extract common triple-based analyzer code into a superclass
fsteeg May 8, 2023
1d0fe7b
Copy values in `fix-list-values` to support wildcard & index paths
fsteeg May 8, 2023
5c35f36
Use `\t|\t` in analyzer output templates instead of `\t ` (#300)
fsteeg May 10, 2023
4d8bdbf
Always count and sort, only change formatting if count=false (#300)
fsteeg May 10, 2023
b7540b6
Adapt group names after review #291
katauber May 11, 2023
cd384b9
Merge pull request #297 from metafacture/291-updateVSCExtension
katauber May 11, 2023
4b0a8f3
Sort alphabetically if `count` is `false` (#300)
fsteeg May 12, 2023
809bdfd
Use common template in analyzer modules, set as option (#300)
fsteeg May 12, 2023
a9d78e4
Change default template for better alignment of output (#300)
fsteeg May 12, 2023
81c1b26
Fix alphabetical sorting, improve tests to actually cover it (#300)
fsteeg May 12, 2023
172a701
Integrate feedback from code review (#300)
fsteeg May 16, 2023
be0dbc8
Merge pull request #300 from metafacture/oersi-238
fsteeg May 16, 2023
113d531
Publish 0.5.1 from master branch, based on core 5.5.1-rc1 (#303)
fsteeg May 16, 2023
a9894d2
Update to next development version, 0.6.0-SNAPSHOT (#303)
fsteeg May 16, 2023
b7c318f
Merge pull request #304 from metafacture/303-release
fsteeg May 17, 2023
347ef39
Update README.md
TobiasNx Jun 2, 2023
c19a1ed
Clean up whitespace. (#307)
blackwinter Jun 2, 2023
3c9e1ab
Fix `do list` example. (#307)
blackwinter Jun 2, 2023
5bc0378
Change `add_field()` Fix function to destructive behaviour for Catman…
blackwinter Jun 6, 2023
f2e6472
Merge pull request #308 from metafacture/116-destructiveAddField
blackwinter Jun 9, 2023
2427f2c
Change `copy_field()`/`move_field()` Fix functions to destructive beh…
blackwinter Jun 6, 2023
8f25c20
Update to latest metafacture-core release candidate (#311)
dr0i Jun 13, 2023
ef44f8c
Merge #312 from branch '311-updateDependencyMfc5.7.0-rc1' of https://…
dr0i Jun 15, 2023
4dd061b
Merge pull request #313 from metafacture/116-destructiveCopyFieldMove…
blackwinter Jun 15, 2023
307a416
Add uri_encode (#273)
dr0i Feb 17, 2023
c20c2a9
Remove singleton (#273)
dr0i Jun 16, 2023
5e05a32
Update README (#273)
dr0i Jun 16, 2023
5307a89
Move into section "Script-level functions" (#273)
dr0i Jun 16, 2023
b3420ec
Moved `uri_encode` documentation to "field-level" section. (#314)
blackwinter Jun 16, 2023
2294a74
Merge #314 from remote-tracking branch 'origin/273-addUriEncodeFunction'
dr0i Jun 16, 2023
6fe3a71
Allow lookup on URLs (#301)
dr0i Jun 23, 2023
51475d8
Merge #317 from remote-tracking branch 'origin/301-allowUrlInFilemap_…
dr0i Jun 27, 2023
538dc4c
Add unit test for `join_field()` with single field.
blackwinter Jul 11, 2023
3ce7fe2
Minor optimization for `list_as()` bind. (269d207)
blackwinter Jul 11, 2023
1895fd1
Merge pull request #307 from metafacture/TobiasNx-patch-3
TobiasNx Jul 24, 2023
6810484
Fix `in()` Fix conditional with unexpected values. (hbz/lobid-resourc…
blackwinter Sep 13, 2023
4ddfcac
Add "integration tests" to benchmark `include()` performance. (#287)
blackwinter Oct 13, 2023
4fb8426
Cache resolved Fix file path to improve `include()` performance. (#287)
blackwinter Oct 13, 2023
6cf83ae
Merge #327 from branch '287-includePerformance' of https://github.com…
dr0i Oct 30, 2023
45bb75b
Add support for nested paths in `retain()` Fix function. (#145)
blackwinter Oct 31, 2023
5cc686d
Add support for nested `$first`/`$last` in `retain()` Fix function. (…
blackwinter Nov 8, 2023
fde1e35
Add hint to README regarding problems when build on Windows. See #315
katauber Nov 8, 2023
511e9ef
Update README.md
TobiasNx Nov 8, 2023
359f77c
Merge pull request #334 from metafacture/TobiasNx-patch-4
TobiasNx Nov 8, 2023
a630d7c
Update README.md
katauber Nov 9, 2023
c7ce860
Merge pull request #332 from metafacture/315-fixXtextServerFailure
katauber Nov 10, 2023
c195c02
Add extension snippets for all do binds. See #302
katauber Nov 9, 2023
8fb3ebc
Replace "," with ":" in extension snippet
katauber Nov 10, 2023
49e3fb1
Merge pull request #329 from metafacture/145-retainNested
blackwinter Nov 20, 2023
078b461
Fix function "uri_encode" to be backwards compatible (metafacture-fix…
dr0i Nov 21, 2023
9bf5307
Fix README; adapt test to fit tests name
dr0i Nov 21, 2023
f0aba21
Update README.md
dr0i Nov 23, 2023
a55c352
Update README.md
dr0i Nov 23, 2023
b129d44
Merge #337 from remote-tracking branch 'origin/273-fixUrlEncode'
dr0i Nov 23, 2023
68580f9
Add links to playground for several fixes
TobiasNx Nov 23, 2023
a22c122
Change link text for playground examples. (#339)
blackwinter Nov 23, 2023
49e9a4e
Fix typo in example link. (#339)
blackwinter Nov 23, 2023
ec0b2fe
Fix example links. (#339)
blackwinter Nov 23, 2023
5a74720
Publish 0.7.0
dr0i Nov 24, 2023
ccd7b9a
Move version to 0.8.0-SNAPSHOT after release
dr0i Nov 24, 2023
6250389
Merge pull request #339 from metafacture/add_links_to_playground
blackwinter Nov 28, 2023
02091a8
Merge pull request #336 from metafacture/302-addExtensionSnippets
katauber Dec 11, 2023
eb32306
Close resources. (metafacture/metafacture-core#514)
blackwinter Jan 25, 2024
eebbe88
Merge pull request #340 from metafacture/closeResources
blackwinter Jan 25, 2024
3d8d0e5
Upgrade Xtext Builder plugin version in preparation for Gradle upgrad…
blackwinter Feb 5, 2024
877dd37
Upgrade Gradle wrapper to version 8.6. (#283)
blackwinter Oct 31, 2023
fa000d3
Merge pull request #341 from metafacture/283-gradle8
blackwinter Feb 6, 2024
8567e46
Specify JDK version. (#341)
blackwinter Feb 13, 2024
8a09c09
Upgrade JMH Gradle plugin version. (#341)
blackwinter Feb 16, 2024
d27e2ca
Replace Gradle conventions with configuration blocks. (#341)
blackwinter Feb 16, 2024
5de67d6
Merge pull request #342 from metafacture/gradle9Compatibility
blackwinter Feb 20, 2024
8c9789a
Bump java version from 8 to 11 (#343)
dr0i Mar 5, 2024
db9745b
Update tests for Java 11. (#345)
blackwinter Mar 6, 2024
4f2f19e
Revert metafacture-core dependency and metafacture-fix version number…
dr0i Mar 7, 2024
07d8458
Merge #345 from branch '343-bumpJavaTo11' of github.com:metafacture/m…
dr0i Mar 7, 2024
3b17c19
Provide Mockito 5.x forward compatibility.
blackwinter Mar 7, 2024
828617b
Bump java version from 8 to 11 (#343)
dr0i Mar 5, 2024
e0f7d56
Publish 1.0.0
dr0i Mar 5, 2024
fc94c4d
Move version to 1.0.1-SNAPSHOT after release
dr0i Mar 11, 2024
88eb9dd
Upgrade Gradle wrapper to version 8.7.
blackwinter Mar 25, 2024
8a50e98
Add how to execute a flux via CLI (#90)
dr0i Mar 26, 2024
331cd6f
Merge #346 from branch '90-documentHowToUseMFixAsCLI'
dr0i Mar 26, 2024
a082cd5
Add draft for new find fix paths modul #347
dr0i Mar 26, 2024
59cb694
Add a workaround to link to Java Code
TobiasNx May 21, 2024
3483c54
Adjust links as suggested by review
TobiasNx May 21, 2024
747c4ce
Merge pull request #352 from metafacture/Add-link-to-java-code-in-doc…
TobiasNx May 22, 2024
70a467f
Adjust FindFixPaths.java and add test #347
TobiasNx May 23, 2024
eddaa03
Discard changes to README.md
TobiasNx May 24, 2024
7e3c150
Change author of testfile #347
TobiasNx May 24, 2024
2d4f976
Merge pull request #351 from metafacture/347-findingPathModul
TobiasNx May 24, 2024
fd91f47
Add to_base64 function #354
TobiasNx May 28, 2024
f855799
Adjust formatting and checkstyle errors #354
TobiasNx May 29, 2024
f2a9c7c
Add documentation for `to_base64` #354
TobiasNx May 29, 2024
aa8f647
Rephrase documentation #354
TobiasNx May 29, 2024
f4f0900
Upgrade Gradle wrapper to version 8.8.
blackwinter Jun 3, 2024
c403afa
Merge pull request #355 from metafacture/354-base64
TobiasNx Jun 4, 2024
18b78f0
WIP to use the default option as in catmandu #333
TobiasNx Jun 6, 2024
38defe2
Publish 1.1.0 from master branch
dr0i Jun 25, 2024
9c73d8d
Move version to 1.2.0-SNAPSHOT after release
dr0i Jun 25, 2024
aaa124a
Publish 1.1.1 from master branch
dr0i Jul 2, 2024
ab275ae
Move version to 1.1.2-SNAPSHOT after 1.1.1 release
dr0i Jul 2, 2024
1b6ce52
Publish 1.1.2 from master branch
dr0i Jul 15, 2024
58bc7ff
Move version to 1.1.3-SNAPSHOT after 1.1.2 release
dr0i Jul 15, 2024
1592d7d
Upgrade Gradle wrapper to version 8.9.
blackwinter Jul 23, 2024
71e5a83
Upgrade Gradle wrapper to version 8.10.
blackwinter Aug 14, 2024
6c2eda8
Add multiple missing playground examples for fix functions
TobiasNx Sep 3, 2024
91e1e27
Merge pull request #363 from metafacture/newPlaygroundExamples
TobiasNx Sep 3, 2024
a93c793
Delete escape signs in default template for find-fix-paths #347
TobiasNx Sep 6, 2024
5cb5e66
Merge remote-tracking branch 'origin/master' into 333-defaultOptionWIP
TobiasNx Sep 6, 2024
1e697da
Upgrade Gradle wrapper to version 8.10.1.
blackwinter Sep 9, 2024
19bbe2c
Merge pull request #364 from metafacture/347-templateIssue
TobiasNx Sep 17, 2024
f1405ea
Add log function #319
TobiasNx Sep 18, 2024
5561729
Add new fix method to set variable with element value #282
TobiasNx Sep 18, 2024
a505fc5
Adjust delete function as suggested by @blackwinter #333
TobiasNx Sep 9, 2024
726d0fa
Add test for to_var #282
TobiasNx Sep 23, 2024
b09ca4f
Support implicit array creation on `$append` (#127)
fsteeg Sep 24, 2024
5d15e0e
Allow more log levels in `log()` Fix function. (#366)
blackwinter Sep 24, 2024
a52dc9b
Account for missing values in `to_var()` Fix function. (#365)
blackwinter Sep 24, 2024
27634d1
Change default handling in `lookup()` Fix function. (#356)
blackwinter Sep 24, 2024
6496352
Upgrade Gradle wrapper to version 8.10.2.
blackwinter Sep 24, 2024
d84cc94
Add tests #333
TobiasNx Sep 25, 2024
18b6044
Adjust documentation for default option #333
TobiasNx Sep 25, 2024
d1ed262
Add documentation for log #319
TobiasNx Sep 25, 2024
d0cc26e
Fix issues in tests for implicit array creation on `$append` (#127)
fsteeg Sep 25, 2024
fffb6d9
Support `$prepend` for inserting & array creation (#92, #93, #127)
fsteeg Sep 25, 2024
629a9d6
Avoid redundancy: call `tail(path)` once, add `else` block (#127)
fsteeg Sep 25, 2024
0cedb17
Improve naming of tests: implicit arrays vs. implicit append (#127)
fsteeg Sep 25, 2024
49cfaca
Avoid collection and additional calls to `tail()` & `get()` (#127)
fsteeg Sep 26, 2024
d20530e
Add MetafixToDo test for adding with $last in implicit array (#369)
fsteeg Sep 26, 2024
d00e59a
Update paths of moved values when inserting with `$prepend` (#127)
fsteeg Sep 26, 2024
c5aa947
Wrap string value into array only on `$prepend` / `$append` (#127)
fsteeg Sep 27, 2024
fe84442
Implement add(Value, boolean) using add(int, Value, boolean) (#127)
fsteeg Sep 27, 2024
c24f101
Update Metafix.java
TobiasNx Sep 27, 2024
019ad48
Merge pull request #368 from metafacture/127-arrays
fsteeg Oct 2, 2024
ad73aa2
Update documentation for `log()` Fix function. (#366)
blackwinter Oct 2, 2024
2b4a4e0
Add annotations imports
TobiasNx Oct 9, 2024
81a88bc
Merge pull request #366 from metafacture/319-log
TobiasNx Oct 9, 2024
46d1ef5
Implement optional default value for `to_var()` Fix function. (#365)
blackwinter Oct 11, 2024
cee638a
Only accept string values in `to_var()` Fix function. (#365)
blackwinter Oct 11, 2024
ec7f9ec
Apply suggestions from code review
TobiasNx Oct 14, 2024
8ad9cde
Add documentation for `to_var` function #282
TobiasNx Oct 14, 2024
4453635
Merge pull request #370 from metafacture/add-signature-and-description
TobiasNx Oct 14, 2024
1ad8131
Adjust documentation and tests #333
TobiasNx Oct 14, 2024
2460c92
Apply suggestions from code review #333
TobiasNx Oct 14, 2024
93ee08e
Apply suggestions from code review #282
TobiasNx Oct 14, 2024
8845afd
Update Metafix.java
TobiasNx Oct 14, 2024
82d36d3
Merge pull request #365 from metafacture/282-variableFromElementValue
TobiasNx Oct 14, 2024
cdce76f
Merge pull request #356 from metafacture/333-defaultOptionWIP
TobiasNx Oct 14, 2024
d0fc1c6
Merge pull request #375 from metafacture/TobiasNx-patch-4
TobiasNx Oct 14, 2024
d18a503
Adjust integrationtests after #127
TobiasNx Oct 14, 2024
ea40528
Add new todo.txt and adjust test for #377
TobiasNx Oct 14, 2024
06b39e0
Undo change for array test with index number #127
TobiasNx Oct 14, 2024
af806f7
Split integration test into two #127 and #377
TobiasNx Oct 15, 2024
1bb5b93
Fix typo in folder name #127 and #377
TobiasNx Oct 16, 2024
33b1b4a
Adjust as suggested by reviewer
TobiasNx Oct 16, 2024
9b4a6c1
Merge pull request #376 from metafacture/127-adjustIntegrationTests
TobiasNx Oct 16, 2024
618844a
Add new function add_array and add_hash #374
TobiasNx Oct 14, 2024
9ccff38
Change set_array specific test back #127
TobiasNx Oct 16, 2024
ea9fa70
Merge pull request #378 from metafacture/127-changeBackSingleIntegrat…
TobiasNx Oct 16, 2024
a8e45e9
Merge remote-tracking branch 'origin/master' into 374-introduceAddArr…
TobiasNx Oct 16, 2024
19051fb
Use add_array instead of set_array in integration tests #374
TobiasNx Oct 16, 2024
00838b6
Use add_hash instead of set_hash in integration tests #374
TobiasNx Oct 16, 2024
aea03a8
Change further use of set_array to add_array and set_hash to set_hash…
TobiasNx Oct 16, 2024
99361dd
Ignore old value's path in `copy_field` Fix function. (#377)
blackwinter Oct 16, 2024
8ea116a
Switch profiling from HPROF to Java Flight Recorder.
blackwinter Oct 18, 2024
e981f30
Rely on autoboxing for entity count stack.
blackwinter Oct 9, 2024
1fed102
Optionally specify limit for number of entities in a record.
blackwinter Oct 9, 2024
dc4f1af
Implement optimizations for limiting number of entities. (#373)
blackwinter Oct 18, 2024
c9fc49b
Change set_field, set_array and set_hash to aliases #374
TobiasNx Oct 29, 2024
5d198fd
Revert "Use add_array instead of set_array in integration tests #374"
TobiasNx Oct 29, 2024
840db07
Revert "Use add_hash instead of set_hash in integration tests #374"
TobiasNx Oct 29, 2024
ec7f7a3
Revert "Change further use of set_array to add_array and set_hash to …
TobiasNx Oct 29, 2024
ffa5b7a
Set wildcard classpath for windows start batch (#371)
dr0i Oct 29, 2024
511347b
Update and add documentation #374
TobiasNx Nov 7, 2024
be72f98
Update metafix-runner/build.gradle
dr0i Nov 7, 2024
3bb2b28
Merge pull request #379 from metafacture/374-introduceAddArrayAndAddHash
TobiasNx Nov 7, 2024
c8b280f
Include the directive in already existing 'application' block (#371)
dr0i Nov 7, 2024
a2fbff1
Disable up-to-date checks when creating start scripts. (#382)
blackwinter Nov 8, 2024
6284eab
Merge #382 from branch '371-classpathOfRunnerTooLongOnWindows' of git…
dr0i Nov 8, 2024
3b3bf14
Upgrade Gradle wrapper to version 8.11.
blackwinter Nov 12, 2024
9014b01
Add option "url_safe" to "to_base64" function (#384)
dr0i Nov 14, 2024
fd3967f
Update README.md
dr0i Nov 14, 2024
e49cdd7
Update metafix/src/main/java/org/metafacture/metafix/FixMethod.java
dr0i Nov 14, 2024
8fe3804
Add test to encode a URL as Base64 as default
dr0i Nov 14, 2024
93afd59
Merge #386 from remote-tracking branch 'ssh/384-encodeUrlToBase64'
dr0i Nov 15, 2024
d9b25ec
Upgrade Gradle wrapper to version 8.11.1.
blackwinter Nov 21, 2024
22b6824
Merge pull request #380 from metafacture/377-ignoreOldValuePath
blackwinter Nov 29, 2024
c5aacab
Add log4j logging (#383)
dr0i Nov 21, 2024
27560cf
Merge #388 from remote-tracking branch 'origin/383-enableLog4jLogging'
dr0i Nov 29, 2024
0b20caa
Reduce log level for tests. (#388)
blackwinter Dec 2, 2024
a10b3d8
Add integration test for limiting number of entities. (#373)
blackwinter Dec 3, 2024
8b65b6e
Merge pull request #373 from metafacture/maxEntityCount
blackwinter Dec 3, 2024
b254549
Merge pull request #240 from metafacture/239-addIntegrationTest
TobiasNx Dec 3, 2024
1784fda
Imported metafacture/metafacture-fix@b254549fa2cd5b899d2e0777564f6aef…
blackwinter Dec 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 4 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@ trim_trailing_whitespace = true
end_of_line = crlf
trim_trailing_whitespace = false

[*.{g,gradle,json,xml,xsd,yml}]
[*.{fix,g,gradle,json,md,mwe2,sh,vim,xml,xsd,xtext,yml}]
indent_size = 2

[*.tmLanguage]
indent_style = tab

[metafacture-io/src/test/resources/org/metafacture/io/compressed.txt]
insert_final_newline = false

Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Build

on: push

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -10,5 +11,12 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 11
- name: Build with gradle
- name: Build with Gradle
run: ./gradlew check
env:
METAFIX_LOG_PASSED: true
- name: Install language server
run: ./gradlew installServer
- name: Install fix extension
working-directory: metafix-vsc/
run: npm install
42 changes: 42 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@

name: Build and Deploy

on:
push:
branches:
- deploy

jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Node.js
uses: actions/setup-node@v2
- name: Set up vsce
run: npm install -g vsce
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Build with Gradle
run: |
chmod +x gradlew
./gradlew build
./gradlew installServer
- name: Create fix extension
working-directory: metafix-vsc/
run: |
npm install
vsce package -o fix.vsix
- name: Pushes vsix to GitHub Pages
uses: dmnemec/copy_file_to_another_repo_action@v1.0.4
env:
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
with:
source_file: 'metafix-vsc/fix.vsix'
destination_repo: 'metafacture/metafacture.github.io'
destination_branch: main
destination_folder: 'ide-extensions'
user_email: '${{ github.actor }}@users.noreply.github.com'
user_name: '${{ github.actor }}'
18 changes: 16 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
target/

# Ignore temporary gradle files:
.gradle
.gradle/
.gradletasknamecache
build
build/

# Ignore tmp directory
tmp
Expand Down Expand Up @@ -53,3 +53,17 @@ buildbot.keyring
# Ignore files with sensitive data
gradle.properties
secring.gpg

# Ignore metafacture-fix files
*.jfr
*.vsix
generated/
node_modules/
package-lock.json
xtext-gen/
xtext-server/
/metafix/src/test/resources/org/metafacture/metafix/integration/**/*.diff
/metafix/src/test/resources/org/metafacture/metafix/integration/**/*.err
/metafix/src/test/resources/org/metafacture/metafix/integration/**/*.out
/metafix/src/test/resources/org/metafacture/metafix/integration/**/output-*
!/metafix/src/test/resources/org/metafacture/metafix/integration/**/expected.err
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ As a general rule, we don't change public commit history, i.e. we don’t use ``

#### Code Formatting and Quality

Please format your code according to [this EditorConfig file](https://github.com/metafacture/metafacture-fix/blob/master/.editorconfig) and consider our current [code quality and style guidelines](https://github.com/metafacture/metafacture-core/wiki/Code-Quality-and-Style).
Please format your code according to [this EditorConfig file](https://github.com/metafacture/metafacture-core/blob/master/.editorconfig) and consider our current [code quality and style guidelines](https://github.com/metafacture/metafacture-core/wiki/Code-Quality-and-Style).

The [metafacture-fix build](https://github.com/metafacture/metafacture-fix/blob/master/build.gradle) performs automated [EditorConfig](https://github.com/metafacture/metafacture-fix/blob/master/.editorconfig) and [Checkstyle](https://github.com/metafacture/metafacture-fix/blob/master/config/checkstyle/checkstyle.xml) checks.
The [metafacture-core build](https://github.com/metafacture/metafacture-core/blob/master/build.gradle) performs automated [EditorConfig](https://github.com/metafacture/metafacture-core/blob/master/.editorconfig) and [Checkstyle](https://github.com/metafacture/metafacture-core/blob/master/config/checkstyle/checkstyle.xml) checks.

The code is automatically [quality-checked on sonarcloud.io](https://sonarcloud.io/dashboard?id=org.metafacture%3Ametafacture-core) when pushed to GitHub.

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Apache License
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

Expand Down
Loading
Loading