diff options
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition')
2 files changed, 19 insertions, 9 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java index b3ec072d..d56391ef 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java @@ -1223,16 +1223,19 @@ public class ReportSchedule extends RaptorObject implements Serializable{ int len = 0; char[] buffer = new char[512]; - Reader in = null; - in = new InputStreamReader(clob.getAsciiStream()); - // if(obj instanceof oracle.sql.CLOB) { - // in = ((oracle.sql.CLOB) obj).getCharacterStream(); - // } else if (obj instanceof weblogic.jdbc.wrapper.Clob) { - // in = ((weblogic.jdbc.base.BaseClob) obj).getCharacterStream(); - // } + try(Reader in = new InputStreamReader(clob.getAsciiStream())) { + // if(obj instanceof oracle.sql.CLOB) { + // in = ((oracle.sql.CLOB) obj).getCharacterStream(); + // } else if (obj instanceof weblogic.jdbc.wrapper.Clob) { + // in = ((weblogic.jdbc.base.BaseClob) obj).getCharacterStream(); + // } while ((len = in.read(buffer)) != -1) sb.append(buffer, 0, len); - in.close(); + } catch(Exception e) { + //if any error while operating the input stream, just throw the error out + //so that outer try/catch block could handle it + throw e; + } } else if (Globals.isPostgreSQL() || Globals.isMySQL()) { String clob= null; Object obj = null; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java index 47b1ef9e..483505af 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java @@ -51,6 +51,7 @@ public class DefinitionJSON implements WizardJSON { private String dbInfo; private String formHelpText; private Integer pageSize; + private List<IdNameBooleanJSON> dbInfoList = null; private List<IdNameBooleanJSON> displayArea = null; private Boolean hideFormFieldsAfterRun; private Integer maxRowsInExcelCSVDownload; @@ -327,5 +328,11 @@ public class DefinitionJSON implements WizardJSON { this.repDefType = repDefType; } - + public List<IdNameBooleanJSON> getDbInfoList() { + return dbInfoList; + } + + public void setDbInfoList(List<IdNameBooleanJSON> dbInfoList) { + this.dbInfoList = dbInfoList; + } } |