Fix code formatting

DP-3T · Mar 16, 2021 · 3db3474 · 3db3474
1 parent 3a7d712
commit 3db3474
Show file tree

Hide file tree

Showing 11 changed files with 88 additions and 91 deletions.
diff --git a/...ckend-sdk-data/src/main/java/org/dpppt/backend/sdk/data/gaen/JdbcGaenDataServiceImpl.java b/...ckend-sdk-data/src/main/java/org/dpppt/backend/sdk/data/gaen/JdbcGaenDataServiceImpl.java
@@ -316,11 +316,11 @@ private void internalUpsertKey(
               + " :rolling_start_number, :rolling_period, :received_at, cast(:origin as"
               + " varchar(10)), :share_with_federation_gateway, cast(:batch_tag as varchar(50))))"
               + " as vals(key, rolling_start_number, rolling_period, received_at, origin,"
-              + " share_with_federation_gateway, batch_tag) on t_gaen_exposed.key = vals.key"
-              + " when not matched then insert (key, rolling_start_number, rolling_period,"
-              + " received_at, origin, share_with_federation_gateway, batch_tag)"
-              + " values (vals.key, vals.rolling_start_number, vals.rolling_period,"
-              + " vals.received_at, vals.origin, vals.share_with_federation_gateway, vals.batch_tag)";
+              + " share_with_federation_gateway, batch_tag) on t_gaen_exposed.key = vals.key when"
+              + " not matched then insert (key, rolling_start_number, rolling_period, received_at,"
+              + " origin, share_with_federation_gateway, batch_tag) values (vals.key,"
+              + " vals.rolling_start_number, vals.rolling_period, vals.received_at, vals.origin,"
+              + " vals.share_with_federation_gateway, vals.batch_tag)";
     }
 
     MapSqlParameterSource params = new MapSqlParameterSource();

diff --git a/...ackend-sdk-data/src/main/java/org/dpppt/backend/sdk/data/interops/SyncLogDataService.java b/...ackend-sdk-data/src/main/java/org/dpppt/backend/sdk/data/interops/SyncLogDataService.java
@@ -16,8 +16,8 @@
 public interface SyncLogDataService {
 
   /**
-   * returns the latest batch tag for the given `uploadDate` or null if no batches have been downloaded
-   * yet
+   * returns the latest batch tag for the given `uploadDate` or null if no batches have been
+   * downloaded yet
    *
    * @param uploadDate
    * @return

diff --git a/...t-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/model/HubConfigs.java b/...t-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/model/HubConfigs.java
@@ -11,8 +11,7 @@ public List<EfgsGatewayConfig> getEfgsGateways() {
     return efgsGateways;
   }
 
-  public void setEfgsGateways(
-      List<EfgsGatewayConfig> efgsGateways) {
+  public void setEfgsGateways(List<EfgsGatewayConfig> efgsGateways) {
     this.efgsGateways = efgsGateways;
   }
 }
diff --git a/...rops/src/main/java/org/dpppt/backend/sdk/interops/syncer/efgs/signing/CryptoProvider.java b/...rops/src/main/java/org/dpppt/backend/sdk/interops/syncer/efgs/signing/CryptoProvider.java
@@ -22,7 +22,8 @@ public class CryptoProvider {
   private final X509Certificate publicKey;
 
   /** Creates a CryptoProvider, using {@link BouncyCastleProvider}. */
-  public CryptoProvider(String signClientCert, String signClientCertPassword) throws CertificateException {
+  public CryptoProvider(String signClientCert, String signClientCertPassword)
+      throws CertificateException {
     privateKey = loadPrivateKey(signClientCertPassword);
     publicKey = loadPublicKey(signClientCert);
     Security.addProvider(new BouncyCastleProvider());

diff --git a/...k-interops/src/test/java/org/dpppt/backend/sdk/interops/config/GaenDataServiceConfig.java b/...k-interops/src/test/java/org/dpppt/backend/sdk/interops/config/GaenDataServiceConfig.java
@@ -18,8 +18,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 public class GaenDataServiceConfig {

diff --git a/...nterops/src/test/java/org/dpppt/backend/sdk/interops/config/SyncLogDataServiceConfig.java b/...nterops/src/test/java/org/dpppt/backend/sdk/interops/config/SyncLogDataServiceConfig.java
@@ -16,7 +16,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 public class SyncLogDataServiceConfig {

diff --git a/...-sdk-model/src/main/java/org/dpppt/backend/sdk/model/interops/FederationSyncLogEntry.java b/...-sdk-model/src/main/java/org/dpppt/backend/sdk/model/interops/FederationSyncLogEntry.java
@@ -4,76 +4,76 @@
 import org.dpppt.backend.sdk.utils.UTCInstant;
 
 public class FederationSyncLogEntry {
-      private Integer id;
-      private String gateway;
-      private SyncAction action;
-      private String batchTag;
-      private LocalDate uploadDate;
-      private UTCInstant startTime;
-      private UTCInstant endTime;
-      private SyncState state;
-
-      public Integer getId() {
-            return id;
-      }
-
-      public void setId(Integer id) {
-            this.id = id;
-      }
-
-      public String getGateway() {
-            return gateway;
-      }
-
-      public void setGateway(String gateway) {
-            this.gateway = gateway;
-      }
-
-      public SyncAction getAction() {
-            return action;
-      }
-
-      public void setAction(SyncAction action) {
-            this.action = action;
-      }
-
-      public String getBatchTag() {
-            return batchTag;
-      }
-
-      public void setBatchTag(String batchTag) {
-            this.batchTag = batchTag;
-      }
-
-      public LocalDate getUploadDate() {
-            return uploadDate;
-      }
-
-      public void setUploadDate(LocalDate uploadDate) {
-            this.uploadDate = uploadDate;
-      }
-
-      public UTCInstant getStartTime() {
-            return startTime;
-      }
-
-      public void setStartTime(UTCInstant startTime) {
-            this.startTime = startTime;
-      }
-
-      public UTCInstant getEndTime() {
-            return endTime;
-      }
-
-      public void setEndTime(UTCInstant endTime) {
-            this.endTime = endTime;
-      }
-
-      public SyncState getState() {
-            return state;
-      }
-
-      public void setState(SyncState state) {
-            this.state = state;
-      }
+  private Integer id;
+  private String gateway;
+  private SyncAction action;
+  private String batchTag;
+  private LocalDate uploadDate;
+  private UTCInstant startTime;
+  private UTCInstant endTime;
+  private SyncState state;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getGateway() {
+    return gateway;
+  }
+
+  public void setGateway(String gateway) {
+    this.gateway = gateway;
+  }
+
+  public SyncAction getAction() {
+    return action;
+  }
+
+  public void setAction(SyncAction action) {
+    this.action = action;
+  }
+
+  public String getBatchTag() {
+    return batchTag;
+  }
+
+  public void setBatchTag(String batchTag) {
+    this.batchTag = batchTag;
+  }
+
+  public LocalDate getUploadDate() {
+    return uploadDate;
+  }
+
+  public void setUploadDate(LocalDate uploadDate) {
+    this.uploadDate = uploadDate;
+  }
+
+  public UTCInstant getStartTime() {
+    return startTime;
+  }
+
+  public void setStartTime(UTCInstant startTime) {
+    this.startTime = startTime;
+  }
+
+  public UTCInstant getEndTime() {
+    return endTime;
+  }
+
+  public void setEndTime(UTCInstant endTime) {
+    this.endTime = endTime;
+  }
+
+  public SyncState getState() {
+    return state;
+  }
+
+  public void setState(SyncState state) {
+    this.state = state;
+  }
 }
diff --git a/...pppt-backend-sdk-model/src/main/java/org/dpppt/backend/sdk/model/interops/SyncAction.java b/...pppt-backend-sdk-model/src/main/java/org/dpppt/backend/sdk/model/interops/SyncAction.java
@@ -1,5 +1,6 @@
 package org.dpppt.backend.sdk.model.interops;
 
 public enum SyncAction {
-  UPLOAD, DOWNLOAD;
+  UPLOAD,
+  DOWNLOAD;
 }
diff --git a/...dpppt-backend-sdk-model/src/main/java/org/dpppt/backend/sdk/model/interops/SyncState.java b/...dpppt-backend-sdk-model/src/main/java/org/dpppt/backend/sdk/model/interops/SyncState.java
@@ -1,5 +1,6 @@
 package org.dpppt.backend.sdk.model.interops;
 
 public enum SyncState {
-  ERROR, DONE;
+  ERROR,
+  DONE;
 }
diff --git a/...-backend-sdk-ws/src/test/java/org/dpppt/backend/sdk/ws/controller/BaseControllerTest.java b/...-backend-sdk-ws/src/test/java/org/dpppt/backend/sdk/ws/controller/BaseControllerTest.java
@@ -94,8 +94,7 @@ public abstract class BaseControllerTest {
 
   @Autowired ProtoSignature signer;
   @Autowired KeyVault keyVault;
-  @Autowired
-  GaenDataService gaenDataService;
+  @Autowired GaenDataService gaenDataService;
 
   protected TestJdbcGaen testGaenDataService;
 

diff --git a/...ackend-sdk-ws/src/test/java/org/dpppt/backend/sdk/ws/controller/GaenV2ControllerTest.java b/...ackend-sdk-ws/src/test/java/org/dpppt/backend/sdk/ws/controller/GaenV2ControllerTest.java
@@ -59,8 +59,7 @@
 public class GaenV2ControllerTest extends BaseControllerTest {
   @Autowired ProtoSignature signer;
   @Autowired KeyVault keyVault;
-  @Autowired
-  GaenDataService gaenDataService;
+  @Autowired GaenDataService gaenDataService;
 
   Duration releaseBucketDuration = Duration.ofMillis(7200000L);