From 85725a052cd4f40f2aa1f6328726da4a3ac7b31f Mon Sep 17 00:00:00 2001 From: Benjamin Eckstein <13351939+benjamineckstein@users.noreply.github.com> Date: Tue, 7 Jan 2020 15:56:05 +0100 Subject: [PATCH] TSK-1009: Fix more building errors after checkstyle changes --- .../simplehistory/query/HistoryQueryColumnName.java | 4 ++-- .../taskana/TaskHistoryEventControllerIntTest.java | 12 ++++++------ .../pro/taskana/ObjectReferenceQueryColumnName.java | 2 +- .../pro/taskana/mappings/ClassificationMapper.java | 2 +- .../pro/taskana/mappings/ObjectReferenceMapper.java | 2 +- .../main/java/pro/taskana/mappings/QueryMapper.java | 2 +- .../java/pro/taskana/mappings/TaskMonitorMapper.java | 2 +- .../pro/taskana/rest/ExampleRestApplication.java | 1 + .../java/pro/taskana/ldap/LdapCacheTestImpl.java | 10 +++++----- .../src/main/java/pro/taskana/rest/WebMvcConfig.java | 1 + .../src/main/java/pro/taskana/rest/models/User.java | 1 + .../pro/taskana/rest/security/WebSecurityConfig.java | 6 +++--- .../java/pro/taskana/jobs/AsyncUpdateJobIntTest.java | 6 +++--- .../pro/taskana/rest/ExampleRestApplication.java | 1 + .../java/pro/taskana/TaskanaWildFlyApplication.java | 4 +++- 15 files changed, 31 insertions(+), 25 deletions(-) diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/query/HistoryQueryColumnName.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/query/HistoryQueryColumnName.java index c370c867d..ef5f649ae 100644 --- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/query/HistoryQueryColumnName.java +++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/query/HistoryQueryColumnName.java @@ -3,8 +3,8 @@ package pro.taskana.simplehistory.query; import pro.taskana.QueryColumnName; /** - * Enum containing the column names for {@see - * pro.taskana.simplehistory.impl.mappings.HistoryQueryMapper#queryHistoryColumnValues}. + * Enum containing the column names for + * {@link pro.taskana.simplehistory.impl.mappings.HistoryQueryMapper#queryHistoryColumnValues}. * * @author bv */ diff --git a/history/taskana-simplehistory-spring-test/src/test/java/pro/taskana/TaskHistoryEventControllerIntTest.java b/history/taskana-simplehistory-spring-test/src/test/java/pro/taskana/TaskHistoryEventControllerIntTest.java index ee6172444..5904d266b 100644 --- a/history/taskana-simplehistory-spring-test/src/test/java/pro/taskana/TaskHistoryEventControllerIntTest.java +++ b/history/taskana-simplehistory-spring-test/src/test/java/pro/taskana/TaskHistoryEventControllerIntTest.java @@ -8,7 +8,6 @@ import static org.junit.Assert.fail; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import java.sql.SQLException; -import java.text.MessageFormat; import java.time.LocalDateTime; import java.util.Collections; import javax.sql.DataSource; @@ -51,8 +50,10 @@ public class TaskHistoryEventControllerIntTest { private static final Logger LOGGER = LoggerFactory.getLogger(TaskHistoryEventControllerIntTest.class); + @Value("${taskana.schemaName:TASKANA}") public String schemaName; + String server = "http://127.0.0.1:"; RestTemplate template; @@ -106,11 +107,10 @@ public class TaskHistoryEventControllerIntTest { public void testGetSpecificTaskHistoryEvent() { ResponseEntity response = template.exchange( - MessageFormat.format( - "{0}{1}/api/v1/task-history-event?" - + "business-process-id=BPI:01&sort-by=business-process-id&" - + "order=asc&page-size=6&page=1", - server, port), + server + + port + + "/api/v1/task-history-event?business-process-id=BPI:01" + + "&sort-by=business-process-id&order=asc&page-size=6&page=1", HttpMethod.GET, request, new ParameterizedTypeReference() {}); diff --git a/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQueryColumnName.java b/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQueryColumnName.java index d06923875..126d3b288 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQueryColumnName.java +++ b/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQueryColumnName.java @@ -1,7 +1,7 @@ package pro.taskana; /** - * Enum containing the column names for @see {@link + * Enum containing the column names for {@link * pro.taskana.mappings.QueryMapper#queryObjectReferenceColumnValues * (pro.taskana.impl.ObjectReferenceQueryImpl)}. * diff --git a/lib/taskana-core/src/main/java/pro/taskana/mappings/ClassificationMapper.java b/lib/taskana-core/src/main/java/pro/taskana/mappings/ClassificationMapper.java index cea180764..030abe6a1 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/mappings/ClassificationMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/ClassificationMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Update; import pro.taskana.impl.ClassificationImpl; /** This class is the mybatis mapping of classifications. */ -@SuppressWarnings({"checkstyle:LineLength", "checkstyle:indentation"}) +@SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"}) public interface ClassificationMapper { @Select( diff --git a/lib/taskana-core/src/main/java/pro/taskana/mappings/ObjectReferenceMapper.java b/lib/taskana-core/src/main/java/pro/taskana/mappings/ObjectReferenceMapper.java index f5af58bd9..ac9bc7c03 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/mappings/ObjectReferenceMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/ObjectReferenceMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Update; import pro.taskana.ObjectReference; /** This class is the mybatis mapping of ObjectReference. */ -@SuppressWarnings({"checkstyle:LineLength", "checkstyle:indentation"}) +@SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"}) public interface ObjectReferenceMapper { @Select( diff --git a/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java b/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java index 5c37eb94b..7b3f05b44 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java @@ -17,7 +17,7 @@ import pro.taskana.impl.WorkbasketQueryImpl; import pro.taskana.impl.WorkbasketSummaryImpl; /** This class provides a mapper for all queries. */ -@SuppressWarnings({"checkstyle:LineLength", "checkstyle:indentation"}) +@SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"}) public interface QueryMapper { String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.mappings.ObjectReferenceMapper.findById"; diff --git a/lib/taskana-core/src/main/java/pro/taskana/mappings/TaskMonitorMapper.java b/lib/taskana-core/src/main/java/pro/taskana/mappings/TaskMonitorMapper.java index 2ce971177..3dfaadd52 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/mappings/TaskMonitorMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/TaskMonitorMapper.java @@ -18,7 +18,7 @@ import pro.taskana.impl.report.item.TimestampQueryItem; import pro.taskana.report.Timestamp; /** This class is the mybatis mapping of task monitoring. */ -@SuppressWarnings({"checkstyle:LineLength", "checkstyle:indentation"}) +@SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"}) public interface TaskMonitorMapper { @Select( diff --git a/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/rest/ExampleRestApplication.java b/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/rest/ExampleRestApplication.java index f139ec553..afc11f972 100644 --- a/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/rest/ExampleRestApplication.java +++ b/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/rest/ExampleRestApplication.java @@ -25,6 +25,7 @@ import pro.taskana.sampledata.SampleDataGenerator; @SpringBootApplication @EnableScheduling @ComponentScan(basePackages = "pro.taskana") +@SuppressWarnings("checkstyle:Indentation") @Import({ TransactionalJobsConfiguration.class, LdapConfiguration.class, diff --git a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/ldap/LdapCacheTestImpl.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/ldap/LdapCacheTestImpl.java index 79f88618a..c2f10fa85 100644 --- a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/ldap/LdapCacheTestImpl.java +++ b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/ldap/LdapCacheTestImpl.java @@ -20,7 +20,7 @@ public class LdapCacheTestImpl implements LdapCache { /** * Dictionary is a {@link Map} collection that contains {@link AccessIdResource} as key (user) and - * {@link List} as value (groups of which the user is a member) . + * {@link List} as value (groups of which the user is a member) . */ private static Map> users; @@ -355,10 +355,10 @@ public class LdapCacheTestImpl implements LdapCache { }); int groupNumber = 0; - List group0 = new ArrayList<>(), - group1 = new ArrayList<>(), - group2 = new ArrayList<>(), - group3 = new ArrayList<>(); + List group0 = new ArrayList<>(); + List group1 = new ArrayList<>(); + List group2 = new ArrayList<>(); + List group3 = new ArrayList<>(); for (AccessIdResource group : groups) { switch (groupNumber) { diff --git a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/WebMvcConfig.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/WebMvcConfig.java index 63d0cb8eb..ad5d04370 100644 --- a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/WebMvcConfig.java +++ b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/WebMvcConfig.java @@ -11,6 +11,7 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + /** The Web MVC Configuration. */ @Configuration @EnableWebMvc diff --git a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/models/User.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/models/User.java index 56a9846fd..df3491ac4 100644 --- a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/models/User.java +++ b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/models/User.java @@ -1,4 +1,5 @@ package pro.taskana.rest.models; + /** model for a user. */ public class User { diff --git a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java index bb0371838..9a1623d43 100644 --- a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java +++ b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java @@ -56,7 +56,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Bean public FilterRegistrationBean corsFilter() { - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); CorsConfiguration config = new CorsConfiguration(); config.setAllowCredentials(true); config.addAllowedOrigin("*"); @@ -96,11 +96,11 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/h2-console/**") .permitAll(); } else { - AddLoginPageConfiguration(http); + addLoginPageConfiguration(http); } } - private void AddLoginPageConfiguration(HttpSecurity http) throws Exception { + private void addLoginPageConfiguration(HttpSecurity http) throws Exception { http.authorizeRequests() .anyRequest() .fullyAuthenticated() diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java index 2589f1815..fedf31309 100644 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java +++ b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java @@ -41,8 +41,8 @@ import pro.taskana.rest.resource.TaskResourceAssembler; webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) class AsyncUpdateJobIntTest { - private static final String CLASSIFICATION_ID = "CLI:100000000000000000000000000000000003"; static RestTemplate template; + private static final String CLASSIFICATION_ID = "CLI:100000000000000000000000000000000003"; @Autowired ClassificationResourceAssembler classificationResourceAssembler; @Autowired TaskResourceAssembler taskResourceAssembler; @Autowired JobScheduler jobScheduler; @@ -57,8 +57,8 @@ class AsyncUpdateJobIntTest { void testUpdateClassificationPrioServiceLevel() throws Exception { // 1st step: get old classification : - Instant before = Instant.now(); - ObjectMapper mapper = new ObjectMapper(); + final Instant before = Instant.now(); + final ObjectMapper mapper = new ObjectMapper(); ResponseEntity response = template.exchange( diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/rest/ExampleRestApplication.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/rest/ExampleRestApplication.java index f139ec553..afc11f972 100644 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/rest/ExampleRestApplication.java +++ b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/rest/ExampleRestApplication.java @@ -25,6 +25,7 @@ import pro.taskana.sampledata.SampleDataGenerator; @SpringBootApplication @EnableScheduling @ComponentScan(basePackages = "pro.taskana") +@SuppressWarnings("checkstyle:Indentation") @Import({ TransactionalJobsConfiguration.class, LdapConfiguration.class, diff --git a/rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/TaskanaWildFlyApplication.java b/rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/TaskanaWildFlyApplication.java index 552572b7d..1e653ebc4 100644 --- a/rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/TaskanaWildFlyApplication.java +++ b/rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/TaskanaWildFlyApplication.java @@ -39,6 +39,7 @@ import pro.taskana.sampledata.SampleDataGenerator; */ @SpringBootApplication @EnableScheduling +@SuppressWarnings("checkstyle:Indentation") @Import({ TransactionalJobsConfiguration.class, LdapConfiguration.class, @@ -90,7 +91,8 @@ public class TaskanaWildFlyApplication extends SpringBootServletInitializer { return dataSource; } catch (Exception e) { LOGGER.error( - "Caught exception {} when attempting to start Taskana with Datasource from Jndi. Using default H2 datasource. ", + "Caught exception {} when attempting to start Taskana with Datasource " + + "from Jndi. Using default H2 datasource. ", e); return dsProperties.initializeDataSourceBuilder().build(); }