util: use read-only DBI for broadcast and node DAO

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

util/src/main/java/org/killbill/billing/util/broadcast/dao/DefaultBroadcastDao.java

@@ -1,6 +1,6 @@
 /*
- * Copyright 2014-2015 Groupon, Inc
- * Copyright 2014-2015 The Billing Project, LLC
+ * Copyright 2014-2018 Groupon, Inc
+ * Copyright 2014-2018 The Billing Project, LLC
  *
  * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
@@ -20,25 +20,24 @@
 import java.util.List;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
-import org.killbill.clock.Clock;
-import org.killbill.commons.jdbi.mapper.LowerToCamelBeanMapperFactory;
-import org.skife.jdbi.v2.DBI;
 import org.skife.jdbi.v2.Handle;
 import org.skife.jdbi.v2.IDBI;
 import org.skife.jdbi.v2.TransactionCallback;
 import org.skife.jdbi.v2.TransactionStatus;
 
+import static org.killbill.billing.util.glue.IDBISetup.MAIN_RO_IDBI_NAMED;
 
 public class DefaultBroadcastDao implements BroadcastDao {
 
     private final IDBI dbi;
-    private final Clock clock;
+    private final IDBI roDbi;
 
     @Inject
-    public DefaultBroadcastDao(final IDBI dbi, final Clock clock) {
+    public DefaultBroadcastDao(final IDBI dbi, @Named(MAIN_RO_IDBI_NAMED) final IDBI roDbi) {
         this.dbi = dbi;
-        this.clock = clock;
+        this.roDbi = roDbi;
     }
 
     @Override
@@ -53,10 +52,9 @@ public Void inTransaction(final Handle handle, final TransactionStatus status) t
         });
     }
 
-
     @Override
     public List<BroadcastModelDao> getLatestEntriesFrom(final Long recordId) {
-        return dbi.inTransaction(new TransactionCallback<List<BroadcastModelDao>>() {
+        return roDbi.inTransaction(new TransactionCallback<List<BroadcastModelDao>>() {
             @Override
             public List<BroadcastModelDao> inTransaction(final Handle handle, final TransactionStatus status) throws Exception {
                 final BroadcastSqlDao sqlDao = handle.attach(BroadcastSqlDao.class);
@@ -67,7 +65,7 @@ public List<BroadcastModelDao> inTransaction(final Handle handle, final Transact
 
     @Override
     public BroadcastModelDao getLatestEntry() {
-        return dbi.inTransaction(new TransactionCallback<BroadcastModelDao>() {
+        return roDbi.inTransaction(new TransactionCallback<BroadcastModelDao>() {
             @Override
             public BroadcastModelDao inTransaction(final Handle handle, final TransactionStatus status) throws Exception {
                 final BroadcastSqlDao sqlDao = handle.attach(BroadcastSqlDao.class);

util/src/main/java/org/killbill/billing/util/glue/IDBISetup.java

@@ -44,9 +44,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
 
+import static org.killbill.billing.platform.glue.KillBillPlatformModuleBase.MAIN_RO_DATA_SOURCE_ID;
+
 public class IDBISetup {
 
-    public static final String MAIN_RO_IDBI_NAMED = "main-ro";
+    // See binding in KillbillPlatformModule
+    public static final String MAIN_RO_IDBI_NAMED = MAIN_RO_DATA_SOURCE_ID;
 
     public static List<? extends ResultSetMapperFactory> mapperFactoriesToRegister() {
         final Builder<ResultSetMapperFactory> builder = ImmutableList.<ResultSetMapperFactory>builder();

util/src/main/java/org/killbill/billing/util/nodes/dao/DefaultNodeInfoDao.java

@@ -1,6 +1,6 @@
 /*
- * Copyright 2014-2015 Groupon, Inc
- * Copyright 2014-2015 The Billing Project, LLC
+ * Copyright 2014-2018 Groupon, Inc
+ * Copyright 2014-2018 The Billing Project, LLC
  *
  * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
@@ -20,30 +20,33 @@
 import java.util.Date;
 import java.util.List;
 
+import javax.inject.Named;
+
 import org.killbill.clock.Clock;
-import org.killbill.commons.jdbi.mapper.LowerToCamelBeanMapperFactory;
-import org.skife.jdbi.v2.DBI;
 import org.skife.jdbi.v2.Handle;
 import org.skife.jdbi.v2.IDBI;
 import org.skife.jdbi.v2.TransactionCallback;
 import org.skife.jdbi.v2.TransactionStatus;
 
 import com.google.inject.Inject;
 
+import static org.killbill.billing.util.glue.IDBISetup.MAIN_RO_IDBI_NAMED;
+
 public class DefaultNodeInfoDao implements NodeInfoDao {
 
     private final IDBI dbi;
+    private final IDBI roDbi;
     private final Clock clock;
 
     @Inject
-    public DefaultNodeInfoDao(final IDBI dbi, final Clock clock) {
+    public DefaultNodeInfoDao(final IDBI dbi, @Named(MAIN_RO_IDBI_NAMED) final IDBI roDbi, final Clock clock) {
         this.dbi = dbi;
+        this.roDbi = roDbi;
         this.clock = clock;
     }
 
     @Override
     public void create(final NodeInfoModelDao nodeInfoModelDao) {
-
         dbi.inTransaction(new TransactionCallback<Void>() {
             @Override
             public Void inTransaction(final Handle handle, final TransactionStatus status) throws Exception {
@@ -70,7 +73,6 @@ public Void inTransaction(final Handle handle, final TransactionStatus status) t
         });
     }
 
-
     @Override
     public void delete(final String nodeName) {
         dbi.inTransaction(new TransactionCallback<Void>() {
@@ -85,7 +87,7 @@ public Void inTransaction(final Handle handle, final TransactionStatus status) t
 
     @Override
     public List<NodeInfoModelDao> getAll() {
-        return dbi.inTransaction(new TransactionCallback<List<NodeInfoModelDao>>() {
+        return roDbi.inTransaction(new TransactionCallback<List<NodeInfoModelDao>>() {
             @Override
             public List<NodeInfoModelDao> inTransaction(final Handle handle, final TransactionStatus status) throws Exception {
                 final NodeInfoSqlDao sqlDao = handle.attach(NodeInfoSqlDao.class);
@@ -96,13 +98,12 @@ public List<NodeInfoModelDao> inTransaction(final Handle handle, final Transacti
 
     @Override
     public NodeInfoModelDao getByNodeName(final String nodeName) {
-        return dbi.inTransaction(new TransactionCallback<NodeInfoModelDao>() {
+        return roDbi.inTransaction(new TransactionCallback<NodeInfoModelDao>() {
             @Override
             public NodeInfoModelDao inTransaction(final Handle handle, final TransactionStatus status) throws Exception {
                 final NodeInfoSqlDao sqlDao = handle.attach(NodeInfoSqlDao.class);
                 return sqlDao.getByNodeName(nodeName);
             }
         });
     }
-
 }