The methods of the CloseListener are added to the Trigger interface. The…

The methods of the CloseListener are added to the Trigger interface. The interface CloseListener is removed.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Converting a UUID to bytes was incorrect. Because of that, updatable result sets on
+<ul><li>The methods of the CloseListener are added to the Trigger interface. 
+    The interface CloseListener is removed.
+</li><li>Converting a UUID to bytes was incorrect. Because of that, updatable result sets on
     tables with UUID primary key did not work. 
 </li><li>The database URL property DATABASE_EVENT_LISTENER_OBJECT is no longer supported
     (there are problems passing objects when the PostgreSQL driver is installed as well).

h2/src/main/org/h2/api/CloseListener.java

-/*
- * Copyright 2004-2010 H2 Group. Multiple-Licensed under the H2 License,
- * Version 1.0, and under the Eclipse Public License, Version 1.0
- * (http://h2database.com/html/license.html).
- * Initial Developer: H2 Group
- */
-package org.h2.api;
-
-import java.sql.SQLException;
-
-/**
- * A trigger that implements this interface will be notified when the database
- * is closed.
- */
-public interface CloseListener {
-
-    /**
-     * This method is called when the database is closed.
-     * If the method throws an exception, it will be logged, but
-     * closing the database will continue.
-     *
-     * @throws SQLException
-     */
-    void close() throws SQLException;
-
-    /**
-     * This method is called when the trigger is dropped.
-     *
-     * @throws SQLException
-     */
-    void remove() throws SQLException;
-
-}

h2/src/main/org/h2/api/Trigger.java

@@ -36,7 +36,8 @@ public interface Trigger {
 
     /**
      * This method is called by the database engine once when initializing the
-     * trigger.
+     * trigger. It is called when the trigger is created, as well as when the
+     * database is opened.
      *
      * @param conn a connection to the database
      * @param schemaName the name of the schema
@@ -67,4 +68,20 @@ public interface Trigger {
      */
     void fire(Connection conn, Object[] oldRow, Object[] newRow) throws SQLException;
 
+    /**
+     * This method is called when the database is closed.
+     * If the method throws an exception, it will be logged, but
+     * closing the database will continue.
+     *
+     * @throws SQLException
+     */
+    void close() throws SQLException;
+
+    /**
+     * This method is called when the trigger is dropped.
+     *
+     * @throws SQLException
+     */
+    void remove() throws SQLException;
+
 }

h2/src/main/org/h2/fulltext/FullText.java

@@ -23,7 +23,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.StringTokenizer;
-import org.h2.api.CloseListener;
 import org.h2.api.Trigger;
 import org.h2.command.Parser;
 import org.h2.engine.Session;
@@ -773,7 +772,7 @@ public class FullText {
     /**
      * Trigger updates the index when a inserting, updating, or deleting a row.
      */
-    public static class FullTextTrigger implements Trigger, CloseListener {
+    public static class FullTextTrigger implements Trigger {
 
         protected FullTextSettings setting;
         protected IndexInfo index;

h2/src/main/org/h2/fulltext/FullTextLucene.java

@@ -30,7 +30,6 @@ import org.apache.lucene.search.Hits;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.Searcher;
-import org.h2.api.CloseListener;
 import org.h2.api.Trigger;
 import org.h2.command.Parser;
 import org.h2.engine.Session;
@@ -410,7 +409,7 @@ public class FullTextLucene extends FullText {
      */
     public static class FullTextTrigger
     //## Java 1.4 begin ##
-    implements Trigger, CloseListener
+    implements Trigger
     //## Java 1.4 end ##
     {
 

h2/src/main/org/h2/schema/TriggerObject.java

@@ -8,8 +8,6 @@ package org.h2.schema;
 
 import java.sql.Connection;
 import java.sql.SQLException;
-
-import org.h2.api.CloseListener;
 import org.h2.api.Trigger;
 import org.h2.command.Parser;
 import org.h2.constant.ErrorCode;
@@ -324,9 +322,7 @@ public class TriggerObject extends SchemaObjectBase {
         table.removeTrigger(this);
         database.removeMeta(session, getId());
         if (triggerCallback != null) {
-            if (triggerCallback instanceof CloseListener) {
-                ((CloseListener) triggerCallback).remove();
-            }
+            triggerCallback.remove();
         }
         table = null;
         triggerClassName = null;
@@ -370,9 +366,7 @@ public class TriggerObject extends SchemaObjectBase {
      */
     public void close() throws SQLException {
         if (triggerCallback != null) {
-            if (triggerCallback instanceof CloseListener) {
-                ((CloseListener) triggerCallback).close();
-            }
+            triggerCallback.close();
         }
     }
 

h2/src/test/org/h2/samples/TriggerPassData.java

@@ -58,6 +58,14 @@ public class TriggerPassData implements Trigger {
         System.out.println(triggerData + ": " + row[0]);
     }
 
+    public void close() {
+        // ignore
+    }
+
+    public void remove() {
+        // ignore
+    }
+
     /**
      * Call this method to change a specific trigger.
      *

h2/src/test/org/h2/samples/TriggerSample.java

@@ -95,6 +95,15 @@ public class TriggerSample {
             prep.setBigDecimal(1, diff);
             prep.execute();
         }
+
+        public void close() {
+            // ignore
+        }
+
+        public void remove() {
+            // ignore
+        }
+
     }
 
 }

h2/src/test/org/h2/test/TestAll.java

@@ -287,7 +287,9 @@ java org.h2.test.TestAll timer
         System.setProperty("h2.check2", "true");
 
 /*
+Row.getMemorySize
 FileStore.sync, Database.sync() (CHECKPOINT SYNC)
+
 document in performance section:
 PreparedStatement prep = conn.prepareStatement(
 "select * from table(x int = ?) t inner join test on t.x = test.id");
@@ -296,7 +298,6 @@ ResultSet rs = prep.executeQuery();
 
 review package and class level javadocs
 TestAll deleteIndex
-use RuntimeException internally
 
 document FETCH FIRST
 

h2/src/test/org/h2/test/db/TestRunscript.java

@@ -139,4 +139,12 @@ public class TestRunscript extends TestBase implements Trigger {
         // nothing to do
     }
 
+    public void close() {
+        // ignore
+    }
+
+    public void remove() {
+        // ignore
+    }
+
 }

h2/src/test/org/h2/test/db/TestTriggersConstraints.java

@@ -85,6 +85,14 @@ public class TestTriggersConstraints extends TestBase implements Trigger {
             prepInsert.execute();
         }
 
+        public void close() {
+            // ignore
+        }
+
+        public void remove() {
+            // ignore
+        }
+
     }
 
     private void testTriggerBeforeSelect() throws SQLException {
@@ -137,6 +145,14 @@ public class TestTriggersConstraints extends TestBase implements Trigger {
             prepMeta.execute();
         }
 
+        public void close() {
+            // ignore
+        }
+
+        public void remove() {
+            // ignore
+        }
+
     }
 
     /**
@@ -152,6 +168,15 @@ public class TestTriggersConstraints extends TestBase implements Trigger {
                 int type) {
             // nothing to do
         }
+
+        public void close() {
+            // ignore
+        }
+
+        public void remove() {
+            // ignore
+        }
+
     }
 
     private void testTriggerAlterTable() throws SQLException {
@@ -290,6 +315,14 @@ public class TestTriggersConstraints extends TestBase implements Trigger {
         }
     }
 
+    public void close() {
+        // ignore
+    }
+
+    public void remove() {
+        // ignore
+    }
+
     private void checkCommit(Connection conn) {
         try {
             conn.commit();

h2/src/test/org/h2/test/jdbc/TestPreparedStatement.java

@@ -346,6 +346,14 @@ public class TestPreparedStatement extends TestBase {
             // ignore
         }
 
+        public void close() {
+            // ignore
+        }
+
+        public void remove() {
+            // ignore
+        }
+
     }
 
     private void testScopedGeneratedKey(Connection conn) throws SQLException {