Merge pull request #154 from phasenraum2010/master

Deployment of release 1.0.16

Author: phasenraum2010

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.woehlke.twitterwall</groupId>
     <artifactId>twitterwall2</artifactId>
-    <version>1.0.16-SNAPSHOT</version>
+    <version>1.0.17-SNAPSHOT</version>
     <name>twitterwall2</name>
 
     <description>Twitterwall with spring:boot for heroku</description>

src/main/java/org/woehlke/twitterwall/Application.java

@@ -24,7 +24,6 @@
     TwitterwallSchedulerProperties.class,
     TwitterProperties.class
 })
-//@EnableWebMvc
 @EnableSpringDataWebSupport
 @ImportResource("classpath:integration.xml")
 public class Application {

src/main/java/org/woehlke/twitterwall/conf/TwitterProperties.java

@@ -12,18 +12,6 @@
 @ConfigurationProperties(prefix="twitter")
 public class TwitterProperties {
 
-    //@NotNull
-    private String accessToken;
-
-    //@NotNull
-    private String accessTokenSecret;
-
-    //@NotNull
-    private String consumerKey;
-
-    //@NotNull
-    private String consumerSecret;
-
     @NotNull
     private Integer pageSize;
 
@@ -33,38 +21,6 @@ public class TwitterProperties {
     @NotNull
     private String searchQuery;
 
-    public String getAccessToken() {
-        return accessToken;
-    }
-
-    public void setAccessToken(String accessToken) {
-        this.accessToken = accessToken;
-    }
-
-    public String getAccessTokenSecret() {
-        return accessTokenSecret;
-    }
-
-    public void setAccessTokenSecret(String accessTokenSecret) {
-        this.accessTokenSecret = accessTokenSecret;
-    }
-
-    public String getConsumerKey() {
-        return consumerKey;
-    }
-
-    public void setConsumerKey(String consumerKey) {
-        this.consumerKey = consumerKey;
-    }
-
-    public String getConsumerSecret() {
-        return consumerSecret;
-    }
-
-    public void setConsumerSecret(String consumerSecret) {
-        this.consumerSecret = consumerSecret;
-    }
-
     public Integer getPageSize() {
         return pageSize;
     }

src/main/java/org/woehlke/twitterwall/conf/TwitterwallBackendProperties.java

@@ -22,18 +22,6 @@ public class TwitterwallBackendProperties {
 
     public static class Twitter {
 
-        //@NotNull
-        private String accessToken;
-
-        //@NotNull
-        private String accessTokenSecret;
-
-        //@NotNull
-        private String consumerKey;
-
-        //@NotNull
-        private String consumerSecret;
-
         @NotNull
         private Integer millisToWaitBetweenTwoApiCalls;
 
@@ -56,37 +44,6 @@ public void setMillisToWaitForFetchTweetsFromTwitterSearch(Integer millisToWaitF
             this.millisToWaitForFetchTweetsFromTwitterSearch = millisToWaitForFetchTweetsFromTwitterSearch;
         }
 
-        public String getAccessToken() {
-            return accessToken;
-        }
-
-        public void setAccessToken(String accessToken) {
-            this.accessToken = accessToken;
-        }
-
-        public String getAccessTokenSecret() {
-            return accessTokenSecret;
-        }
-
-        public void setAccessTokenSecret(String accessTokenSecret) {
-            this.accessTokenSecret = accessTokenSecret;
-        }
-
-        public String getConsumerKey() {
-            return consumerKey;
-        }
-
-        public void setConsumerKey(String consumerKey) {
-            this.consumerKey = consumerKey;
-        }
-
-        public String getConsumerSecret() {
-            return consumerSecret;
-        }
-
-        public void setConsumerSecret(String consumerSecret) {
-            this.consumerSecret = consumerSecret;
-        }
     }
 
     public static class Url {