Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Version info and info command in cli #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pesse merged 11 commits into from
Jun 13, 2018
Merged

Version info and info command in cli #87

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fbbef6d
Minimal viable (and ugly) solution to add version info to cli
pesse May 31, 2018
2772add
First set of refactorings around ConnectionInfo
pesse Jun 5, 2018
457625d
Refactoring around commands.
pesse Jun 5, 2018
3236087
Improved tests for VersionInfoCommand
pesse Jun 7, 2018
6326514
Updated help
pesse Jun 7, 2018
feff4a3
Added another command: reporters <ConnectionUrl>
pesse Jun 7, 2018
52d4368
Added documentation
pesse Jun 7, 2018
808a2d6
Some improvements to documentation
pesse Jun 8, 2018
554c71b
Refactoring of ReportersCommand
pesse Jun 12, 2018
93c8e5d
Some more minor refactoring
pesse Jun 12, 2018
d402718
Switch table-like to 4-space intendation
pesse Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Some more minor refactoring
  • Loading branch information
@pesse
pesse committed Jun 12, 2018
commit 93c8e5daa8f9ea8343f968a81e593b8af6fabed4
11 changes: 6 additions & 5 deletions src/main/java/org/utplsql/cli/ReportersCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ public class ReportersCommand implements ICommand {
description = ConnectionInfo.COMMANDLINE_PARAM_DESCRIPTION)
private List<ConnectionInfo> connectionInfoList = new ArrayList<>();

public ConnectionInfo getConnectionInfo() {
if ( connectionInfoList != null && connectionInfoList.size() > 0 )
return connectionInfoList.get(0);
else
return null;
private ConnectionInfo getConnectionInfo() {
assert connectionInfoList != null;
assert connectionInfoList.size() > 0;
assert connectionInfoList.get(0) != null;

return connectionInfoList.get(0);
}

@Override
Expand Down
20 changes: 13 additions & 7 deletions src/main/java/org/utplsql/cli/VersionInfoCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;

Expand All @@ -34,7 +35,18 @@ public int run() {
System.out.println(CliVersionInfo.getInfo());
System.out.println(JavaApiVersionInfo.getInfo());

ConnectionInfo ci = getConnectionInfo();
try {
writeUtPlsqlVersion(getConnectionInfo());
}
catch (SQLException e) {
e.printStackTrace();
return 1;
}

return 0;
}

private void writeUtPlsqlVersion( ConnectionInfo ci ) throws SQLException {
if ( ci != null ) {

DataSource dataSource = DataSourceProvider.getDataSource(ci, 1);
Expand All @@ -46,13 +58,7 @@ public int run() {
catch ( UtPLSQLNotInstalledException e ) {
System.out.println("utPLSQL framework is not installed in database.");
}
catch ( Exception e ) {
e.printStackTrace();
return 1;
}
}

return 0;
}

@Override
Expand Down