From 87b931622679d91c5eb4840fab2143fec7e48dd6 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Thu, 17 Dec 2015 10:39:14 +0100 Subject: [PATCH] [#4815] Relax bound from > to for DSLContext.loadInto() --- jOOQ/src/main/java/org/jooq/DSLContext.java | 2 +- jOOQ/src/main/java/org/jooq/Loader.java | 2 +- jOOQ/src/main/java/org/jooq/LoaderCSVOptionsStep.java | 2 +- jOOQ/src/main/java/org/jooq/LoaderCSVStep.java | 2 +- jOOQ/src/main/java/org/jooq/LoaderJSONOptionsStep.java | 2 +- jOOQ/src/main/java/org/jooq/LoaderJSONStep.java | 2 +- jOOQ/src/main/java/org/jooq/LoaderListenerStep.java | 2 +- jOOQ/src/main/java/org/jooq/LoaderLoadStep.java | 2 +- jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java | 2 +- jOOQ/src/main/java/org/jooq/LoaderRowsStep.java | 2 +- jOOQ/src/main/java/org/jooq/LoaderSourceStep.java | 2 +- jOOQ/src/main/java/org/jooq/LoaderXMLStep.java | 2 +- jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java | 2 +- jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java | 5 ++--- 14 files changed, 15 insertions(+), 16 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index 3bf6a517c5..87fc767d4f 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -399,7 +399,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * source. */ @Support - > LoaderOptionsStep loadInto(Table table); + LoaderOptionsStep loadInto(Table table); // ------------------------------------------------------------------------- // XXX Plain SQL API diff --git a/jOOQ/src/main/java/org/jooq/Loader.java b/jOOQ/src/main/java/org/jooq/Loader.java index 90b920c7a4..657bf7ff04 100644 --- a/jOOQ/src/main/java/org/jooq/Loader.java +++ b/jOOQ/src/main/java/org/jooq/Loader.java @@ -50,7 +50,7 @@ import java.util.List; * * @author Lukas Eder */ -public interface Loader> { +public interface Loader { /** * A list of errors that might have happened during the load. diff --git a/jOOQ/src/main/java/org/jooq/LoaderCSVOptionsStep.java b/jOOQ/src/main/java/org/jooq/LoaderCSVOptionsStep.java index 6e731833aa..ee7f622a3e 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderCSVOptionsStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderCSVOptionsStep.java @@ -48,7 +48,7 @@ package org.jooq; * * @author Lukas Eder */ -public interface LoaderCSVOptionsStep> extends LoaderListenerStep { +public interface LoaderCSVOptionsStep extends LoaderListenerStep { /** * Specify that a certain number of rows should be ignored from the CSV diff --git a/jOOQ/src/main/java/org/jooq/LoaderCSVStep.java b/jOOQ/src/main/java/org/jooq/LoaderCSVStep.java index df40634434..2fd158c1f1 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderCSVStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderCSVStep.java @@ -50,7 +50,7 @@ import java.util.Collection; * * @author Lukas Eder */ -public interface LoaderCSVStep> { +public interface LoaderCSVStep { /** * Specify the the fields to be loaded into the table in the correct order. diff --git a/jOOQ/src/main/java/org/jooq/LoaderJSONOptionsStep.java b/jOOQ/src/main/java/org/jooq/LoaderJSONOptionsStep.java index e3e2b026f1..595e22bb20 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderJSONOptionsStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderJSONOptionsStep.java @@ -49,7 +49,7 @@ package org.jooq; * @author Lukas Eder * @author Johannes Bühler */ -public interface LoaderJSONOptionsStep> extends LoaderListenerStep { +public interface LoaderJSONOptionsStep extends LoaderListenerStep { /** * Specify that a certain number of rows should be ignored from the JSON diff --git a/jOOQ/src/main/java/org/jooq/LoaderJSONStep.java b/jOOQ/src/main/java/org/jooq/LoaderJSONStep.java index a20c01264d..03932b78d1 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderJSONStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderJSONStep.java @@ -51,7 +51,7 @@ import java.util.Collection; * @author Lukas Eder * @author Johannes Bühler */ -public interface LoaderJSONStep> { +public interface LoaderJSONStep { /** * Specify the the fields to be loaded into the table in the correct order. diff --git a/jOOQ/src/main/java/org/jooq/LoaderListenerStep.java b/jOOQ/src/main/java/org/jooq/LoaderListenerStep.java index eeeaf3ae9d..30413b1b5b 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderListenerStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderListenerStep.java @@ -48,7 +48,7 @@ package org.jooq; * * @author Lukas Eder */ -public interface LoaderListenerStep> extends LoaderLoadStep { +public interface LoaderListenerStep extends LoaderLoadStep { /** * Specify a listener that is invoked whenever a row has been processed. diff --git a/jOOQ/src/main/java/org/jooq/LoaderLoadStep.java b/jOOQ/src/main/java/org/jooq/LoaderLoadStep.java index 31606eee52..0be16c385b 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderLoadStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderLoadStep.java @@ -50,7 +50,7 @@ import java.io.IOException; * * @author Lukas Eder */ -public interface LoaderLoadStep> { +public interface LoaderLoadStep { /** * Execute the load. All exceptions are caught and wrapped in the resulting diff --git a/jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java b/jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java index 2c8150e9a8..001f5f3a6a 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderOptionsStep.java @@ -69,7 +69,7 @@ import java.sql.Connection; * * @author Lukas Eder */ -public interface LoaderOptionsStep> extends LoaderSourceStep { +public interface LoaderOptionsStep extends LoaderSourceStep { // ------------------------------------------------------------------------- // Duplicate handling diff --git a/jOOQ/src/main/java/org/jooq/LoaderRowsStep.java b/jOOQ/src/main/java/org/jooq/LoaderRowsStep.java index 92633b8376..b410456077 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderRowsStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderRowsStep.java @@ -50,7 +50,7 @@ import java.util.Collection; * * @author Lukas Eder */ -public interface LoaderRowsStep> { +public interface LoaderRowsStep { /** * Specify the the fields to be loaded into the table in the correct order. diff --git a/jOOQ/src/main/java/org/jooq/LoaderSourceStep.java b/jOOQ/src/main/java/org/jooq/LoaderSourceStep.java index 76770d9c07..cc36082fa3 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderSourceStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderSourceStep.java @@ -60,7 +60,7 @@ import org.xml.sax.InputSource; * @author Lukas Eder * @author Johannes Bühler */ -public interface LoaderSourceStep> { +public interface LoaderSourceStep { /** * Load in-memory data. diff --git a/jOOQ/src/main/java/org/jooq/LoaderXMLStep.java b/jOOQ/src/main/java/org/jooq/LoaderXMLStep.java index 63d63346d0..63e1cee4da 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderXMLStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderXMLStep.java @@ -48,7 +48,7 @@ package org.jooq; * * @author Lukas Eder */ -public interface LoaderXMLStep> { +public interface LoaderXMLStep { // [...] This API is not yet defined diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index af8ec73d5f..13e707666d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -534,7 +534,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri // ------------------------------------------------------------------------- @Override - public > LoaderOptionsStep loadInto(Table table) { + public LoaderOptionsStep loadInto(Table table) { return new LoaderImpl(configuration(), table); } diff --git a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java index 2de977a9d1..870f8685cb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java @@ -79,7 +79,6 @@ import org.jooq.LoaderXMLStep; import org.jooq.Record; import org.jooq.SelectQuery; import org.jooq.Table; -import org.jooq.TableRecord; import org.jooq.exception.DataAccessException; import org.jooq.exception.LoaderConfigurationException; import org.jooq.tools.StringUtils; @@ -92,7 +91,7 @@ import org.xml.sax.InputSource; * @author Lukas Eder * @author Johannes Bühler */ -class LoaderImpl> implements +class LoaderImpl implements // Cascading interface implementations for Loader behaviour LoaderOptionsStep, @@ -144,7 +143,7 @@ class LoaderImpl> implements private int bulk = BULK_NONE; private int bulkAfter = 1; private int content = CONTENT_CSV; - private final InputDelay data = new InputDelay(); + private final InputDelay data = new InputDelay(); private Iterator arrays; // CSV configuration data