Skip to content

Commit 85fed06

Browse files
author
Augusto Passalaqua
authored
Merge pull request #23 from passalaqua/cleanup-8.6-for-release
Cleanup 8.6 for release
2 parents e40b3a6 + 224d695 commit 85fed06

File tree

64 files changed

+1028
-930
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1028
-930
lines changed

‎DatabaseConnector.mpr‎

0 Bytes
Binary file not shown.

‎DatabaseConnector.pom.xml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>com.mendix.databaseconnector</groupId>
9+
<artifactId>databaseconnector-main</artifactId>
10+
<version>3.0.0</version>
11+
<relativePath>.</relativePath>
12+
</parent>
13+
14+
<artifactId>databaseconnector</artifactId>
15+
<version>3.0.0</version>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>com.zaxxer</groupId>
20+
<artifactId>HikariCP</artifactId>
21+
<version>2.6.1</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.slf4j</groupId>
25+
<artifactId>slf4j-api</artifactId>
26+
<version>1.7.21</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>com.ibm.db2.jcc</groupId>
30+
<artifactId>db2jcc</artifactId>
31+
<version>db2jcc4</version>
32+
<scope>runtime</scope>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.hsqldb</groupId>
36+
<artifactId>hsqldb</artifactId>
37+
<version>2.4.1</version>
38+
<scope>runtime</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.mariadb.jdbc</groupId>
42+
<artifactId>mariadb-java-client</artifactId>
43+
<version>2.4.0</version>
44+
<scope>runtime</scope>
45+
</dependency>
46+
<dependency>
47+
<groupId>com.microsoft.sqlserver</groupId>
48+
<artifactId>mssql-jdbc</artifactId>
49+
<version>7.2.1.jre8</version>
50+
<scope>runtime</scope>
51+
</dependency>
52+
<dependency>
53+
<groupId>com.oracle.database.jdbc</groupId>
54+
<artifactId>ojdbc8</artifactId>
55+
<version>12.2.0.1</version>
56+
<scope>runtime</scope>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.postgresql</groupId>
60+
<artifactId>postgresql</artifactId>
61+
<version>42.2.9</version>
62+
<scope>runtime</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>com.sap.cloud.db.jdbc</groupId>
66+
<artifactId>ngdbc</artifactId>
67+
<version>2.3.58</version>
68+
<scope>runtime</scope>
69+
</dependency>
70+
</dependencies>
71+
</project>

‎DatabaseConnectorTest.pom.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>com.mendix.databaseconnector</groupId>
9+
<artifactId>databaseconnector-main</artifactId>
10+
<version>3.0.0</version>
11+
<relativePath>.</relativePath>
12+
</parent>
13+
14+
<artifactId>databaseconnectortest</artifactId>
15+
<version>3.0.0</version>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.mockito</groupId>
20+
<artifactId>mockito-core</artifactId>
21+
<version>3.2.4</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>commons-io</groupId>
25+
<artifactId>commons-io</artifactId>
26+
<version>2.3</version>
27+
</dependency>
28+
</dependencies>
29+
</project>

‎javasource/databaseconnector/actions/ExecuteParameterisedQuery.java‎ renamed to ‎javasource/databaseconnector/actions/ExecuteParameterizedQuery.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
/**
2424
* <p>
25-
* This Java action provides a consistent environment for Mendix projects to perform an arbitrary parameterised SELECT SQL query on relational external databases.
25+
* This Java action provides a consistent environment for Mendix projects to perform an arbitrary parameterized SELECT SQL query on relational external databases.
2626
* JDBC (Java Database Connectivity) API, a standard Java API, is used when this Java action attempts
2727
* to connect with a Relational Database for which a JDBC driver exists.
2828
* The JDBC drivers for the databases you want to connect to, must be placed inside the userlib directory of a project.
@@ -55,15 +55,15 @@
5555
* @return <List<IMendixObject>>
5656
* SELECT Query result as a list of objects.
5757
*/
58-
public class ExecuteParameterisedQuery extends CustomJavaAction<java.util.List<IMendixObject>>
58+
public class ExecuteParameterizedQuery extends CustomJavaAction<java.util.List<IMendixObject>>
5959
{
6060
private java.lang.String jdbcUrl;
6161
private java.lang.String userName;
6262
private java.lang.String password;
6363
private com.mendix.systemwideinterfaces.javaactions.parameters.IStringTemplate sql;
6464
private java.lang.String resultObjectType;
6565

66-
public ExecuteParameterisedQuery(IContext context, java.lang.String jdbcUrl, java.lang.String userName, java.lang.String password, com.mendix.systemwideinterfaces.javaactions.parameters.IStringTemplate sql, java.lang.String resultObjectType)
66+
public ExecuteParameterizedQuery(IContext context, java.lang.String jdbcUrl, java.lang.String userName, java.lang.String password, com.mendix.systemwideinterfaces.javaactions.parameters.IStringTemplate sql, java.lang.String resultObjectType)
6767
{
6868
super(context);
6969
this.jdbcUrl = jdbcUrl;
@@ -93,7 +93,7 @@ public java.util.List<IMendixObject> executeAction() throws Exception
9393
@java.lang.Override
9494
public java.lang.String toString()
9595
{
96-
return "ExecuteParameterisedQuery";
96+
return "ExecuteParameterizedQuery";
9797
}
9898

9999
// BEGIN EXTRA CODE

‎javasource/databaseconnector/actions/ExecuteParameterisedStatement.java‎ renamed to ‎javasource/databaseconnector/actions/ExecuteParameterizedStatement.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
/**
1919
* <p>
20-
* This Java action provides a consistent environment for Mendix projects to perform an arbitrary parameterised SQL statement on relational
20+
* This Java action provides a consistent environment for Mendix projects to perform an arbitrary parameterized SQL statement on relational
2121
* external databases.
2222
* JDBC (Java Database Connectivity) API, a standard Java API, is used when this Java action attempts
2323
* to connect with a Relational Database for which a JDBC driver exists.
@@ -48,14 +48,14 @@
4848
* @return <Integer/Long>
4949
* Number of affected rows.
5050
*/
51-
public class ExecuteParameterisedStatement extends CustomJavaAction<java.lang.Long>
51+
public class ExecuteParameterizedStatement extends CustomJavaAction<java.lang.Long>
5252
{
5353
private java.lang.String jdbcUrl;
5454
private java.lang.String userName;
5555
private java.lang.String password;
5656
private com.mendix.systemwideinterfaces.javaactions.parameters.IStringTemplate sql;
5757

58-
public ExecuteParameterisedStatement(IContext context, java.lang.String jdbcUrl, java.lang.String userName, java.lang.String password, com.mendix.systemwideinterfaces.javaactions.parameters.IStringTemplate sql)
58+
public ExecuteParameterizedStatement(IContext context, java.lang.String jdbcUrl, java.lang.String userName, java.lang.String password, com.mendix.systemwideinterfaces.javaactions.parameters.IStringTemplate sql)
5959
{
6060
super(context);
6161
this.jdbcUrl = jdbcUrl;
@@ -78,7 +78,7 @@ public java.lang.Long executeAction() throws Exception
7878
@java.lang.Override
7979
public java.lang.String toString()
8080
{
81-
return "ExecuteParameterisedStatement";
81+
return "ExecuteParameterizedStatement";
8282
}
8383

8484
// BEGIN EXTRA CODE

‎javasource/databaseconnectortest/actions/AssertEqualsListEntityValues.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import static java.lang.String.format;
1313
import static java.util.stream.Collectors.joining;
14-
import static org.apache.commons.lang3.StringUtils.isEmpty;
1514
import java.io.IOException;
1615
import java.io.InputStream;
1716
import java.math.BigDecimal;
@@ -90,6 +89,10 @@ private Optional<String> compare(int objectNr, IMendixObject expected, IMendixOb
9089
return isEmpty(message) ? Optional.empty() : Optional.of(format("Row %s: ", objectNr) + message);
9190
}
9291

92+
private boolean isEmpty(String message) {
93+
return message == null || message.isBlank();
94+
}
95+
9396
private Optional<String> compare(PrimitiveType primitiveType, IMendixObjectMember<?> expected, IMendixObjectMember<?> actual) {
9497
Object expectedValue = toComparableValue(expected.getValue(getContext()));
9598
Object actualValue = toComparableValue(actual.getValue(getContext()));

‎javasource/databaseconnectortest/test/PreparedStatementCreatorTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package databaseconnectortest.test;
22

3-
import com.amazon.dsi.exceptions.InvalidArgumentException;
43
import com.mendix.systemwideinterfaces.javaactions.parameters.IStringTemplate;
54
import com.mendix.systemwideinterfaces.javaactions.parameters.ITemplateParameter;
65
import com.mendix.systemwideinterfaces.javaactions.parameters.TemplateParameterType;
@@ -111,7 +110,7 @@ public void testStringQuery() throws SQLException {
111110
}
112111

113112
@Test(expected = IllegalArgumentException.class)
114-
public void testUnknownParameterType() throws InvalidArgumentException, SQLException {
113+
public void testUnknownParameterType() throws SQLException {
115114
StringTemplateBuilder builder = new StringTemplateBuilder();
116115
builder.addParameter(null, TemplateParameterType.valueOf("nonexisting value"));
117116

0 commit comments

Comments
 (0)