Skip to content

Commit 08ffc6a

Browse files
authored
Merge pull request #17 from viniciusam/feature/rename_base_package
Rename base package to org.utplsql
2 parents 13f96d7 + f3c017d commit 08ffc6a

25 files changed

+47
-66
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ services:
55
- docker
66

77
jdk:
8-
# - oraclejdk7
98
- oraclejdk8
109

1110
env:

pom.xml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>io.github.utplsql</groupId>
5+
<groupId>org.utplsql</groupId>
66
<artifactId>java-api</artifactId>
77
<version>1.0-SNAPSHOT</version>
88
<packaging>jar</packaging>
@@ -31,24 +31,6 @@
3131
</dependency>
3232
</dependencies>
3333

34-
<!--<build>-->
35-
<!--<plugins>-->
36-
<!--<plugin>-->
37-
<!--<groupId>net.orfjackal.retrolambda</groupId>-->
38-
<!--<artifactId>retrolambda-maven-plugin</artifactId>-->
39-
<!--<version>2.5.1</version>-->
40-
<!--<executions>-->
41-
<!--<execution>-->
42-
<!--<goals>-->
43-
<!--<goal>process-main</goal>-->
44-
<!--<goal>process-test</goal>-->
45-
<!--</goals>-->
46-
<!--</execution>-->
47-
<!--</executions>-->
48-
<!--</plugin>-->
49-
<!--</plugins>-->
50-
<!--</build>-->
51-
5234
<repositories>
5335
<repository>
5436
<id>maven.oracle.com</id>

src/main/java/io/github/utplsql/api/CustomTypes.java renamed to src/main/java/org/utplsql/api/CustomTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.utplsql.api;
1+
package org.utplsql.api;
22

33
/**
44
* Database custom data reporter.

src/main/java/io/github/utplsql/api/DBHelper.java renamed to src/main/java/org/utplsql/api/DBHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.utplsql.api;
1+
package org.utplsql.api;
22

33
import oracle.jdbc.OracleTypes;
44

src/main/java/io/github/utplsql/api/FileMapper.java renamed to src/main/java/org/utplsql/api/FileMapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.utplsql.api;
1+
package org.utplsql.api;
22

33

44
import oracle.jdbc.OracleConnection;
@@ -40,7 +40,7 @@ public static Array buildFileMappingArray(
4040
int paramIdx = 0;
4141
callableStatement.registerOutParameter(++paramIdx, OracleTypes.ARRAY, CustomTypes.UT_FILE_MAPPINGS);
4242

43-
if (mapperOptions.getRegexPattern() == null) {
43+
if (mapperOptions.getObjectOwner() == null) {
4444
callableStatement.setNull(++paramIdx, Types.VARCHAR);
4545
} else {
4646
callableStatement.setString(++paramIdx, mapperOptions.getObjectOwner());
@@ -50,7 +50,7 @@ public static Array buildFileMappingArray(
5050
++paramIdx, oraConn.createOracleArray(CustomTypes.UT_VARCHAR2_LIST, mapperOptions.getFilePaths().toArray()));
5151

5252
if (mapperOptions.getTypeMappings() == null) {
53-
callableStatement.setNull(++paramIdx, Types.ARRAY, CustomTypes.UT_KEY_VALUE_PAIR);
53+
callableStatement.setNull(++paramIdx, Types.ARRAY, CustomTypes.UT_KEY_VALUE_PAIRS);
5454
} else {
5555
callableStatement.setArray(
5656
++paramIdx, oraConn.createOracleArray(CustomTypes.UT_KEY_VALUE_PAIRS, mapperOptions.getTypeMappings().toArray()));

src/main/java/io/github/utplsql/api/FileMapperOptions.java renamed to src/main/java/org/utplsql/api/FileMapperOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.utplsql.api;
1+
package org.utplsql.api;
22

33
import java.util.List;
44

src/main/java/io/github/utplsql/api/FileMapping.java renamed to src/main/java/org/utplsql/api/FileMapping.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.utplsql.api;
1+
package org.utplsql.api;
22

33
import java.sql.SQLData;
44
import java.sql.SQLException;

src/main/java/io/github/utplsql/api/KeyValuePair.java renamed to src/main/java/org/utplsql/api/KeyValuePair.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.utplsql.api;
1+
package org.utplsql.api;
22

33
import java.sql.SQLData;
44
import java.sql.SQLException;

src/main/java/io/github/utplsql/api/OutputBuffer.java renamed to src/main/java/org/utplsql/api/OutputBuffer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.utplsql.api;
1+
package org.utplsql.api;
22

3-
import io.github.utplsql.api.reporter.Reporter;
3+
import org.utplsql.api.reporter.Reporter;
44
import oracle.jdbc.OracleTypes;
55

66
import java.io.PrintStream;

src/main/java/io/github/utplsql/api/TestRunner.java renamed to src/main/java/org/utplsql/api/TestRunner.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.github.utplsql.api;
1+
package org.utplsql.api;
22

3-
import io.github.utplsql.api.exception.SomeTestsFailedException;
4-
import io.github.utplsql.api.reporter.DocumentationReporter;
5-
import io.github.utplsql.api.reporter.Reporter;
3+
import org.utplsql.api.exception.SomeTestsFailedException;
4+
import org.utplsql.api.reporter.DocumentationReporter;
5+
import org.utplsql.api.reporter.Reporter;
66
import oracle.jdbc.OracleConnection;
77

88
import java.sql.CallableStatement;

src/main/java/io/github/utplsql/api/exception/SomeTestsFailedException.java renamed to src/main/java/org/utplsql/api/exception/SomeTestsFailedException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.utplsql.api.exception;
1+
package org.utplsql.api.exception;
22

33
import java.sql.SQLException;
44

src/main/java/io/github/utplsql/api/reporter/CoverageHTMLReporter.java renamed to src/main/java/org/utplsql/api/reporter/CoverageHTMLReporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.utplsql.api.reporter;
1+
package org.utplsql.api.reporter;
22

3-
import io.github.utplsql.api.CustomTypes;
3+
import org.utplsql.api.CustomTypes;
44

55
import java.sql.SQLException;
66
import java.sql.SQLInput;

src/main/java/io/github/utplsql/api/reporter/CoverageSonarReporter.java renamed to src/main/java/org/utplsql/api/reporter/CoverageSonarReporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.utplsql.api.reporter;
1+
package org.utplsql.api.reporter;
22

3-
import io.github.utplsql.api.CustomTypes;
3+
import org.utplsql.api.CustomTypes;
44

55
import java.sql.SQLException;
66

src/main/java/io/github/utplsql/api/reporter/CoverallsReporter.java renamed to src/main/java/org/utplsql/api/reporter/CoverallsReporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.utplsql.api.reporter;
1+
package org.utplsql.api.reporter;
22

3-
import io.github.utplsql.api.CustomTypes;
3+
import org.utplsql.api.CustomTypes;
44

55
import java.sql.SQLException;
66

src/main/java/io/github/utplsql/api/reporter/DocumentationReporter.java renamed to src/main/java/org/utplsql/api/reporter/DocumentationReporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.utplsql.api.reporter;
1+
package org.utplsql.api.reporter;
22

3-
import io.github.utplsql.api.CustomTypes;
3+
import org.utplsql.api.CustomTypes;
44

55
import java.sql.SQLException;
66
import java.sql.SQLInput;

src/main/java/io/github/utplsql/api/reporter/Reporter.java renamed to src/main/java/org/utplsql/api/reporter/Reporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.utplsql.api.reporter;
1+
package org.utplsql.api.reporter;
22

3-
import io.github.utplsql.api.DBHelper;
3+
import org.utplsql.api.DBHelper;
44

55
import java.sql.*;
66
import java.util.Calendar;

src/main/java/io/github/utplsql/api/reporter/ReporterFactory.java renamed to src/main/java/org/utplsql/api/reporter/ReporterFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.utplsql.api.reporter;
1+
package org.utplsql.api.reporter;
22

3-
import io.github.utplsql.api.CustomTypes;
3+
import org.utplsql.api.CustomTypes;
44

55
public final class ReporterFactory {
66

src/main/java/io/github/utplsql/api/reporter/SonarTestReporter.java renamed to src/main/java/org/utplsql/api/reporter/SonarTestReporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.utplsql.api.reporter;
1+
package org.utplsql.api.reporter;
22

3-
import io.github.utplsql.api.CustomTypes;
3+
import org.utplsql.api.CustomTypes;
44

55
import java.sql.SQLException;
66

src/main/java/io/github/utplsql/api/reporter/TeamCityReporter.java renamed to src/main/java/org/utplsql/api/reporter/TeamCityReporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.utplsql.api.reporter;
1+
package org.utplsql.api.reporter;
22

3-
import io.github.utplsql.api.CustomTypes;
3+
import org.utplsql.api.CustomTypes;
44

55
import java.sql.SQLException;
66

src/main/java/io/github/utplsql/api/reporter/XUnitReporter.java renamed to src/main/java/org/utplsql/api/reporter/XUnitReporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.utplsql.api.reporter;
1+
package org.utplsql.api.reporter;
22

3-
import io.github.utplsql.api.CustomTypes;
3+
import org.utplsql.api.CustomTypes;
44

55
import java.sql.SQLException;
66

src/test/java/io/github/utplsql/api/FileMapperTest.java renamed to src/test/java/org/utplsql/api/FileMapperTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.utplsql.api;
1+
package org.utplsql.api;
22

3-
import io.github.utplsql.api.rules.DatabaseRule;
3+
import org.utplsql.api.rules.DatabaseRule;
44
import org.junit.Assert;
55
import org.junit.Rule;
66
import org.junit.Test;

src/test/java/io/github/utplsql/api/OutputBufferTest.java renamed to src/test/java/org/utplsql/api/OutputBufferTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.github.utplsql.api;
1+
package org.utplsql.api;
22

3-
import io.github.utplsql.api.reporter.DocumentationReporter;
4-
import io.github.utplsql.api.reporter.Reporter;
5-
import io.github.utplsql.api.rules.DatabaseRule;
3+
import org.utplsql.api.reporter.DocumentationReporter;
4+
import org.utplsql.api.reporter.Reporter;
5+
import org.utplsql.api.rules.DatabaseRule;
66
import org.junit.Assert;
77
import org.junit.Rule;
88
import org.junit.Test;

src/test/java/io/github/utplsql/api/ReporterNameTest.java renamed to src/test/java/org/utplsql/api/ReporterNameTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.github.utplsql.api;
1+
package org.utplsql.api;
22

3-
import io.github.utplsql.api.reporter.*;
43
import org.junit.Assert;
54
import org.junit.Test;
5+
import org.utplsql.api.reporter.*;
66

77
import java.sql.SQLException;
88

src/test/java/io/github/utplsql/api/TestRunnerTest.java renamed to src/test/java/org/utplsql/api/TestRunnerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package io.github.utplsql.api;
1+
package org.utplsql.api;
22

3-
import io.github.utplsql.api.exception.SomeTestsFailedException;
4-
import io.github.utplsql.api.reporter.*;
5-
import io.github.utplsql.api.rules.DatabaseRule;
63
import org.junit.Assert;
74
import org.junit.Rule;
85
import org.junit.Test;
6+
import org.utplsql.api.exception.SomeTestsFailedException;
7+
import org.utplsql.api.reporter.*;
8+
import org.utplsql.api.rules.DatabaseRule;
99

1010
import java.sql.Connection;
1111
import java.sql.SQLException;

src/test/java/io/github/utplsql/api/rules/DatabaseRule.java renamed to src/test/java/org/utplsql/api/rules/DatabaseRule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.utplsql.api.rules;
1+
package org.utplsql.api.rules;
22

33
import org.junit.rules.ExternalResource;
44

0 commit comments

Comments
 (0)