Merge pull request #419 from kdhrubo/feature/417_oracle9i_release

Feature/417 oracle9i release

pom-oracle9i.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.github</groupId>
     <artifactId>db2rest-oracle9i</artifactId>
-    <version>0.2.5-SNAPSHOT</version>
+    <version>0.2.5-RC1</version>
     <name>db2rest-oracle9i</name>
     <description>DB2Rest support for older Oracle9i database.</description>
     <properties>

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.github</groupId>
     <artifactId>db2rest</artifactId>
-    <version>0.2.5-SNAPSHOT</version>
+    <version>0.2.5-RC1</version>
     <name>db2rest</name>
     <description>db2rest</description>
     <properties>

src/main/java/com/homihq/db2rest/core/config/Db2RestConfigProperties.java

@@ -11,6 +11,7 @@
 import org.springframework.validation.annotation.Validated;
 
 import java.util.List;
+import java.util.Objects;
 
 @Getter
 @Setter
@@ -23,9 +24,24 @@ public class Db2RestConfigProperties {
     private boolean allowSafeDelete;
     private int defaultFetchLimit;
 
+    private List<String> includeSchemas;
+
     private MultiTenancy multiTenancy;
 
 
+    public boolean isAllSchema() {
+
+        if(Objects.isNull(includeSchemas)) {
+            return true;
+        }
+        else{
+            return
+            includeSchemas.stream()
+                    .anyMatch(i -> !StringUtils.equals(i,""));
+        }
+    }
+
+
     public void checkDeleteAllowed(String filter) {
         if (StringUtils.isBlank(filter) && allowSafeDelete)
             throw new DeleteOpNotAllowedException(true);

src/main/java/com/homihq/db2rest/jdbc/sql/JdbcMetaDataProvider.java

@@ -6,7 +6,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.support.DatabaseMetaDataCallback;
 
 
@@ -23,9 +22,6 @@ public class JdbcMetaDataProvider implements DatabaseMetaDataCallback<DbMeta> {
 
     private final Db2RestConfigProperties db2RestConfigProperties;
 
-    @Value("${INCLUDE_SCHEMAS}")
-    private String includedSchemas;
-
     //TODO include schemas , tables , view,  filters filters
     @Override
     public DbMeta processMetaData(DatabaseMetaData databaseMetaData) throws SQLException {
@@ -44,21 +40,21 @@ public DbMeta processMetaData(DatabaseMetaData databaseMetaData) throws SQLExcep
         log.info("Driver Name - {}", driverName);
         log.info("Driver Version - {}", driverVersion);
 
-        log.info("IncludedSchemas - {}", includedSchemas);
 
+        log.info("IncludedSchemas - {}", db2RestConfigProperties.getIncludeSchemas());
 
         List<DbTable> dbTables = new ArrayList<>();
 
-        if(StringUtils.isBlank(includedSchemas)) {
+        if(db2RestConfigProperties.isAllSchema()) {
             log.info("Fetching all schema meta data.");
             List<DbTable> tables = getDbTables(databaseMetaData, null, productName, majorVersion);
 
             dbTables.addAll(tables);
         }
         else{
-            String [] schemas = StringUtils.split(includedSchemas, ",");
+            log.info("Fetching meta data for selected schemas.");
 
-            for(String schema : schemas) {
+            for(String schema : db2RestConfigProperties.getIncludeSchemas()) {
 
                 log.info("Loading meta data for schema - {}", schema);
 

src/main/resources/application.yml

@@ -34,9 +34,10 @@ db2rest:
   defaultFetchLimit: ${DEFAULT_FETCH_LIMIT:100}
   datasource:
     type: ${DATASOURCE_TYPE:jdbc}
-    includeSchemas: ${INCLUDE_SCHEMAS}
-    includeTables: ${INCLUDE_TABLES:#{null}}
+
+    includeTables: ${INCLUDE_TABLES:}
     includeCatalogs: ${INCLUDE_CATALOGS:#{null}}
+  includeSchemas: ${INCLUDE_SCHEMAS:''}
 
   auth:
     type: ${AUTH_TYPE:none}