From 9bb3ed5eae777fb7ac436fd5f7ddd76902feafda Mon Sep 17 00:00:00 2001
From: feffi <feffi@feffi.org>
Date: Mon, 11 Jun 2018 01:06:40 +0200
Subject: [PATCH] fixed minor code issues

(cherry picked from commit 9ae00d1)
---
 .../src/main/java/org/jooby/cassandra/Cassandra.java      | 8 +++-----
 .../main/java/org/jooby/cassandra/CassandraMapper.java    | 2 +-
 .../java/org/jooby/cassandra/CassandraSessionStore.java   | 4 ++--
 .../main/java/org/jooby/cassandra/ConnectionString.java   | 6 +++---
 .../src/main/java/org/jooby/cassandra/Datastore.java      | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/Cassandra.java b/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/Cassandra.java
index 979ec65b7b..720d303d98 100644
--- a/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/Cassandra.java
+++ b/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/Cassandra.java
@@ -473,11 +473,11 @@ public class Cassandra implements Module {
 
   private BiConsumer<Cluster, Config> cc;
 
-  private String db;
+  private final String db;
 
   @SuppressWarnings("rawtypes")
 
-  private List<Class> accesors = new ArrayList<>();
+  private final List<Class> accesors = new ArrayList<>();
 
   private Supplier<Cluster.Builder> builder = Cluster::builder;
 
@@ -613,9 +613,7 @@ public void configure(final Env env, final Config conf, final Binder binder) {
     ServiceKey serviceKey = env.serviceKey();
 
     Throwing.Function3<Class, String, Object, Void> bind = (type, name, value) -> {
-      serviceKey.generate(type, name, k -> {
-        binder.bind(k).toInstance(value);
-      });
+      serviceKey.generate(type, name, k -> binder.bind(k).toInstance(value));
       return null;
     };
 
diff --git a/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/CassandraMapper.java b/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/CassandraMapper.java
index 4cb8f67eb2..5b8b4a65d3 100644
--- a/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/CassandraMapper.java
+++ b/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/CassandraMapper.java
@@ -216,7 +216,7 @@ class CassandraMapper implements Mapper<Object> {
   @SuppressWarnings({"unchecked", "rawtypes"})
   private static class DeferredHandler implements Deferred.Initializer0 {
 
-    private ListenableFuture future;
+    private final ListenableFuture future;
 
     public DeferredHandler(final ListenableFuture future) {
       this.future = future;
diff --git a/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/CassandraSessionStore.java b/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/CassandraSessionStore.java
index 7577f72977..3005e6476c 100644
--- a/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/CassandraSessionStore.java
+++ b/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/CassandraSessionStore.java
@@ -318,9 +318,9 @@ public class CassandraSessionStore implements Store {
 
   private final Throwing.Function<String, PreparedStatement> insertSQL;
 
-  private Throwing.Function<String, PreparedStatement> selectSQL;
+  private final Throwing.Function<String, PreparedStatement> selectSQL;
 
-  private Throwing.Function<String, PreparedStatement> deleteSQL;
+  private final Throwing.Function<String, PreparedStatement> deleteSQL;
 
   public CassandraSessionStore(final com.datastax.driver.core.Session session, final int timeout) {
     this.session = requireNonNull(session, "Session required.");
diff --git a/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/ConnectionString.java b/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/ConnectionString.java
index a523aa85d9..7c1fefd650 100644
--- a/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/ConnectionString.java
+++ b/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/ConnectionString.java
@@ -215,11 +215,11 @@ class ConnectionString {
   public static final String SCHEMA = "cassandra://";
   private static final String SAMPLE = SCHEMA + "host[, host]*[:port]/keyspace";
 
-  private String[] address;
+  private final String[] address;
 
-  private int port;
+  private final int port;
 
-  private String keyspace;
+  private final String keyspace;
 
   private ConnectionString(final String[] address, final int port, final String keyspace) {
     this.address = address;
diff --git a/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/Datastore.java b/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/Datastore.java
index f5b9de7e10..fc510b23e5 100644
--- a/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/Datastore.java
+++ b/modules/jooby-cassandra/src/main/java/org/jooby/cassandra/Datastore.java
@@ -228,7 +228,7 @@
  */
 @SuppressWarnings({"rawtypes", "unchecked" })
 public class Datastore {
-  private MappingManager manager;
+  private final MappingManager manager;
 
   Datastore(final MappingManager manager) {
     this.manager = manager;