Merge pull request #326 from webauthn4j/correct-errors

Correct errors

Author: ynojima

build.gradle

@@ -16,12 +16,12 @@
 
 buildscript {
     def springBootVersion = '2.3.0.RELEASE'
-    def sonarqubeVersion = "2.8.0.1969"
-    def asciidoctorGradleVersion="1.6.1"
-    def artifactoryVersion="4.15.2"
-    def bintrayVersion = "1.8.5"
-    def owaspDependencyCheckVersion = "5.3.2.1"
-    def httpBuilderVersion = "0.7.2"
+    def sonarqubeVersion = '2.8.0.1969'
+    def asciidoctorGradleVersion='1.6.1'
+    def artifactoryVersion='4.15.2'
+    def bintrayVersion = '1.8.5'
+    def owaspDependencyCheckVersion = '5.3.2.1'
+    def httpBuilderVersion = '0.7.2'
 
     repositories {
         mavenCentral()
@@ -74,7 +74,7 @@ subprojects {
     def springBootVersion = '2.3.0.RELEASE'
     def terasolunaVersion = '5.5.1.RELEASE'
     def thymeleafVersion = '3.0.4.RELEASE'
-    def modelMapperVersion = '0.7.8'
+    def modelMapperVersion = '2.3.7'
     def log4jdbcVersion = '0.2.7'
     def dbunitVersion = '2.7.0'
     def springTestDbunitVersion = '1.3.0'

gradle.properties

@@ -21,7 +21,11 @@ asciidoctorVersion='1.5.6'
 # SonarQube Configurations
 systemProp.sonar.projectKey=webauthn4j-spring-security
 # Disable some rules on some files
-systemProp.sonar.issue.ignore.multicriteria=j1
+systemProp.sonar.issue.ignore.multicriteria=j1,j2
 # Inheritance tree of classes should not be too deep
 systemProp.sonar.issue.ignore.multicriteria.j1.ruleKey=squid:MaximumInheritanceDepth
 systemProp.sonar.issue.ignore.multicriteria.j1.resourceKey=**/*.java
+
+# Inheritance tree of classes should not be too deep
+systemProp.sonar.issue.ignore.multicriteria.j2.ruleKey=S110
+systemProp.sonar.issue.ignore.multicriteria.j2.resourceKey=**/*.java

samples/fido-server-conformance-test-app/src/main/java/com/webauthn4j/springframework/security/webauthn/sample/domain/config/ModelMapperConfig.java

@@ -16,41 +16,22 @@
 
 package com.webauthn4j.springframework.security.webauthn.sample.domain.config;
 
-import com.webauthn4j.springframework.security.webauthn.sample.domain.entity.UserEntity;
-import com.webauthn4j.springframework.security.webauthn.sample.util.modelmapper.PageImplConverter;
-import com.webauthn4j.springframework.security.webauthn.sample.util.modelmapper.PageImplProvider;
 import com.webauthn4j.springframework.security.webauthn.sample.util.modelmapper.StringToChallengeConverter;
 import org.modelmapper.ModelMapper;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
 
 /**
  * ModelMapper Configuration
  */
 @Configuration
 public class ModelMapperConfig {
 
-
-    /**
-     * creates ModelMapper instance
-     *
-     * @return ModelMapper
-     */
-    public static ModelMapper createModelMapper() {
-        return new ModelMapperConfig().modelMapper();
-    }
-
     @Bean
     public ModelMapper modelMapper() {
         ModelMapper modelMapper = new ModelMapper();
-        modelMapper.addConverter(new PageImplConverter<UserEntity, UserEntity>(modelMapper));
         modelMapper.addConverter(new StringToChallengeConverter());
 
-        modelMapper.createTypeMap(Page.class, PageImpl.class).setProvider(new PageImplProvider());
-        modelMapper.getTypeMap(PageImpl.class, PageImpl.class).setProvider(new PageImplProvider());
-
         modelMapper.getConfiguration()
                 .setFieldMatchingEnabled(true)
                 .setFieldAccessLevel(org.modelmapper.config.Configuration.AccessLevel.PRIVATE);

samples/fido-server-conformance-test-app/src/main/java/com/webauthn4j/springframework/security/webauthn/sample/util/modelmapper/PageImplConverter.java

@@ -16,48 +16,27 @@
 
 package com.webauthn4j.springframework.security.webauthn.sample.domain.config;
 
-import com.webauthn4j.springframework.security.webauthn.sample.util.modelmapper.PageImplConverter;
-import com.webauthn4j.springframework.security.webauthn.sample.util.modelmapper.PageImplProvider;
 import com.webauthn4j.springframework.security.webauthn.sample.util.modelmapper.StringToChallengeConverter;
-import com.webauthn4j.springframework.security.webauthn.sample.domain.entity.UserEntity;
-import com.webauthn4j.springframework.security.webauthn.sample.util.modelmapper.*;
 import org.modelmapper.ModelMapper;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
 
 /**
  * ModelMapper Configuration
  */
 @Configuration
 public class ModelMapperConfig {
 
-
     @Bean
     public ModelMapper modelMapper() {
         ModelMapper modelMapper = new ModelMapper();
-        modelMapper.addConverter(new PageImplConverter<UserEntity, UserEntity>(modelMapper));
         modelMapper.addConverter(new StringToChallengeConverter());
 
-        modelMapper.createTypeMap(Page.class, PageImpl.class).setProvider(new PageImplProvider());
-        modelMapper.getTypeMap(PageImpl.class, PageImpl.class).setProvider(new PageImplProvider());
-
         modelMapper.getConfiguration()
                 .setFieldMatchingEnabled(true)
                 .setFieldAccessLevel(org.modelmapper.config.Configuration.AccessLevel.PRIVATE);
 
         return modelMapper;
     }
 
-
-    /**
-     * creates ModelMapper instance
-     *
-     * @return ModelMapper
-     */
-    public static ModelMapper createModelMapper() {
-        return new ModelMapperConfig().modelMapper();
-    }
-
 }

samples/fido-server-conformance-test-app/src/main/java/com/webauthn4j/springframework/security/webauthn/sample/util/modelmapper/PageImplProvider.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-include "webauthn4j-spring-security-core"
-include "webauthn4j-spring-security-thymeleaf"
-include "webauthn4j-spring-security-fido-server"
-include "webauthn4j-spring-security-test"
+include 'webauthn4j-spring-security-core'
+include 'webauthn4j-spring-security-thymeleaf'
+include 'webauthn4j-spring-security-fido-server'
+include 'webauthn4j-spring-security-test'
 
-include "samples:lib:spa-angular-client"
-include "samples:spa"
-include "samples:fido-server-conformance-test-app"
+include 'samples:lib:spa-angular-client'
+include 'samples:spa'
+include 'samples:fido-server-conformance-test-app'

samples/spa/src/main/java/com/webauthn4j/springframework/security/webauthn/sample/domain/config/ModelMapperConfig.java

@@ -110,13 +110,12 @@ public Authentication authenticate(Authentication authentication) {
         Authenticator authenticator = user.getAuthenticators().stream()
                 .filter(item -> Arrays.equals(item.getAttestedCredentialData().getCredentialId(), credentialId))
                 .findFirst()
-                .orElse(null);
+                .orElseThrow(()-> new IllegalStateException("credentialId doesn't match."));
 
         preAuthenticationChecks.check(user);
         doAuthenticate(authenticationToken, authenticator, user);
         postAuthenticationChecks.check(user);
 
-        //noinspection ConstantConditions
         authenticatorService.updateCounter(credentialId, authenticator.getCounter());
 
         Serializable principalToReturn = user;