Skip to content

Commit 4f01a5e

Browse files
authored
fix .editorconfig and apply code-style (#322)
1 parent bf48078 commit 4f01a5e

File tree

58 files changed

+2090
-1162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2090
-1162
lines changed

.editorconfig

Lines changed: 460 additions & 129 deletions
Large diffs are not rendered by default.
Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,59 @@
11
{
2-
"max_tags_to_fetch": 200,
3-
"max_pull_requests": 200,
4-
"max_back_track_time_days": 365,
5-
"exclude_merge_branches": [],
6-
"sort": "ASC",
7-
"template": "${{CHANGELOG}}",
8-
"pr_template": "* ${{TITLE}} by @${{AUTHOR}} (#${{NUMBER}})",
9-
"empty_template": "- no changes",
10-
"categories": [
2+
"max_tags_to_fetch" : 200,
3+
"max_pull_requests" : 200,
4+
"max_back_track_time_days" : 365,
5+
"exclude_merge_branches" : [],
6+
"sort" : "ASC",
7+
"template" : "${{CHANGELOG}}",
8+
"pr_template" : "* ${{TITLE}} by @${{AUTHOR}} (#${{NUMBER}})",
9+
"empty_template" : "- no changes",
10+
"categories" : [
1111
{
12-
"title": "## Features",
13-
"labels": ["feature", "enhancement"]
12+
"title" : "## Features",
13+
"labels" : [
14+
"feature",
15+
"enhancement"
16+
]
1417
},
1518
{
16-
"title": "## API-Alignment\n\nAdjust API to match as much as possible to the one of [@neo4j/graphql](https://github.com/neo4j/graphql)",
17-
"labels": ["API-Alignment"]
19+
"title" : "## API-Alignment\n\nAdjust API to match as much as possible to the one of [@neo4j/graphql](https://github.com/neo4j/graphql)",
20+
"labels" : [
21+
"API-Alignment"
22+
]
1823
},
1924
{
20-
"title": "## Fixes",
21-
"labels": ["fix"]
25+
"title" : "## Fixes",
26+
"labels" : [
27+
"fix"
28+
]
2229
},
2330
{
24-
"title": "## Documentation",
25-
"labels": ["doc"]
31+
"title" : "## Documentation",
32+
"labels" : [
33+
"doc"
34+
]
2635
},
2736
{
28-
"title": "## Tests",
29-
"labels": ["test"]
37+
"title" : "## Tests",
38+
"labels" : [
39+
"test"
40+
]
3041
},
3142
{
32-
"title": "## Updated dependencies",
33-
"labels": ["dependencies"]
43+
"title" : "## Updated dependencies",
44+
"labels" : [
45+
"dependencies"
46+
]
3447
}
3548
],
36-
"ignore_labels": [
49+
"ignore_labels" : [
3750
"ignore"
3851
],
39-
"label_extractor": [ ],
40-
"duplicate_filter": null,
41-
"transformers": [],
42-
"tag_resolver": {
43-
"method": "semver"
52+
"label_extractor" : [],
53+
"duplicate_filter" : null,
54+
"transformers" : [],
55+
"tag_resolver" : {
56+
"method" : "semver"
4457
},
45-
"base_branches": []
58+
"base_branches" : []
4659
}

.github/workflows/pr-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
java-version: 17
2121
distribution: adopt
2222
- name: Run Maven build
23-
run: ./mvnw --no-transfer-progress -Dneo4j-graphql-java.integration-tests=true -Dneo4j-graphql-java.generate-test-file-diff=false -Dneo4j-graphql-java.flatten-tests=true clean compile test
23+
run: ./mvnw --no-transfer-progress -Dneo4j-graphql-java.integration-tests=true -Dneo4j-graphql-java.generate-test-file-diff=false -Dneo4j-graphql-java.flatten-tests=true clean compile test
2424
- name: Publish Unit Test Results
2525
uses: EnricoMi/publish-unit-test-result-action@v1
2626
if: always()

.github/workflows/release-changelog.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ jobs:
1111
steps:
1212
- name: Check out repository code
1313
uses: actions/checkout@v2
14-
with :
15-
fetch-depth : 0
16-
- name : Build Changelog
17-
id : build_changelog
18-
uses : mikepenz/release-changelog-builder-action@v1
19-
with :
20-
configuration : ".github/workflows/changelog-configuration.json"
21-
env :
22-
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
14+
with:
15+
fetch-depth: 0
16+
- name: Build Changelog
17+
id: build_changelog
18+
uses: mikepenz/release-changelog-builder-action@v1
19+
with:
20+
configuration: ".github/workflows/changelog-configuration.json"
21+
env:
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2323
- name: update release
2424
id: update_release
2525
uses: tubone24/update_release@v1.2.0

.mvn/wrapper/MavenWrapperDownloader.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
import java.net.*;
1718
import java.io.*;
1819
import java.nio.channels.*;
@@ -25,7 +26,7 @@ public class MavenWrapperDownloader {
2526
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
2627
*/
2728
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
28-
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
29+
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
2930

3031
/**
3132
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
@@ -54,7 +55,7 @@ public static void main(String args[]) {
5455
// wrapperUrl parameter.
5556
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
5657
String url = DEFAULT_DOWNLOAD_URL;
57-
if(mavenWrapperPropertyFile.exists()) {
58+
if (mavenWrapperPropertyFile.exists()) {
5859
FileInputStream mavenWrapperPropertyFileInputStream = null;
5960
try {
6061
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
@@ -65,7 +66,7 @@ public static void main(String args[]) {
6566
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
6667
} finally {
6768
try {
68-
if(mavenWrapperPropertyFileInputStream != null) {
69+
if (mavenWrapperPropertyFileInputStream != null) {
6970
mavenWrapperPropertyFileInputStream.close();
7071
}
7172
} catch (IOException e) {
@@ -76,8 +77,8 @@ public static void main(String args[]) {
7677
System.out.println("- Downloading from: " + url);
7778

7879
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
79-
if(!outputFile.getParentFile().exists()) {
80-
if(!outputFile.getParentFile().mkdirs()) {
80+
if (!outputFile.getParentFile().exists()) {
81+
if (!outputFile.getParentFile().mkdirs()) {
8182
System.out.println(
8283
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
8384
}

0 commit comments

Comments
 (0)