Merge branch 'release/v1.1.1' into 'develop'

Merge back Release/v1.1.1

See merge request !69

robert-crypto-grpc-server/src/main/java/fr/gouv/stopc/robert/crypto/grpc/server/service/ICryptoServerConfigurationService.java

@@ -2,7 +2,6 @@ package fr.gouv.stopc.robert.crypto.grpc.server.service;
 
 public interface ICryptoServerConfigurationService {
 
-
 	/**
 	 * TpStart in NTP seconds
 	 * 

robert-crypto-grpc-server/src/main/java/fr/gouv/stopc/robert/crypto/grpc/server/service/impl/CryptoGrpcServiceBaseImpl.java

@@ -414,7 +414,6 @@ public class CryptoGrpcServiceBaseImpl extends CryptoGrpcServiceImplImplBase {
                         true,
                         false,
                         enableEpochOverlapping, adjacentEpochMatchEnum);
-
             } else {
                 return manageEBIDDecryptRetry(ebid,
                         authRequestEpoch,
@@ -452,7 +451,6 @@ public class CryptoGrpcServiceBaseImpl extends CryptoGrpcServiceImplImplBase {
         switch (adjacentEpochMatchEnum) {
             case PREVIOUS:
                 log.warn("Retrying ebid decrypt with previous epoch");
-
                 return decryptEBIDAndCheckEpoch(ebid, authRequestEpoch - 1, false, false, false, AdjacentEpochMatchEnum.NONE);
             case NEXT:
                 log.warn("Retrying ebid decrypt with next epoch");

robert-crypto-grpc-server/src/main/java/fr/gouv/stopc/robert/crypto/grpc/server/service/impl/CryptoServerConfigurationServiceImpl.java

@@ -19,7 +19,6 @@ import fr.gouv.stopc.robert.server.common.utils.TimeUtils;
 @Service
 public class CryptoServerConfigurationServiceImpl implements ICryptoServerConfigurationService {
 
-
 	private long timeStartNtp;
 
 	private final PropertyLoader propertyLoader;

robert-crypto-grpc-server/src/test/java/test/fr/gouv/stopc/robert/crypto/grpc/server/CryptoServiceGrpcServerTest.java

@@ -1487,7 +1487,6 @@ class CryptoServiceGrpcServerTest {
 //        when(this.cryptographicStorageService.getServerKey(epochId, time, true)).thenReturn(serverKeys[1]);
         when(this.cryptographicStorageService.getFederationKey()).thenReturn(this.federationKey);
 
-
         byte[] mac;
         byte[] ecc;
         try {
@@ -1662,7 +1661,6 @@ class CryptoServiceGrpcServerTest {
             return;
         }
 
-
         // Given
         GetInfoFromHelloMessageRequest request = GetInfoFromHelloMessageRequest
                 .newBuilder()

robert-server-batch/src/main/resources/application.properties

@@ -40,4 +40,3 @@ robert.protocol.hello-message-timestamp-tolerance=${ROBERT_PROTOCOL_HELLO_TOLERA
 robert.server.country-code=${ROBERT_SERVER_COUNTRY_CODE:0x21}
 
 robert.protocol.contagious-period=${ROBERT_PROTOCOL_CONTAGIOUS_PERIOD:14}
-

robert-server-common/src/main/java/fr/gouv/stopc/robert/server/common/utils/TimeUtils.java

@@ -121,6 +121,5 @@ public final class TimeUtils {
             }
         }
         return false;
-
     }
 }

robert-server-ws-rest/src/main/java/fr/gouv/stopc/robertserver/ws/service/impl/AuthRequestValidationServiceImpl.java

@@ -15,7 +15,6 @@ import com.google.protobuf.ByteString;
 
 import fr.gouv.stopc.robert.crypto.grpc.server.client.service.ICryptoServerGrpcClient;
 import fr.gouv.stopc.robert.crypto.grpc.server.messaging.*;
-
 import fr.gouv.stopc.robert.server.common.DigestSaltEnum;
 import fr.gouv.stopc.robert.server.common.service.IServerConfigurationService;
 import fr.gouv.stopc.robert.server.common.utils.ByteUtils;