Update to datastax java driver and Spring 4 and also Java 8 code

services/src/main/java/fr/ippon/tatami/config/ApplicationConfiguration.java

@@ -1,14 +1,26 @@
 package fr.ippon.tatami.config;
 
-import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.*;
 import org.springframework.core.env.Environment;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.StopWatch;
+import org.springframework.web.bind.annotation.RequestMethod;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+import javax.servlet.ServletContext;
 import java.io.IOException;
+import java.time.LocalDate;
+import java.util.Date;
+
+import static springfox.documentation.builders.PathSelectors.regex;
 
 @Configuration
 @PropertySource({"classpath:/META-INF/tatami/tatami.properties",
@@ -32,6 +44,40 @@ public class ApplicationConfiguration {
     @Inject
     private Environment env;
 
+    public static final String DEFAULT_INCLUDE_PATTERN = "/tatami/.*";
+
+    @Bean
+    public Docket swaggerSpringfoxDocket() {
+        log.debug("Starting Swagger");
+        StopWatch watch = new StopWatch();
+        watch.start();
+        ApiInfo apiInfo = new ApiInfo(
+                env.getProperty("swagger.title"),
+                env.getProperty("swagger.description"),
+                env.getProperty("swagger.version"),
+                env.getProperty("swagger.termsOfServiceUrl"),
+                env.getProperty("swagger.contact"),
+                env.getProperty("swagger.license"),
+                env.getProperty("swagger.licenseUrl"));
+
+        Docket docket = new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo)
+                .select()
+                .apis(RequestHandlerSelectors.any())
+                .paths(PathSelectors.any())
+                .build()
+                .directModelSubstitute(LocalDate.class,
+                        String.class)
+                .genericModelSubstitutes(ResponseEntity.class)
+                .useDefaultResponseMessages(false)
+                .enableUrlTemplating(true)
+                .pathMapping("/tatami");
+        watch.stop();
+        log.debug("Started Swagger in {} ms", watch.getTotalTimeMillis());
+        return docket;
+    }
+
+
     /**
      * Initializes Tatami.
      * <p/>
@@ -43,7 +89,7 @@ public class ApplicationConfiguration {
      * - "tatamibot" : for enabling the Tatami bot
      */
     @PostConstruct
-    public void initTatami() throws IOException, TTransportException {
+    public void initTatami() throws IOException {
         log.debug("Looking for Spring profiles... Available profiles are \"metrics\", \"tatamibot\" and \"apple-push\"");
         if (env.getActiveProfiles().length == 0) {
             log.debug("No Spring profile configured, running with default configuration");

services/src/main/java/fr/ippon/tatami/config/AsyncConfiguration.java

@@ -4,6 +4,8 @@
 import fr.ippon.tatami.service.elasticsearch.ElasticsearchSearchService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.AsyncConfigurer;
@@ -37,4 +39,9 @@ public Executor getAsyncExecutor() {
         executor.initialize();
         return executor;
     }
+
+    @Override
+    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+        return new SimpleAsyncUncaughtExceptionHandler();
+    }
 }

services/src/main/java/fr/ippon/tatami/config/ColumnFamilyKeys.java

@@ -11,7 +11,7 @@ private ColumnFamilyKeys() {
 
     public static final String USER_CF = "User";
 
-    public static final String FRIENDS_CF = "Friends";
+    public static final String FRIENDS = "friends";
 
     public static final String FOLLOWERS_CF = "Followers";
 
@@ -25,13 +25,13 @@ private ColumnFamilyKeys() {
 
     public static final String FAVLINE_CF = "Favline";
 
-    public static final String TAGLINE_CF = "Tagline";
+    public static final String TAGLINE = "Tagline";
 
     public static final String TIMELINE_CF = "Timeline";
 
     public static final String TIMELINE_SHARES_CF = "TimelineShares";
 
-    public static final String MENTIONLINE_CF = "Mentionline";
+    public static final String MENTIONLINE = "mentionLine";
 
     public static final String USERLINE_CF = "Userline";
 
@@ -67,7 +67,7 @@ private ColumnFamilyKeys() {
 
     public static final String GROUP_COUNTER_CF = "GroupCounter";
 
-    public static final String GROUPLINE_CF = "Groupline";
+    public static final String GROUPLINE = "Groupline";
 
     public static final String TATAMIBOT_DUPLICATE_CF = "TatamiBotDuplicate";
 
@@ -79,7 +79,7 @@ private ColumnFamilyKeys() {
 
     public static final String DOMAIN_CONFIGURATION_CF = "DomainConfiguration";
 
-    public static final String DOMAINLINE_CF = "Domainline";
+    public static final String DOMAINLINE = "domainLine";
 
     public static final String DOMAIN_TATAMIBOT_CF = "DomainTatamibot";
 

services/src/main/java/fr/ippon/tatami/config/DispatcherServletConfig.java

@@ -24,6 +24,7 @@
 import org.springframework.web.servlet.view.JstlView;
 import org.springframework.web.servlet.view.UrlBasedViewResolver;
 import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
@@ -34,6 +35,7 @@
 @Configuration
 @ComponentScan("fr.ippon.tatami.web")
 @EnableWebMvc
+@EnableSwagger2
 @PropertySource({"classpath:/META-INF/tatami/tatami.properties",
         "classpath:/META-INF/tatami/customization.properties"})
 @ImportResource("classpath:META-INF/spring/applicationContext-metrics.xml")

services/src/main/java/fr/ippon/tatami/config/MetricsConfiguration.java

@@ -5,7 +5,6 @@
 import fr.ippon.tatami.config.metrics.CassandraHealthCheck;
 import fr.ippon.tatami.config.metrics.JavaMailHealthCheck;
 import fr.ippon.tatami.service.MailService;
-import me.prettyprint.hector.api.Keyspace;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Configuration;
@@ -23,8 +22,8 @@ public class MetricsConfiguration {
     @Inject
     private Environment env;
 
-    @Inject
-    private Keyspace keyspaceOperator;
+//    @Inject
+//    private Keyspace keyspaceOperator;
 
     @Inject
     private MailService mailService;
@@ -33,7 +32,7 @@ public class MetricsConfiguration {
     public void initMetrics() {
         if (env.acceptsProfiles(Constants.SPRING_PROFILE_METRICS)) {
             log.debug("Initializing Metrics healthchecks");
-            HealthChecks.register(new CassandraHealthCheck(keyspaceOperator));
+//            HealthChecks.register(new CassandraHealthCheck(keyspaceOperator));
             HealthChecks.register(new JavaMailHealthCheck(mailService));
 
             String graphiteHost = env.getProperty("tatami.metrics.graphite.host");

services/src/main/java/fr/ippon/tatami/config/metrics/CassandraHealthCheck.java

@@ -1,37 +1,46 @@
 package fr.ippon.tatami.config.metrics;
 
 import com.yammer.metrics.core.HealthCheck;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.exceptions.HectorException;
 
 import static fr.ippon.tatami.config.ColumnFamilyKeys.DOMAIN_CF;
-import static me.prettyprint.hector.api.factory.HFactory.createRangeSlicesQuery;
 
 /**
  * Metrics HealthCheck for Cassandra.
  */
 public class CassandraHealthCheck extends HealthCheck {
-
-    private final Keyspace keyspaceOperator;
-
-    public CassandraHealthCheck(Keyspace keyspaceOperator) {
-        super("Cassandra");
-        this.keyspaceOperator = keyspaceOperator;
+    /**
+     * Create a new {@link HealthCheck} instance with the given name.
+     *
+     * @param name the name of the health check (and, ideally, the name of the underlying
+     *             component the health check tests)
+     */
+    protected CassandraHealthCheck(String name) {
+        super(name);
     }
 
     @Override
-    public Result check() throws Exception {
-        try {
-            createRangeSlicesQuery(keyspaceOperator,
-                    StringSerializer.get(), StringSerializer.get(), StringSerializer.get())
-                    .setColumnFamily(DOMAIN_CF)
-                    .setRange(null, null, false, 1)
-                    .execute()
-                    .get();
-            return Result.healthy();
-        } catch (HectorException he) {
-            return Result.unhealthy("Cannot connect to Cassandra Cluster : " + keyspaceOperator.getKeyspaceName());
-        }
+    protected Result check() throws Exception {
+        return null;
     }
+
+
+//    public CassandraHealthCheck(Keyspace keyspaceOperator) {
+//        super("Cassandra");
+//        this.keyspaceOperator = keyspaceOperator;
+//    }
+//
+//    @Override
+//    public Result check() throws Exception {
+//        try {
+//            createRangeSlicesQuery(keyspaceOperator,
+//                    StringSerializer.get(), StringSerializer.get(), StringSerializer.get())
+//                    .setColumnFamily(DOMAIN_CF)
+//                    .setRange(null, null, false, 1)
+//                    .execute()
+//                    .get();
+//            return Result.healthy();
+//        } catch (HectorException he) {
+//            return Result.unhealthy("Cannot connect to Cassandra Cluster : " + keyspaceOperator.getKeyspaceName());
+//        }
+//    }
 }

services/src/main/java/fr/ippon/tatami/domain/Avatar.java

@@ -19,6 +19,9 @@ public class Avatar implements Serializable {
 
     private long size;
 
+    public Avatar() {
+    }
+
     public String getAvatarId() {
         return avatarId;
     }

services/src/main/java/fr/ippon/tatami/domain/DomainConfiguration.java

@@ -5,10 +5,7 @@
 import java.io.Serializable;
 import java.util.Properties;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.datastax.driver.mapping.annotations.*;
 
 import org.apache.commons.io.IOUtils;
 
@@ -17,7 +14,6 @@
  *
  * @author Julien Dubois
  */
-@Entity
 @Table(name = "DomainConfiguration")
 public class DomainConfiguration implements Serializable {
 
@@ -74,7 +70,7 @@ public static class SubscriptionAndStorageSizeOptions {
 
     }
 
-    @Id
+    @PartitionKey
     private String domain;
 
     @Column(name = "subscriptionLevel")

services/src/main/java/fr/ippon/tatami/domain/Group.java

@@ -4,13 +4,14 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.io.Serializable;
+import java.util.UUID;
 
 /**
  * A group.
  */
 public class Group implements Comparable<Group>, Serializable, Cloneable {
 
-    private String groupId;
+    private UUID groupId;
 
     private boolean publicGroup;
 
@@ -29,11 +30,11 @@ public class Group implements Comparable<Group>, Serializable, Cloneable {
 
     private boolean administrator;
 
-    public String getGroupId() {
+    public UUID getGroupId() {
         return groupId;
     }
 
-    public void setGroupId(String groupId) {
+    public void setGroupId(UUID groupId) {
         this.groupId = groupId;
     }
 

services/src/main/java/fr/ippon/tatami/domain/User.java

@@ -1,14 +1,12 @@
 package fr.ippon.tatami.domain;
 
+import com.datastax.driver.mapping.annotations.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import fr.ippon.tatami.domain.validation.ContraintsUserCreation;
 import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.NotEmpty;
+import org.springframework.data.cassandra.mapping.PrimaryKey;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import javax.validation.groups.Default;
@@ -19,15 +17,15 @@
  *
  * @author Julien Dubois
  */
-@Entity
-@Table(name = "User")
+@Table(name = "user")
 public class User implements Serializable {
 
+
     @NotEmpty(message = "Login is mandatory.", groups = {ContraintsUserCreation.class, Default.class})
     @NotNull(message = "Login is mandatory.", groups = {ContraintsUserCreation.class, Default.class})
     @Email(message = "Email is invalid.")
-    @Id
     @JsonIgnore
+    @PartitionKey
     private String login;
 
     @Column(name = "password")
@@ -86,10 +84,13 @@ public class User implements Serializable {
     @Column(name="activated")
     private Boolean activated=true;
 
+    @Transient
     private long statusCount;
 
+    @Transient
     private long friendsCount;
 
+    @Transient
     private long followersCount;