Skip to content

Commit da4d2ea

Browse files
committed
Make LocalDdlMigrationResource and LocalJdbcMigrationResource internal (not public)
These are currently publicly accessible and ideally are not. If there are issues with these being internal / package protected we need to adjust this. Also removing the LocalDdlMigrationResource.lines() method. In theory this is not being used anywhere.
1 parent 5e6a2bf commit da4d2ea

File tree

4 files changed

+11
-18
lines changed

4 files changed

+11
-18
lines changed

ebean-migration/src/main/java/io/ebean/migration/runner/Checksum.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ class Checksum {
1414
/**
1515
* Returns the checksum of the string content.
1616
*/
17-
static int calculate(String str) {
17+
static int calculate(String content) {
1818
final CRC32 crc32 = new CRC32();
19-
BufferedReader bufferedReader = new BufferedReader(new StringReader(str));
19+
BufferedReader bufferedReader = new BufferedReader(new StringReader(content));
2020
try {
2121
String line;
2222
while ((line = bufferedReader.readLine()) != null) {

ebean-migration/src/main/java/io/ebean/migration/runner/LocalDdlMigrationResource.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@
99
/**
1010
* A DB migration resource (DDL script with version).
1111
*/
12-
public class LocalDdlMigrationResource extends LocalMigrationResource {
12+
final class LocalDdlMigrationResource extends LocalMigrationResource {
1313

1414
private final Resource resource;
1515

1616
/**
1717
* Construct with version and resource.
1818
*/
19-
public LocalDdlMigrationResource(MigrationVersion version, String location, Resource resource) {
19+
LocalDdlMigrationResource(MigrationVersion version, String location, Resource resource) {
2020
super(version, location);
2121
this.resource = resource;
2222
}
2323

2424
/**
2525
* Return the content for the migration apply ddl script.
2626
*/
27+
@Override
2728
public String content() {
2829
try {
2930
return resource.loadAsString(StandardCharsets.UTF_8);
@@ -32,14 +33,6 @@ public String content() {
3233
}
3334
}
3435

35-
public List<String> lines() {
36-
try {
37-
return resource.loadAsLines(StandardCharsets.UTF_8);
38-
} catch (NullPointerException e) {
39-
throw new IllegalStateException(missingOpensMessage(), e);
40-
}
41-
}
42-
4336
private String missingOpensMessage() {
4437
return "NPE reading DB migration content at [" + location + "] Probably missing an 'opens dbmigration;' in module-info.java";
4538
}

ebean-migration/src/main/java/io/ebean/migration/runner/LocalJdbcMigrationResource.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@
99
*
1010
* @author Roland Praml, FOCONIS AG
1111
*/
12-
public class LocalJdbcMigrationResource extends LocalMigrationResource {
12+
final class LocalJdbcMigrationResource extends LocalMigrationResource {
1313

1414
private final JdbcMigration migration;
1515

1616
/**
1717
* Construct with version and resource.
1818
*/
19-
public LocalJdbcMigrationResource(MigrationVersion version, String location, JdbcMigration migration) {
19+
LocalJdbcMigrationResource(MigrationVersion version, String location, JdbcMigration migration) {
2020
super(version, location);
2121
this.migration = migration;
2222
}
2323

2424
/**
2525
* Return the migration
2626
*/
27-
public JdbcMigration getMigration() {
27+
JdbcMigration migration() {
2828
return migration;
2929
}
3030

3131
/**
3232
* Returns the checksum of the migration routine.
3333
*/
34-
public int getChecksum() {
34+
int checksum() {
3535
if (migration instanceof MigrationChecksumProvider) {
3636
return ((MigrationChecksumProvider) migration).getChecksum();
3737
} else {

ebean-migration/src/main/java/io/ebean/migration/runner/MigrationTable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ private boolean runMigration(LocalMigrationResource local, MigrationMetaRow exis
300300
script = convertScript(local.content());
301301
checksum = Checksum.calculate(script);
302302
} else {
303-
checksum = ((LocalJdbcMigrationResource) local).getChecksum();
303+
checksum = ((LocalJdbcMigrationResource) local).checksum();
304304
}
305305

306306
if (existing == null && patchInsertMigration(local, checksum)) {
@@ -406,7 +406,7 @@ private long executeMigration(LocalMigrationResource local, String script) throw
406406
log.log(DEBUG, "run migration {0}", local.location());
407407
scriptRunner.runScript(script, "run migration version: " + local.version());
408408
} else {
409-
JdbcMigration migration = ((LocalJdbcMigrationResource) local).getMigration();
409+
JdbcMigration migration = ((LocalJdbcMigrationResource) local).migration();
410410
log.log(INFO, "Executing jdbc migration version: {0} - {1}", local.version(), migration);
411411
migration.migrate(connection);
412412
}

0 commit comments

Comments
 (0)