Skip to content

Commit

Permalink
Remove unnecessary "? super String" generic spec
Browse files Browse the repository at this point in the history
  • Loading branch information
safris committed Aug 19, 2023
1 parent cf9f7f9 commit 601b58d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions ddlx/src/main/java/org/jaxdb/ddlx/Generator.java
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@ private ColumnRef(final $Column column, final int index) {
}
}

private static void registerColumns(final $Table table, final Set<? super String> tableNames, final Map<? super String,ColumnRef> columnNameToColumn) throws GeneratorExecutionException {
private static void registerColumns(final $Table table, final Set<String> tableNames, final Map<String,ColumnRef> columnNameToColumn) throws GeneratorExecutionException {
final String tableName = table.getName$().text();
final List<String> violations = new ArrayList<>();
final ArrayList<String> violations = new ArrayList<>();
String nameViolation = checkNameViolation(tableName);
if (nameViolation != null)
violations.add(nameViolation);
Expand Down Expand Up @@ -198,7 +198,7 @@ private static void registerColumns(final $Table table, final Set<? super String
violations.forEach(logger::warn);
}

private LinkedHashSet<CreateStatement> parseTable(final DbVendor vendor, final $Table table, final Set<? super String> tableNames, final HashMap<String,String> enumTemplateToValues, final Map<String,Map<String,String>> tableNameToEnumToOwner) throws GeneratorExecutionException {
private LinkedHashSet<CreateStatement> parseTable(final DbVendor vendor, final $Table table, final Set<String> tableNames, final HashMap<String,String> enumTemplateToValues, final Map<String,Map<String,String>> tableNameToEnumToOwner) throws GeneratorExecutionException {
// Next, register the column names to be referenceable by the @primaryKey element
final Map<String,ColumnRef> columnNameToColumn = new HashMap<>();
registerColumns(table, tableNames, columnNameToColumn);
Expand Down
3 changes: 2 additions & 1 deletion ddlx/src/main/java/org/jaxdb/ddlx/OracleCompiler.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.io.IOException;
import java.io.UncheckedIOException;
import java.net.URL;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
Expand Down Expand Up @@ -54,7 +55,7 @@ final class OracleCompiler extends Compiler {
void init(final Connection connection) throws SQLException {
try {
final ClassLoader classLoader = OracleCompiler.class.getClassLoader();
Resources.walk(classLoader, "org/jaxdb/oracle", (root, entry, isDirectory) -> {
Resources.walk(classLoader, "org/jaxdb/oracle", (final URL root, final String entry, final boolean isDirectory) -> {
if (!isDirectory) {
try (final Statement statement = connection.createStatement()) {
statement.execute(new String(URLs.readBytes(classLoader.getResource(entry))));
Expand Down
6 changes: 3 additions & 3 deletions jsql/src/main/java/org/jaxdb/jsql/statement.java
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,9 @@ public interface NotifiableModification extends Modification {
public interface Notifiable<T extends statement.NotifiableModification> extends statement.Modification {
public interface Static<T extends statement.NotifiableModification> extends statement.Modification {
/**
* Sets a static value to the be returned in place of a {@link OnNotify} predicate for each notification generated by the DB
* as a result of {@code this} statement. Since the notifications generated by the DB are asynchronous,
* {@link NotifiableResult#awaitNotify(long)} can be used to block the current thread until:
* Sets a static value to be returned in place of a {@link OnNotify} predicate for each notification generated by the DB as
* a result of {@code this} statement. Since the notifications generated by the DB are asynchronous,
* {@link NotifiableResult#awaitNotify(long)} can be used to block the current thread until either:
* <ul>
* <li>the {@code onNotify} argument is {@code false}.</li>
* <li>the receipt of all notifications generated by the DB as a result of {@code this} statement</li>
Expand Down

0 comments on commit 601b58d

Please sign in to comment.