Skip to content

Commit c3f7ef3

Browse files
jamesagnewjamesagnew
committed
Spotless
1 parent 3cdd233 commit c3f7ef3

20 files changed

+198
-163
lines changed

‎src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package ca.uhn.fhir.jpa.starter;
22

3-
43
import ca.uhn.fhir.context.FhirVersionEnum;
54
import ca.uhn.fhir.jpa.api.config.JpaStorageSettings.ClientIdStrategyEnum;
65
import ca.uhn.fhir.jpa.api.config.JpaStorageSettings.IdStrategyEnum;
@@ -89,7 +88,8 @@ public class AppProperties {
8988
private String app_content_path = null;
9089
private Boolean lastn_enabled = false;
9190
private boolean store_resource_in_lucene_index_enabled = false;
92-
private NormalizedQuantitySearchLevel normalized_quantity_search_level = NormalizedQuantitySearchLevel.NORMALIZED_QUANTITY_SEARCH_NOT_SUPPORTED;
91+
private NormalizedQuantitySearchLevel normalized_quantity_search_level =
92+
NormalizedQuantitySearchLevel.NORMALIZED_QUANTITY_SEARCH_NOT_SUPPORTED;
9393
private Boolean use_apache_address_strategy = false;
9494
private Boolean use_apache_address_strategy_https = false;
9595
private Integer bundle_batch_pool_size = 20;
@@ -109,7 +109,6 @@ public List<String> getCustomProviderClasses() {
109109
return custom_provider_classes;
110110
}
111111

112-
113112
public Boolean getOpenapi_enabled() {
114113
return openapi_enabled;
115114
}
@@ -174,7 +173,6 @@ public void setIps_enabled(Boolean ips_enabled) {
174173
this.ips_enabled = ips_enabled;
175174
}
176175

177-
178176
public Boolean getMdm_enabled() {
179177
return mdm_enabled;
180178
}
@@ -259,8 +257,7 @@ public ClientIdStrategyEnum getClient_id_strategy() {
259257
return client_id_strategy;
260258
}
261259

262-
public void setClient_id_strategy(
263-
ClientIdStrategyEnum client_id_strategy) {
260+
public void setClient_id_strategy(ClientIdStrategyEnum client_id_strategy) {
264261
this.client_id_strategy = client_id_strategy;
265262
}
266263

@@ -316,8 +313,7 @@ public Boolean getAllow_override_default_search_params() {
316313
return allow_override_default_search_params;
317314
}
318315

319-
public void setAllow_override_default_search_params(
320-
Boolean allow_override_default_search_params) {
316+
public void setAllow_override_default_search_params(Boolean allow_override_default_search_params) {
321317
this.allow_override_default_search_params = allow_override_default_search_params;
322318
}
323319

@@ -333,8 +329,7 @@ public Boolean getAuto_create_placeholder_reference_targets() {
333329
return auto_create_placeholder_reference_targets;
334330
}
335331

336-
public void setAuto_create_placeholder_reference_targets(
337-
Boolean auto_create_placeholder_reference_targets) {
332+
public void setAuto_create_placeholder_reference_targets(Boolean auto_create_placeholder_reference_targets) {
338333
this.auto_create_placeholder_reference_targets = auto_create_placeholder_reference_targets;
339334
}
340335

@@ -394,17 +389,15 @@ public Boolean getEnforce_referential_integrity_on_delete() {
394389
return enforce_referential_integrity_on_delete;
395390
}
396391

397-
public void setEnforce_referential_integrity_on_delete(
398-
Boolean enforce_referential_integrity_on_delete) {
392+
public void setEnforce_referential_integrity_on_delete(Boolean enforce_referential_integrity_on_delete) {
399393
this.enforce_referential_integrity_on_delete = enforce_referential_integrity_on_delete;
400394
}
401395

402396
public Boolean getEnforce_referential_integrity_on_write() {
403397
return enforce_referential_integrity_on_write;
404398
}
405399

406-
public void setEnforce_referential_integrity_on_write(
407-
Boolean enforce_referential_integrity_on_write) {
400+
public void setEnforce_referential_integrity_on_write(Boolean enforce_referential_integrity_on_write) {
408401
this.enforce_referential_integrity_on_write = enforce_referential_integrity_on_write;
409402
}
410403

@@ -612,7 +605,6 @@ public Set<String> getLogical_urls() {
612605
return logical_urls;
613606
}
614607

615-
616608
public Boolean getIg_runtime_upload_enabled() {
617609
return ig_runtime_upload_enabled;
618610
}
@@ -665,7 +657,8 @@ public Boolean getUserRequestRetryVersionConflictsInterceptorEnabled() {
665657
return userRequestRetryVersionConflictsInterceptorEnabled;
666658
}
667659

668-
public void setUserRequestRetryVersionConflictsInterceptorEnabled(Boolean userRequestRetryVersionConflictsInterceptorEnabled) {
660+
public void setUserRequestRetryVersionConflictsInterceptorEnabled(
661+
Boolean userRequestRetryVersionConflictsInterceptorEnabled) {
669662
this.userRequestRetryVersionConflictsInterceptorEnabled = userRequestRetryVersionConflictsInterceptorEnabled;
670663
}
671664

@@ -710,7 +703,8 @@ public static class Logger {
710703

711704
private String name = "fhirtest.access";
712705
private String error_format = "ERROR - ${requestVerb} ${requestUrl}";
713-
private String format = "Path[${servletPath}] Source[${requestHeader.x-forwarded-for}] Operation[${operationType} ${operationName} ${idOrResourceName}] UA[${requestHeader.user-agent}] Params[${requestParameters}] ResponseEncoding[${responseEncodingNoDefault}] Operation[${operationType} ${operationName} ${idOrResourceName}] UA[${requestHeader.user-agent}] Params[${requestParameters}] ResponseEncoding[${responseEncodingNoDefault}]";
706+
private String format =
707+
"Path[${servletPath}] Source[${requestHeader.x-forwarded-for}] Operation[${operationType} ${operationName} ${idOrResourceName}] UA[${requestHeader.user-agent}] Params[${requestParameters}] ResponseEncoding[${responseEncodingNoDefault}] Operation[${operationType} ${operationName} ${idOrResourceName}] UA[${requestHeader.user-agent}] Params[${requestParameters}] ResponseEncoding[${responseEncodingNoDefault}]";
714708
private Boolean log_exceptions = true;
715709

716710
public String getName() {
@@ -866,7 +860,8 @@ public Boolean getConditional_create_duplicate_identifiers_enabled() {
866860
return conditional_create_duplicate_identifiers_enabled;
867861
}
868862

869-
public void setConditional_create_duplicate_identifiers_enabled(Boolean conditional_create_duplicate_identifiers_enabled) {
863+
public void setConditional_create_duplicate_identifiers_enabled(
864+
Boolean conditional_create_duplicate_identifiers_enabled) {
870865
this.conditional_create_duplicate_identifiers_enabled = conditional_create_duplicate_identifiers_enabled;
871866
}
872867

@@ -909,7 +904,6 @@ public void setEmail(Email email) {
909904
this.email = email;
910905
}
911906

912-
913907
public static class Email {
914908
private String from;
915909
private String host;

‎src/main/java/ca/uhn/fhir/jpa/starter/Application.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public static void main(String[] args) {
4949
// UI is now accessible at http://localhost:8080/
5050
}
5151

52-
5352
@Autowired
5453
AutowireCapableBeanFactory beanFactory;
5554

@@ -64,5 +63,4 @@ public ServletRegistrationBean hapiServletRegistration(RestfulServer restfulServ
6463

6564
return servletRegistrationBean;
6665
}
67-
6866
}

‎src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/CdsHooksServlet.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
package ca.uhn.fhir.jpa.starter.cdshooks;
22

33
import ca.uhn.fhir.jpa.starter.AppProperties;
4+
import ca.uhn.fhir.rest.api.server.cdshooks.CdsServiceRequestJson;
45
import ca.uhn.fhir.rest.server.RestfulServer;
56
import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
67
import ca.uhn.hapi.fhir.cdshooks.api.ICdsServiceRegistry;
7-
import ca.uhn.fhir.rest.api.server.cdshooks.CdsServiceRequestJson;
88
import ca.uhn.hapi.fhir.cdshooks.api.json.CdsServiceResponseJson;
99
import ca.uhn.hapi.fhir.cdshooks.api.json.CdsServicesJson;
1010
import com.fasterxml.jackson.databind.ObjectMapper;
1111
import com.google.gson.GsonBuilder;
1212
import com.google.gson.JsonParser;
13+
import jakarta.servlet.ServletException;
14+
import jakarta.servlet.http.HttpServlet;
15+
import jakarta.servlet.http.HttpServletRequest;
16+
import jakarta.servlet.http.HttpServletResponse;
1317
import org.apache.http.entity.ContentType;
1418
import org.slf4j.Logger;
1519
import org.slf4j.LoggerFactory;
@@ -19,10 +23,6 @@
1923

2024
import java.io.IOException;
2125
import java.util.stream.Collectors;
22-
import jakarta.servlet.ServletException;
23-
import jakarta.servlet.http.HttpServlet;
24-
import jakarta.servlet.http.HttpServletRequest;
25-
import jakarta.servlet.http.HttpServletResponse;
2626

2727
import static ca.uhn.hapi.fhir.cdshooks.config.CdsHooksConfig.CDS_HOOKS_OBJECT_MAPPER_FACTORY;
2828

‎src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/ErrorHandling.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import ca.uhn.fhir.jpa.starter.AppProperties;
44
import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
5+
import jakarta.servlet.http.HttpServletResponse;
56

67
import java.io.IOException;
78
import java.io.PrintWriter;
89
import java.io.StringWriter;
910
import java.util.Arrays;
10-
import jakarta.servlet.http.HttpServletResponse;
1111

1212
public class ErrorHandling {
1313

0 commit comments

Comments
 (0)