mirror of
https://github.com/enso-org/enso.git
synced 2024-11-25 10:43:02 +03:00
Remove some catch alls (#11254)
- Allow Interrupted Exceptions to float out of the web requests.
- Use `Type_Error` rather than Any when catching auto scoping resolving.
- Rename `Java_Exception` to `JException`
(cherry picked from commit fd72ab7052
)
This commit is contained in:
parent
ff45b85f9c
commit
04f07f4ba4
@ -1,5 +1,6 @@
|
|||||||
from Standard.Base import all
|
from Standard.Base import all
|
||||||
import Standard.Base.Errors.Common.Missing_Argument
|
import Standard.Base.Errors.Common.Missing_Argument
|
||||||
|
import Standard.Base.Errors.Common.Type_Error
|
||||||
import Standard.Base.Metadata.Widget.Text_Input
|
import Standard.Base.Metadata.Widget.Text_Input
|
||||||
|
|
||||||
import Standard.Database.Connection.Client_Certificate.Client_Certificate
|
import Standard.Database.Connection.Client_Certificate.Client_Certificate
|
||||||
@ -36,7 +37,7 @@ type Redshift_Details
|
|||||||
Attempt to resolve the constructor.
|
Attempt to resolve the constructor.
|
||||||
resolve : Function -> Redshift_Details | Nothing
|
resolve : Function -> Redshift_Details | Nothing
|
||||||
resolve constructor =
|
resolve constructor =
|
||||||
Panic.catch Any (constructor:Redshift_Details) _->Nothing
|
Panic.catch Type_Error (constructor:Redshift_Details) _->Nothing
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
Build the Connection resource.
|
Build the Connection resource.
|
||||||
|
@ -9,6 +9,7 @@ import project.Data.Vector.Vector
|
|||||||
import project.Error.Error
|
import project.Error.Error
|
||||||
import project.Errors.Common.Incomparable_Values
|
import project.Errors.Common.Incomparable_Values
|
||||||
import project.Errors.Common.Missing_Argument
|
import project.Errors.Common.Missing_Argument
|
||||||
|
import project.Errors.Common.Type_Error
|
||||||
import project.Errors.Illegal_Argument.Illegal_Argument
|
import project.Errors.Illegal_Argument.Illegal_Argument
|
||||||
import project.Function.Function
|
import project.Function.Function
|
||||||
import project.Meta
|
import project.Meta
|
||||||
@ -167,7 +168,7 @@ type Filter_Condition
|
|||||||
resolve_auto_scoped filter =
|
resolve_auto_scoped filter =
|
||||||
resolve filter:Filter_Condition = filter
|
resolve filter:Filter_Condition = filter
|
||||||
case filter of
|
case filter of
|
||||||
_ : Function -> Panic.catch Any (resolve filter) _->filter
|
_ : Function -> Panic.catch Type_Error (resolve filter) _->filter
|
||||||
_ : Filter_Condition -> filter
|
_ : Filter_Condition -> filter
|
||||||
_ -> Panic.throw (Illegal_Argument.Error "The filter condition can either be a Function or a Filter_Condition, but got: "+filter.to_display_text)
|
_ -> Panic.throw (Illegal_Argument.Error "The filter condition can either be a Function or a Filter_Condition, but got: "+filter.to_display_text)
|
||||||
|
|
||||||
|
@ -29,7 +29,8 @@ import project.System.File.File
|
|||||||
from project.Data.Boolean import Boolean, False, True
|
from project.Data.Boolean import Boolean, False, True
|
||||||
from project.Data.Json.Extensions import all
|
from project.Data.Json.Extensions import all
|
||||||
|
|
||||||
polyglot java import java.lang.Exception as JException
|
polyglot java import java.lang.IllegalArgumentException
|
||||||
|
polyglot java import java.io.IOException
|
||||||
polyglot java import java.net.http.HttpClient
|
polyglot java import java.net.http.HttpClient
|
||||||
polyglot java import java.net.http.HttpClient.Builder as ClientBuilder
|
polyglot java import java.net.http.HttpClient.Builder as ClientBuilder
|
||||||
polyglot java import java.net.http.HttpClient.Redirect
|
polyglot java import java.net.http.HttpClient.Redirect
|
||||||
@ -112,7 +113,7 @@ type HTTP
|
|||||||
handler caught_panic =
|
handler caught_panic =
|
||||||
exception = caught_panic.payload
|
exception = caught_panic.payload
|
||||||
Error.throw (Request_Error.Error (Meta.type_of exception . to_text) exception.getMessage)
|
Error.throw (Request_Error.Error (Meta.type_of exception . to_text) exception.getMessage)
|
||||||
Panic.catch JException handler=handler
|
Panic.catch IllegalArgumentException handler=handler <| Panic.catch IOException handler=handler
|
||||||
|
|
||||||
handle_request_error <| Illegal_Argument.handle_java_exception <| check_output_context <|
|
handle_request_error <| Illegal_Argument.handle_java_exception <| check_output_context <|
|
||||||
headers = resolve_headers req
|
headers = resolve_headers req
|
||||||
|
@ -7,6 +7,7 @@ import project.Data.Text.Encoding.Encoding
|
|||||||
import project.Data.Text.Text
|
import project.Data.Text.Text
|
||||||
import project.Data.Vector.Vector
|
import project.Data.Vector.Vector
|
||||||
import project.Error.Error
|
import project.Error.Error
|
||||||
|
import project.Errors.Common.Type_Error
|
||||||
import project.Errors.File_Error.File_Error
|
import project.Errors.File_Error.File_Error
|
||||||
import project.Errors.Illegal_Argument.Illegal_Argument
|
import project.Errors.Illegal_Argument.Illegal_Argument
|
||||||
import project.Errors.Problem_Behavior.Problem_Behavior
|
import project.Errors.Problem_Behavior.Problem_Behavior
|
||||||
@ -140,7 +141,7 @@ type Plain_Text_Format
|
|||||||
Resolve an unresolved constructor to the actual type.
|
Resolve an unresolved constructor to the actual type.
|
||||||
resolve : Function -> Plain_Text_Format | Nothing
|
resolve : Function -> Plain_Text_Format | Nothing
|
||||||
resolve constructor =
|
resolve constructor =
|
||||||
Panic.catch Any (constructor:Plain_Text_Format) _->Nothing
|
Panic.catch Type_Error (constructor:Plain_Text_Format) _->Nothing
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
If the File_Format supports reading from the file, return a configured instance.
|
If the File_Format supports reading from the file, return a configured instance.
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
from Standard.Base import all
|
from Standard.Base import all
|
||||||
import Standard.Base.Data.Numbers.Number_Parse_Error
|
import Standard.Base.Data.Numbers.Number_Parse_Error
|
||||||
|
import Standard.Base.Errors.Common.Type_Error
|
||||||
import Standard.Base.Errors.Illegal_State.Illegal_State
|
import Standard.Base.Errors.Illegal_State.Illegal_State
|
||||||
|
|
||||||
import project.Connection.Client_Certificate.Client_Certificate
|
import project.Connection.Client_Certificate.Client_Certificate
|
||||||
@ -34,7 +35,7 @@ type Postgres
|
|||||||
Attempt to resolve the constructor.
|
Attempt to resolve the constructor.
|
||||||
resolve : Function -> Postgres | Nothing
|
resolve : Function -> Postgres | Nothing
|
||||||
resolve constructor =
|
resolve constructor =
|
||||||
Panic.catch Any (constructor:Postgres) _->Nothing
|
Panic.catch Type_Error (constructor:Postgres) _->Nothing
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
Build the Connection resource.
|
Build the Connection resource.
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
from Standard.Base import all
|
from Standard.Base import all
|
||||||
import Standard.Base.Errors.Common.Missing_Argument
|
import Standard.Base.Errors.Common.Missing_Argument
|
||||||
|
import Standard.Base.Errors.Common.Type_Error
|
||||||
|
|
||||||
import project.Connection.Connection_Options.Connection_Options
|
import project.Connection.Connection_Options.Connection_Options
|
||||||
import project.Connection.SQLite_Connection.SQLite_Connection
|
import project.Connection.SQLite_Connection.SQLite_Connection
|
||||||
@ -18,7 +19,7 @@ type SQLite
|
|||||||
Attempt to resolve the constructor.
|
Attempt to resolve the constructor.
|
||||||
resolve : Function -> SQLite | Nothing
|
resolve : Function -> SQLite | Nothing
|
||||||
resolve constructor =
|
resolve constructor =
|
||||||
Panic.catch Any (constructor:SQLite) _->Nothing
|
Panic.catch Type_Error (constructor:SQLite) _->Nothing
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
Build the Connection resource.
|
Build the Connection resource.
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
from Standard.Base import all
|
from Standard.Base import all
|
||||||
|
import Standard.Base.Errors.Common.Type_Error
|
||||||
import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
|
import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
|
||||||
import Standard.Base.System.File.Generic.Writable_File.Writable_File
|
import Standard.Base.System.File.Generic.Writable_File.Writable_File
|
||||||
import Standard.Base.System.File_Format_Metadata.File_Format_Metadata
|
import Standard.Base.System.File_Format_Metadata.File_Format_Metadata
|
||||||
@ -21,7 +22,7 @@ type SQLite_Format
|
|||||||
Resolve an unresolved constructor to the actual type.
|
Resolve an unresolved constructor to the actual type.
|
||||||
resolve : Function -> SQLite_Format | Nothing
|
resolve : Function -> SQLite_Format | Nothing
|
||||||
resolve constructor =
|
resolve constructor =
|
||||||
Panic.catch Any (constructor:SQLite_Format) _->Nothing
|
Panic.catch Type_Error (constructor:SQLite_Format) _->Nothing
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
If the File_Format supports reading from the file, return a configured instance.
|
If the File_Format supports reading from the file, return a configured instance.
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
from Standard.Base import all
|
from Standard.Base import all
|
||||||
|
import Standard.Base.Errors.Common.Type_Error
|
||||||
import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
|
import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
|
||||||
import Standard.Base.System.File.Generic.Writable_File.Writable_File
|
import Standard.Base.System.File.Generic.Writable_File.Writable_File
|
||||||
import Standard.Base.System.File_Format_Metadata.File_Format_Metadata
|
import Standard.Base.System.File_Format_Metadata.File_Format_Metadata
|
||||||
@ -20,7 +21,7 @@ type Image_File_Format
|
|||||||
Resolve an unresolved constructor to the actual type.
|
Resolve an unresolved constructor to the actual type.
|
||||||
resolve : Function -> Image_File_Format | Nothing
|
resolve : Function -> Image_File_Format | Nothing
|
||||||
resolve constructor =
|
resolve constructor =
|
||||||
Panic.catch Any (constructor:Image_File_Format) _->Nothing
|
Panic.catch Type_Error (constructor:Image_File_Format) _->Nothing
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
If the File_Format supports reading from the file, return a configured instance.
|
If the File_Format supports reading from the file, return a configured instance.
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
from Standard.Base import all
|
from Standard.Base import all
|
||||||
import Standard.Base.Data.Numbers.Number_Parse_Error
|
import Standard.Base.Data.Numbers.Number_Parse_Error
|
||||||
import Standard.Base.Errors.Common.Missing_Argument
|
import Standard.Base.Errors.Common.Missing_Argument
|
||||||
|
import Standard.Base.Errors.Common.Type_Error
|
||||||
import Standard.Base.Errors.Illegal_State.Illegal_State
|
import Standard.Base.Errors.Illegal_State.Illegal_State
|
||||||
import Standard.Base.Metadata.Widget.Text_Input
|
import Standard.Base.Metadata.Widget.Text_Input
|
||||||
|
|
||||||
@ -25,7 +26,7 @@ type SQLServer_Details
|
|||||||
Attempt to resolve the constructor.
|
Attempt to resolve the constructor.
|
||||||
resolve : Function -> SQLServer_Details | Nothing
|
resolve : Function -> SQLServer_Details | Nothing
|
||||||
resolve constructor =
|
resolve constructor =
|
||||||
Panic.catch Any (constructor:SQLServer_Details) _->Nothing
|
Panic.catch Type_Error (constructor:SQLServer_Details) _->Nothing
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
Build the Connection resource.
|
Build the Connection resource.
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
from Standard.Base import all
|
from Standard.Base import all
|
||||||
import Standard.Base.Data.Numbers.Number_Parse_Error
|
import Standard.Base.Data.Numbers.Number_Parse_Error
|
||||||
import Standard.Base.Errors.Common.Missing_Argument
|
import Standard.Base.Errors.Common.Missing_Argument
|
||||||
|
import Standard.Base.Errors.Common.Type_Error
|
||||||
import Standard.Base.Errors.Illegal_State.Illegal_State
|
import Standard.Base.Errors.Illegal_State.Illegal_State
|
||||||
import Standard.Base.Metadata.Widget.Text_Input
|
import Standard.Base.Metadata.Widget.Text_Input
|
||||||
|
|
||||||
@ -28,7 +29,7 @@ type Snowflake_Details
|
|||||||
Attempt to resolve the constructor.
|
Attempt to resolve the constructor.
|
||||||
resolve : Function -> Snowflake_Details | Nothing
|
resolve : Function -> Snowflake_Details | Nothing
|
||||||
resolve constructor =
|
resolve constructor =
|
||||||
Panic.catch Any (constructor:Snowflake_Details) _->Nothing
|
Panic.catch Type_Error (constructor:Snowflake_Details) _->Nothing
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
Build the Connection resource.
|
Build the Connection resource.
|
||||||
|
@ -13,7 +13,7 @@ import project.Value_Type.Auto
|
|||||||
import project.Value_Type.Bits
|
import project.Value_Type.Bits
|
||||||
import project.Value_Type.Value_Type
|
import project.Value_Type.Value_Type
|
||||||
|
|
||||||
polyglot java import java.lang.Exception as Java_Exception
|
polyglot java import java.lang.Exception as JException
|
||||||
polyglot java import java.lang.IllegalArgumentException
|
polyglot java import java.lang.IllegalArgumentException
|
||||||
polyglot java import org.enso.table.formatting.AnyObjectFormatter
|
polyglot java import org.enso.table.formatting.AnyObjectFormatter
|
||||||
polyglot java import org.enso.table.formatting.BooleanFormatter
|
polyglot java import org.enso.table.formatting.BooleanFormatter
|
||||||
@ -215,17 +215,17 @@ type Data_Formatter
|
|||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
make_date_parser self = self.wrap_base_parser <|
|
make_date_parser self = self.wrap_base_parser <|
|
||||||
Panic.catch Java_Exception handler=(caught_panic-> Error.throw (Illegal_Argument.Error caught_panic.payload.getMessage)) <|
|
Panic.catch JException handler=(caught_panic-> Error.throw (Illegal_Argument.Error caught_panic.payload.getMessage)) <|
|
||||||
DateParser.new (self.date_formats.map on_problems=No_Wrap .get_java_formatter_for_parsing)
|
DateParser.new (self.date_formats.map on_problems=No_Wrap .get_java_formatter_for_parsing)
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
make_date_time_parser self = self.wrap_base_parser <|
|
make_date_time_parser self = self.wrap_base_parser <|
|
||||||
Panic.catch Java_Exception handler=(caught_panic-> Error.throw (Illegal_Argument.Error caught_panic.payload.getMessage)) <|
|
Panic.catch JException handler=(caught_panic-> Error.throw (Illegal_Argument.Error caught_panic.payload.getMessage)) <|
|
||||||
DateTimeParser.new (self.datetime_formats.map on_problems=No_Wrap .get_java_formatter_for_parsing)
|
DateTimeParser.new (self.datetime_formats.map on_problems=No_Wrap .get_java_formatter_for_parsing)
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
make_time_of_day_parser self = self.wrap_base_parser <|
|
make_time_of_day_parser self = self.wrap_base_parser <|
|
||||||
Panic.catch Java_Exception handler=(caught_panic-> Error.throw (Illegal_Argument.Error caught_panic.payload.getMessage)) <|
|
Panic.catch JException handler=(caught_panic-> Error.throw (Illegal_Argument.Error caught_panic.payload.getMessage)) <|
|
||||||
TimeOfDayParser.new (self.time_formats.map on_problems=No_Wrap .get_java_formatter_for_parsing)
|
TimeOfDayParser.new (self.time_formats.map on_problems=No_Wrap .get_java_formatter_for_parsing)
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
@ -289,19 +289,19 @@ type Data_Formatter
|
|||||||
## PRIVATE
|
## PRIVATE
|
||||||
make_date_formatter self =
|
make_date_formatter self =
|
||||||
if self.date_formats.is_empty then Error.throw (Illegal_Argument.Error "Formatting dates requires at least one entry in the `date_formats` parameter") else
|
if self.date_formats.is_empty then Error.throw (Illegal_Argument.Error "Formatting dates requires at least one entry in the `date_formats` parameter") else
|
||||||
Panic.catch Java_Exception handler=(caught_panic-> Error.throw (Illegal_Argument.Error caught_panic.payload.getMessage)) <|
|
Panic.catch JException handler=(caught_panic-> Error.throw (Illegal_Argument.Error caught_panic.payload.getMessage)) <|
|
||||||
DateFormatter.new self.date_formats.first.underlying
|
DateFormatter.new self.date_formats.first.underlying
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
make_time_of_day_formatter self =
|
make_time_of_day_formatter self =
|
||||||
if self.time_formats.is_empty then Error.throw (Illegal_Argument.Error "Formatting times requires at least one entry in the `time_formats` parameter") else
|
if self.time_formats.is_empty then Error.throw (Illegal_Argument.Error "Formatting times requires at least one entry in the `time_formats` parameter") else
|
||||||
Panic.catch Java_Exception handler=(caught_panic-> Error.throw (Illegal_Argument.Error caught_panic.payload.getMessage)) <|
|
Panic.catch JException handler=(caught_panic-> Error.throw (Illegal_Argument.Error caught_panic.payload.getMessage)) <|
|
||||||
TimeFormatter.new self.time_formats.first.underlying
|
TimeFormatter.new self.time_formats.first.underlying
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
make_date_time_formatter self =
|
make_date_time_formatter self =
|
||||||
if self.datetime_formats.is_empty then Error.throw (Illegal_Argument.Error "Formatting date-times requires at least one entry in the `datetime_formats` parameter") else
|
if self.datetime_formats.is_empty then Error.throw (Illegal_Argument.Error "Formatting date-times requires at least one entry in the `datetime_formats` parameter") else
|
||||||
Panic.catch Java_Exception handler=(caught_panic-> Error.throw (Illegal_Argument.Error caught_panic.payload.getMessage)) <|
|
Panic.catch JException handler=(caught_panic-> Error.throw (Illegal_Argument.Error caught_panic.payload.getMessage)) <|
|
||||||
DateTimeFormatter.new self.datetime_formats.first.underlying
|
DateTimeFormatter.new self.datetime_formats.first.underlying
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
from Standard.Base import all
|
from Standard.Base import all
|
||||||
|
import Standard.Base.Errors.Common.Type_Error
|
||||||
import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
|
import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
|
||||||
import Standard.Base.Network.HTTP.Response.Response
|
import Standard.Base.Network.HTTP.Response.Response
|
||||||
import Standard.Base.System.File.Generic.Writable_File.Writable_File
|
import Standard.Base.System.File.Generic.Writable_File.Writable_File
|
||||||
@ -65,7 +66,7 @@ type Delimited_Format
|
|||||||
Resolve an unresolved constructor to the actual type.
|
Resolve an unresolved constructor to the actual type.
|
||||||
resolve : Function -> Delimited_Format | Nothing
|
resolve : Function -> Delimited_Format | Nothing
|
||||||
resolve constructor =
|
resolve constructor =
|
||||||
Panic.catch Any (constructor:Delimited_Format) _->Nothing
|
Panic.catch Type_Error (constructor:Delimited_Format) _->Nothing
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
ADVANCED
|
ADVANCED
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
from Standard.Base import all
|
from Standard.Base import all
|
||||||
import Standard.Base.Errors.Common.Missing_Argument
|
import Standard.Base.Errors.Common.Missing_Argument
|
||||||
|
import Standard.Base.Errors.Common.Type_Error
|
||||||
import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
|
import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
|
||||||
import Standard.Base.Metadata.Display
|
import Standard.Base.Metadata.Display
|
||||||
import Standard.Base.System.File.Generic.Writable_File.Writable_File
|
import Standard.Base.System.File.Generic.Writable_File.Writable_File
|
||||||
@ -82,7 +83,7 @@ type Excel_Format
|
|||||||
Resolve an unresolved constructor to the actual type.
|
Resolve an unresolved constructor to the actual type.
|
||||||
resolve : Function -> Excel_Format | Nothing
|
resolve : Function -> Excel_Format | Nothing
|
||||||
resolve constructor =
|
resolve constructor =
|
||||||
Panic.catch Any (constructor:Excel_Format) _->Nothing
|
Panic.catch Type_Error (constructor:Excel_Format) _->Nothing
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
ADVANCED
|
ADVANCED
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
from Standard.Base import all
|
from Standard.Base import all
|
||||||
|
import Standard.Base.Errors.Common.Type_Error
|
||||||
import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
|
import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
|
||||||
import Standard.Base.System.File.Generic.Writable_File.Writable_File
|
import Standard.Base.System.File.Generic.Writable_File.Writable_File
|
||||||
import Standard.Base.System.File_Format_Metadata.File_Format_Metadata
|
import Standard.Base.System.File_Format_Metadata.File_Format_Metadata
|
||||||
@ -19,7 +20,7 @@ type Tableau_Format
|
|||||||
Resolve an unresolved constructor to the actual type.
|
Resolve an unresolved constructor to the actual type.
|
||||||
resolve : Function -> Tableau_Format | Nothing
|
resolve : Function -> Tableau_Format | Nothing
|
||||||
resolve constructor =
|
resolve constructor =
|
||||||
Panic.catch Any (constructor:Tableau_Format) _->Nothing
|
Panic.catch Type_Error (constructor:Tableau_Format) _->Nothing
|
||||||
|
|
||||||
## PRIVATE
|
## PRIVATE
|
||||||
ADVANCED
|
ADVANCED
|
||||||
|
@ -59,7 +59,7 @@ public final class EnsoSecretHelper extends SecretValueResolver {
|
|||||||
Builder builder,
|
Builder builder,
|
||||||
URIWithSecrets uri,
|
URIWithSecrets uri,
|
||||||
List<Pair<String, HideableValue>> headers)
|
List<Pair<String, HideableValue>> headers)
|
||||||
throws IOException, InterruptedException {
|
throws IllegalArgumentException, IOException, InterruptedException {
|
||||||
|
|
||||||
// Build a new URI with the query arguments.
|
// Build a new URI with the query arguments.
|
||||||
URI resolvedURI = resolveURI(uri);
|
URI resolvedURI = resolveURI(uri);
|
||||||
|
@ -273,7 +273,7 @@ public class ExcelConnectionPool {
|
|||||||
// If the initialization succeeds, the POIFSFileSystem will be closed by the
|
// If the initialization succeeds, the POIFSFileSystem will be closed by the
|
||||||
// HSSFWorkbook::close.
|
// HSSFWorkbook::close.
|
||||||
yield new HSSFWorkbook(fs);
|
yield new HSSFWorkbook(fs);
|
||||||
} catch (Exception e) {
|
} catch (IOException e) {
|
||||||
fs.close();
|
fs.close();
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,7 @@ import java.net.URI;
|
|||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
import java.nio.channels.Channels;
|
import java.nio.channels.Channels;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.InvalidPathException;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@ -46,7 +47,7 @@ public class HyperReader {
|
|||||||
if (!Files.exists(HYPER_PATH)) {
|
if (!Files.exists(HYPER_PATH)) {
|
||||||
try {
|
try {
|
||||||
Files.createDirectories(HYPER_PATH);
|
Files.createDirectories(HYPER_PATH);
|
||||||
} catch (Exception e) {
|
} catch (IOException | UnsupportedOperationException | SecurityException e) {
|
||||||
throw new IOException("Failed to create Hyper directory: " + HYPER_PATH, e);
|
throw new IOException("Failed to create Hyper directory: " + HYPER_PATH, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -75,7 +76,11 @@ public class HyperReader {
|
|||||||
"Unsupported platform: " + OSPlatform.CurrentPlatform);
|
"Unsupported platform: " + OSPlatform.CurrentPlatform);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (IOException
|
||||||
|
| URISyntaxException
|
||||||
|
| InvalidPathException
|
||||||
|
| UnsupportedOperationException
|
||||||
|
| SecurityException e) {
|
||||||
throw new IOException("Failed to download hyperd.", e);
|
throw new IOException("Failed to download hyperd.", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -100,7 +105,11 @@ public class HyperReader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static void downloadHyper(String uri, String fileName, boolean setExecutable)
|
private static void downloadHyper(String uri, String fileName, boolean setExecutable)
|
||||||
throws IOException, URISyntaxException {
|
throws IOException,
|
||||||
|
URISyntaxException,
|
||||||
|
InvalidPathException,
|
||||||
|
UnsupportedOperationException,
|
||||||
|
SecurityException {
|
||||||
LOGGER.log(Level.INFO, "Downloading Hyper from: " + uri);
|
LOGGER.log(Level.INFO, "Downloading Hyper from: " + uri);
|
||||||
var hyperdFile = HYPER_PATH.resolve(fileName).toFile();
|
var hyperdFile = HYPER_PATH.resolve(fileName).toFile();
|
||||||
var url = new URI(uri);
|
var url = new URI(uri);
|
||||||
|
@ -9,6 +9,8 @@ from Standard.Test import all
|
|||||||
import enso_dev.Base_Tests.Network.Enso_Cloud.Cloud_Tests_Setup.Cloud_Tests_Setup
|
import enso_dev.Base_Tests.Network.Enso_Cloud.Cloud_Tests_Setup.Cloud_Tests_Setup
|
||||||
from enso_dev.Base_Tests.Network.Enso_Cloud.Audit_Log_Spec import Audit_Log_Event, get_audit_log_events
|
from enso_dev.Base_Tests.Network.Enso_Cloud.Audit_Log_Spec import Audit_Log_Event, get_audit_log_events
|
||||||
|
|
||||||
|
import project.Database.Postgres_Spec.Temporary_Data_Link_File
|
||||||
|
from project.Database.Postgres_Spec import get_configured_connection_details
|
||||||
from project.Util import all
|
from project.Util import all
|
||||||
|
|
||||||
polyglot java import java.lang.Thread
|
polyglot java import java.lang.Thread
|
||||||
@ -90,3 +92,11 @@ add_specs suite_builder prefix ~datalink_to_connection database_pending =
|
|||||||
3. switch to mock cloud (if wanted) and run some queries
|
3. switch to mock cloud (if wanted) and run some queries
|
||||||
4. inspect logs and search for the asset id
|
4. inspect logs and search for the asset id
|
||||||
Error.throw "TODO"
|
Error.throw "TODO"
|
||||||
|
|
||||||
|
main filter=Nothing =
|
||||||
|
connection_details = get_configured_connection_details
|
||||||
|
pending = if connection_details.is_nothing then "PostgreSQL test database is not configured. See README.md for instructions."
|
||||||
|
data_link_file = Temporary_Data_Link_File.make connection_details
|
||||||
|
suite = Test.build suite_builder->
|
||||||
|
add_specs suite_builder "[PostgreSQL] " data_link_file.get database_pending=pending
|
||||||
|
suite.run_with_filter filter
|
||||||
|
Loading…
Reference in New Issue
Block a user