Skip to content

Commit 39b5c10

Browse files
JPercivalJPercival
authored
Add spotless and format all files (#1306)
* Add spotless and format all files * Fix spotless check action * Fix spotless check * remove dead code
1 parent aa89588 commit 39b5c10

File tree

686 files changed

+22286
-16716
lines changed

Some content is hidden

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

686 files changed

+22286
-16716
lines changed

‎.github/workflows/check-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup and execute Gradle 'check' task
2222
uses: gradle/gradle-build-action@v2
2323
with:
24-
arguments: check
24+
arguments: check -x spotlessCheck # there's a separate action for spotless, this way unit tests can be run in parallel
2525
build-root-directory: Src/java
2626
- name: Publish Test Report
2727
uses: mikepenz/action-junit-report@v3

‎.github/workflows/spotless.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: gradle spotlessCheck (Formatting)
2+
3+
on:
4+
pull_request:
5+
types: [opened, reopened, synchronize]
6+
7+
jobs:
8+
format-check:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
pull-requests: write
12+
steps:
13+
- uses: actions/checkout@v3
14+
- uses: actions/setup-java@v4
15+
with:
16+
distribution: 'temurin'
17+
java-version: '21'
18+
- name: Run gradle spotlessCheck
19+
uses: gradle/gradle-build-action@v2
20+
with:
21+
arguments: spotlessCheck
22+
build-root-directory: Src/java
23+
- uses: mshick/add-pr-comment@v2
24+
if: always()
25+
with:
26+
message-success: |
27+
Formatting check succeeded!
28+
message-failure: |
29+
**This Pull Request has failed the formatting check**
30+
31+
Please run `gradlew spotlessApply` to fix the formatting issues.

‎Src/java/buildSrc/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ repositories {
1010
dependencies {
1111
implementation 'ru.vyarus:gradle-animalsniffer-plugin:1.7.0'
1212
implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.14'
13+
implementation 'com.diffplug.spotless:spotless-plugin-gradle:6.23.3'
1314
}

‎Src/java/buildSrc/src/main/groovy/cql.java-conventions.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
id 'jacoco'
55
id 'signing'
66
id 'cql.sca-conventions'
7+
id 'com.diffplug.spotless'
78
}
89

910
java {
@@ -75,6 +76,13 @@ tasks.named('test', Test) {
7576
useTestNG()
7677
}
7778

79+
spotless {
80+
java {
81+
targetExclude '**/generated/**'
82+
palantirJavaFormat()
83+
}
84+
}
85+
7886
/*
7987
A few things:
8088
- You must have an OSSRH Jira account (https://issues.sonatype.org/secure/Signup!default.jspa)
@@ -133,6 +141,9 @@ publishing {
133141
developer {
134142
name = 'Marc Hadley'
135143
}
144+
developer {
145+
name = 'Jonathan Percival'
146+
}
136147
}
137148
}
138149
}

‎Src/java/cqf-fhir-npm/src/main/java/org/cqframework/fhir/npm/ILibraryReader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.io.IOException;
44
import java.io.InputStream;
5-
65
import org.hl7.fhir.exceptions.FHIRFormatError;
76
import org.hl7.fhir.r5.model.Library;
87

‎Src/java/cqf-fhir-npm/src/main/java/org/cqframework/fhir/npm/LibraryLoader.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
import java.io.IOException;
44
import java.io.InputStream;
5-
65
import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_14_50;
7-
import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_40_50;
86
import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_30_50;
7+
import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_40_50;
98
import org.hl7.fhir.convertors.conv14_50.VersionConvertor_14_50;
109
import org.hl7.fhir.convertors.conv30_50.VersionConvertor_30_50;
1110
import org.hl7.fhir.convertors.conv40_50.VersionConvertor_40_50;
@@ -27,7 +26,8 @@ public Library readLibrary(InputStream stream) throws FHIRFormatError, IOExcepti
2726
if (VersionUtilities.isR2Ver(version)) {
2827
throw new FHIRException("Library is not supported in R2");
2928
} else if (VersionUtilities.isR2BVer(version)) {
30-
org.hl7.fhir.dstu2016may.model.Resource res = new org.hl7.fhir.dstu2016may.formats.JsonParser().parse(stream);
29+
org.hl7.fhir.dstu2016may.model.Resource res =
30+
new org.hl7.fhir.dstu2016may.formats.JsonParser().parse(stream);
3131
VersionConvertor_14_50 versionConvertor_14_50 = new VersionConvertor_14_50(new BaseAdvisor_14_50());
3232
return (Library) versionConvertor_14_50.convertResource(res);
3333
} else if (VersionUtilities.isR3Ver(version)) {
@@ -41,7 +41,7 @@ public Library readLibrary(InputStream stream) throws FHIRFormatError, IOExcepti
4141
} else if (VersionUtilities.isR5Ver(version)) {
4242
return (Library) new org.hl7.fhir.r5.formats.JsonParser().parse(stream);
4343
} else {
44-
throw new FHIRException("Unknown Version '"+version+"'");
44+
throw new FHIRException("Unknown Version '" + version + "'");
4545
}
4646
}
4747
}

‎Src/java/cqf-fhir-npm/src/main/java/org/cqframework/fhir/npm/NpmLibrarySourceProvider.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.io.IOException;
55
import java.io.InputStream;
66
import java.util.List;
7-
87
import org.cqframework.cql.cql2elm.LibrarySourceProvider;
98
import org.hl7.elm.r1.VersionedIdentifier;
109
import org.hl7.fhir.r5.context.IWorkerContext;
@@ -16,7 +15,8 @@
1615
*/
1716
public class NpmLibrarySourceProvider implements LibrarySourceProvider {
1817

19-
public NpmLibrarySourceProvider(List<NpmPackage> packages, ILibraryReader reader, IWorkerContext.ILoggingService logger) {
18+
public NpmLibrarySourceProvider(
19+
List<NpmPackage> packages, ILibraryReader reader, IWorkerContext.ILoggingService logger) {
2020
this.packages = packages;
2121
this.reader = reader;
2222
this.logger = logger;
@@ -43,7 +43,9 @@ public InputStream getLibrarySource(VersionedIdentifier identifier) {
4343
libraryIdentifier.setSystem(p.canonical());
4444
}
4545

46-
InputStream s = p.loadByCanonicalVersion(libraryIdentifier.getSystem()+"/Library/"+libraryIdentifier.getId(), libraryIdentifier.getVersion());
46+
InputStream s = p.loadByCanonicalVersion(
47+
libraryIdentifier.getSystem() + "/Library/" + libraryIdentifier.getId(),
48+
libraryIdentifier.getVersion());
4749
if (s != null) {
4850
Library l = reader.readLibrary(s);
4951
for (org.hl7.fhir.r5.model.Attachment a : l.getContent()) {
@@ -56,11 +58,14 @@ public InputStream getLibrarySource(VersionedIdentifier identifier) {
5658
}
5759
}
5860
} catch (IOException e) {
59-
logger.logDebugMessage(IWorkerContext.ILoggingService.LogCategory.PROGRESS, String.format("Exceptions occurred attempting to load npm library source for %s", identifier.toString()));
61+
logger.logDebugMessage(
62+
IWorkerContext.ILoggingService.LogCategory.PROGRESS,
63+
String.format(
64+
"Exceptions occurred attempting to load npm library source for %s",
65+
identifier.toString()));
6066
}
6167
}
6268

6369
return null;
6470
}
6571
}
66-

‎Src/java/cqf-fhir-npm/src/main/java/org/cqframework/fhir/npm/NpmModelInfoProvider.java

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
package org.cqframework.fhir.npm;
22

33
import jakarta.xml.bind.JAXB;
4+
import java.io.ByteArrayInputStream;
5+
import java.io.IOException;
6+
import java.io.InputStream;
7+
import java.util.List;
48
import org.hl7.cql.model.ModelIdentifier;
59
import org.hl7.cql.model.ModelInfoProvider;
610
import org.hl7.elm_modelinfo.r1.ModelInfo;
711
import org.hl7.fhir.r5.context.IWorkerContext;
812
import org.hl7.fhir.r5.model.Library;
913
import org.hl7.fhir.utilities.npm.NpmPackage;
1014

11-
import java.io.ByteArrayInputStream;
12-
import java.io.IOException;
13-
import java.io.InputStream;
14-
import java.util.List;
15-
1615
/**
1716
* Provides a model info provider that can resolve CQL model info from an Npm package
1817
*/
1918
public class NpmModelInfoProvider implements ModelInfoProvider {
2019

21-
public NpmModelInfoProvider(List<NpmPackage> packages, ILibraryReader reader, IWorkerContext.ILoggingService logger) {
20+
public NpmModelInfoProvider(
21+
List<NpmPackage> packages, ILibraryReader reader, IWorkerContext.ILoggingService logger) {
2222
this.packages = packages;
2323
this.reader = reader;
2424
this.logger = logger;
@@ -43,7 +43,9 @@ public ModelInfo load(ModelIdentifier modelIdentifier) {
4343
identifier.setSystem(p.canonical());
4444
}
4545

46-
InputStream s = p.loadByCanonicalVersion(identifier.getSystem()+"/Library/"+identifier.getId()+"-ModelInfo", identifier.getVersion());
46+
InputStream s = p.loadByCanonicalVersion(
47+
identifier.getSystem() + "/Library/" + identifier.getId() + "-ModelInfo",
48+
identifier.getVersion());
4749
if (s != null) {
4850
Library l = reader.readLibrary(s);
4951
for (org.hl7.fhir.r5.model.Attachment a : l.getContent()) {
@@ -57,11 +59,14 @@ public ModelInfo load(ModelIdentifier modelIdentifier) {
5759
}
5860
}
5961
} catch (IOException e) {
60-
logger.logDebugMessage(IWorkerContext.ILoggingService.LogCategory.PROGRESS, String.format("Exceptions occurred attempting to load npm library for model %s", modelIdentifier.toString()));
62+
logger.logDebugMessage(
63+
IWorkerContext.ILoggingService.LogCategory.PROGRESS,
64+
String.format(
65+
"Exceptions occurred attempting to load npm library for model %s",
66+
modelIdentifier.toString()));
6167
}
6268
}
6369

6470
return null;
6571
}
6672
}
67-

0 commit comments

Comments
 (0)