#2556 DBGSessionInfo to "Object getID()"

plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/DBGSession.java

@@ -20,7 +20,7 @@ package org.jkiss.dbeaver.debug;
 
 import java.util.List;
 
-public interface DBGSession<SESSION_INFO extends DBGSessionInfo<SESSION_ID_TYPE>, DEBUG_OBJECT extends DBGObject, SESSION_ID_TYPE, OBJECT_ID_TYPE> {
+public interface DBGSession<SESSION_INFO extends DBGSessionInfo, DEBUG_OBJECT extends DBGObject, SESSION_ID_TYPE, OBJECT_ID_TYPE> {
     SESSION_INFO getSessionInfo();
 
     String getTitle();

plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/DBGSessionInfo.java

@@ -18,8 +18,8 @@
 
 package org.jkiss.dbeaver.debug;
 
-public interface DBGSessionInfo<SESSION_ID_TYPE> {
+public interface DBGSessionInfo {
 
-    SESSION_ID_TYPE getID();
+    Object getID();
 
 }

plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/DBGSessionManager.java

@@ -23,17 +23,17 @@ import java.util.List;
 import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
 
 public interface DBGSessionManager<SESSION_ID_TYPE, OBJECT_ID_TYPE> {
-    DBGSessionInfo<SESSION_ID_TYPE> getSessionInfo(DBCExecutionContext connection) throws DBGException;
+    DBGSessionInfo getSessionInfo(DBCExecutionContext connection) throws DBGException;
 
-    List<? extends DBGSessionInfo<SESSION_ID_TYPE>> getSessions() throws DBGException;
+    List<? extends DBGSessionInfo> getSessions() throws DBGException;
 
-    DBGSession<? extends DBGSessionInfo<SESSION_ID_TYPE>, ? extends DBGObject, SESSION_ID_TYPE, OBJECT_ID_TYPE> getDebugSession(SESSION_ID_TYPE id) throws DBGException;
+    DBGSession<? extends DBGSessionInfo, ? extends DBGObject, SESSION_ID_TYPE, OBJECT_ID_TYPE> getDebugSession(SESSION_ID_TYPE id) throws DBGException;
 
     List<DBGSession<?, ?, SESSION_ID_TYPE, OBJECT_ID_TYPE>> getDebugSessions() throws DBGException;
 
     void terminateSession(SESSION_ID_TYPE id);
 
-    DBGSession<? extends DBGSessionInfo<SESSION_ID_TYPE>, ? extends DBGObject, SESSION_ID_TYPE, OBJECT_ID_TYPE> createDebugSession(DBCExecutionContext connection) throws DBGException;
+    DBGSession<? extends DBGSessionInfo, ? extends DBGObject, SESSION_ID_TYPE, OBJECT_ID_TYPE> createDebugSession(DBCExecutionContext connection) throws DBGException;
 
     boolean isSessionExists(SESSION_ID_TYPE id);
 

plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/impl/PostgreDebugSessionInfo.java

@@ -21,7 +21,7 @@ package org.jkiss.dbeaver.ext.postgresql.debug.internal.impl;
 import org.jkiss.dbeaver.debug.DBGSessionInfo;
 
 @SuppressWarnings("nls")
-public class PostgreDebugSessionInfo implements DBGSessionInfo<Integer> {
+public class PostgreDebugSessionInfo implements DBGSessionInfo {
 
     public static final String CREATE_LISTEN = "CREATE LISTEN";