From 7af273a3fc364abff540b716f11dafdd26791b6c Mon Sep 17 00:00:00 2001
From: Aravindan Vijayan <avijayan@hortonworks.com>
Date: Fri, 5 Apr 2019 00:44:56 -0700
Subject: [PATCH] HDDS-1396 : Recon start fails due to changes in Aggregate
 Schema definition.

---
 hadoop-ozone/ozone-recon-codegen/pom.xml                  | 3 +--
 hadoop-ozone/ozone-recon/pom.xml                          | 3 +--
 .../ozone/recon/persistence/JooqPersistenceModule.java    | 1 -
 .../ozone/recon/persistence/AbstractSqlDatabaseTest.java  | 8 +++++++-
 hadoop-ozone/pom.xml                                      | 1 +
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/hadoop-ozone/ozone-recon-codegen/pom.xml b/hadoop-ozone/ozone-recon-codegen/pom.xml
index 0854aace5587b..4f86f3247887f 100644
--- a/hadoop-ozone/ozone-recon-codegen/pom.xml
+++ b/hadoop-ozone/ozone-recon-codegen/pom.xml
@@ -21,11 +21,10 @@
     <version>0.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>hadoop-ozone-recon-codegen</artifactId>
+  <artifactId>hadoop-ozone-reconcodegen</artifactId>
   <name>Apache Hadoop Ozone Recon CodeGen</name>
   <properties>
     <jooq.version>3.11.10</jooq.version>
-    <guice.version>4.1.0</guice.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/hadoop-ozone/ozone-recon/pom.xml b/hadoop-ozone/ozone-recon/pom.xml
index 969db6679fb52..03a4c48cc7f73 100644
--- a/hadoop-ozone/ozone-recon/pom.xml
+++ b/hadoop-ozone/ozone-recon/pom.xml
@@ -26,7 +26,6 @@
   <properties>
     <jooq.version>3.11.10</jooq.version>
     <spring.version>5.1.3.RELEASE</spring.version>
-    <guice.version>4.1.0</guice.version>
   </properties>
   <build>
     <plugins>
@@ -124,7 +123,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-recon-codegen</artifactId>
+      <artifactId>hadoop-ozone-reconcodegen</artifactId>
       <version>${version}</version>
     </dependency>
     <dependency>
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/persistence/JooqPersistenceModule.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/persistence/JooqPersistenceModule.java
index c5c83105f1b6b..2ba4cf7f93923 100644
--- a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/persistence/JooqPersistenceModule.java
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/persistence/JooqPersistenceModule.java
@@ -54,7 +54,6 @@ public JooqPersistenceModule(
 
   @Override
   protected void configure() {
-    bind(DataSourceConfiguration.class).toProvider(configurationProvider);
     bind(DataSource.class).toProvider(DefaultDataSourceProvider.class)
         .in(Singleton.class);
 
diff --git a/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractSqlDatabaseTest.java b/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractSqlDatabaseTest.java
index 2fab93219eddd..983f74a3c1834 100644
--- a/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractSqlDatabaseTest.java
+++ b/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractSqlDatabaseTest.java
@@ -31,6 +31,7 @@
 import org.junit.ClassRule;
 import org.junit.rules.TemporaryFolder;
 
+import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Provider;
@@ -56,7 +57,12 @@ public static void setup() throws IOException {
     JooqPersistenceModule persistenceModule =
         new JooqPersistenceModule(configurationProvider);
 
-    injector = Guice.createInjector(persistenceModule);
+    injector = Guice.createInjector(persistenceModule, new AbstractModule() {
+      @Override
+      public void configure() {
+        bind(DataSourceConfiguration.class).toProvider(configurationProvider);
+        }
+    });
     dslContext = DSL.using(new DefaultConfiguration().set(
         injector.getInstance(DataSource.class)));
   }
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 7010878f629ba..87a45ebd54f32 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -34,6 +34,7 @@
     <ozone.release>Crater Lake</ozone.release>
     <declared.ozone.version>${ozone.version}</declared.ozone.version>
     <maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
+    <guice.version>4.0</guice.version>
   </properties>
   <modules>
     <module>common</module>