Spring Boot Issue #402

* Now includes Thymeleaf Starter
* FetchBikingPicturesJob not instantiated without valid api token

Author: michael-simons

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>eu.michael-simons</groupId>
     <artifactId>biking2</artifactId>
-    <version>0.2.5-SNAPSHOT</version>
+    <version>0.2.6-SNAPSHOT</version>
 
     <parent>
 	<groupId>org.springframework.boot</groupId>
@@ -137,6 +137,16 @@
 	    <groupId>org.springframework.boot</groupId>
 	    <artifactId>spring-boot-starter-web</artifactId>
 	</dependency>
+	<dependency>
+	    <groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-thymeleaf</artifactId>
+	    <exclusions>
+		<exclusion>
+		    <groupId>org.javassist</groupId>
+		    <artifactId>javassist</artifactId>
+		</exclusion>
+	    </exclusions>
+	</dependency>
 	<dependency>
 	    <groupId>org.springframework</groupId>
 	    <artifactId>spring-orm</artifactId>
@@ -258,21 +268,7 @@
 	    <groupId>org.webjars</groupId>
 	    <artifactId>openlayers</artifactId>
 	    <version>${openlayers.version}</version>
-	</dependency>
-	<dependency>
-	    <groupId>org.thymeleaf</groupId>
-	    <artifactId>thymeleaf</artifactId>
-	    <exclusions>
-		<exclusion>
-		    <groupId>org.javassist</groupId>
-		    <artifactId>javassist</artifactId>
-		</exclusion>
-	    </exclusions>
-	</dependency>
-	<dependency>
-	    <groupId>org.thymeleaf</groupId>
-	    <artifactId>thymeleaf-spring4</artifactId>
-	</dependency>
+	</dependency>	
 
 	<dependency>
 	    <groupId>org.hamcrest</groupId>

src/main/java/ac/simons/biking2/config/WebConfig.java

@@ -22,26 +22,19 @@
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule.Priority;
 import java.util.EnumSet;
-import java.util.Set;
 import javax.servlet.DispatcherType;
 import javax.servlet.MultipartConfigElement;
-import javax.servlet.ServletContainerInitializer;
 import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
 import org.springframework.boot.context.embedded.ServletContextInitializer;
 import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Condition;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-import org.springframework.core.type.AnnotatedTypeMetadata;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.filter.CharacterEncodingFilter;
@@ -82,7 +75,6 @@ public ServletContextInitializer servletContextInitializer() {
 	    characterEncodingFilter.setEncoding("UTF-8");
 	    characterEncodingFilter.setForceEncoding(false);
 
-	    // TODO Blog
 	    servletContext.addFilter("characterEncodingFilter", characterEncodingFilter).addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), false, "/*");
 	};
     }
@@ -146,22 +138,8 @@ public ObjectMapper jacksonObjectMapper() {
 	);
     }
 
-    // TODO Blog
-    /**
-     * This is a condition based on a property. If the property is set and not
-     * empty, the EmbeddedServletContainer needs a customized connector
-     */
-    static class NeedsCustomizedConnectorCondition implements Condition {
-
-	@Override
-	public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-	    final Environment environment = context.getEnvironment();
-	    return environment.containsProperty("biking2.connector.proxyName") && !environment.getProperty("biking2.connector.proxyName", String.class).isEmpty();
-	}
-    }
-
     @Bean
-    @Conditional(NeedsCustomizedConnectorCondition.class)
+    @ConditionalOnExpression(value = "environment['biking2.connector.proxyName'] != null && !environment['biking2.connector.proxyName'].isEmpty()")
     public EmbeddedServletContainerCustomizer embeddedServletContainerCustomizer(
 	    final @Value("${biking2.connector.proxyName}") String proxyName,
 	    final @Value("${biking2.connector.proxyPort:80}") int proxyPort

src/main/java/ac/simons/biking2/jobs/DailyFratzeProvider.java

@@ -24,17 +24,19 @@
 import java.util.logging.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 
 /**
  * @author Michael J. Simons, 2014-02-18
  */
 @Component
+@ConditionalOnExpression(value = "environment['biking2.dailyfratze-access-token'] != null && !environment['biking2.dailyfratze-access-token'].isEmpty()")
 public class DailyFratzeProvider {    
     private final String accessToken;    
 
     @Autowired
-    public DailyFratzeProvider(final @Value("${biking2.dailyfratze-access-token:na}") String accessToken) {
+    public DailyFratzeProvider(final @Value("${biking2.dailyfratze-access-token}") String accessToken) {
 	this.accessToken = accessToken;
     }
 

src/main/java/ac/simons/biking2/jobs/FetchBikingPicturesJob.java

@@ -36,6 +36,8 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -48,8 +50,9 @@
  */
 @Component
 @Profile({"dev", "prod"})
+@ConditionalOnBean(DailyFratzeProvider.class)
 public class FetchBikingPicturesJob {
-
+    
     private final DailyFratzeProvider dailyFratzeProvider;
     private final BikingPictureRepository bikingPictureRepository;
     private final File bikingPicturesStorage;

src/main/resources/application.properties

@@ -23,6 +23,4 @@ security.user.password = biking2
 biking2.home.longitude = 6.179489185520004
 biking2.home.latitude = 50.75144902272457
 
-spring.thymeleaf.cache = false
-spring.thymeleaf.prefix = classpath:templates/
-spring.thymeleaf.suffix = .html
+spring.thymeleaf.cache = false