simplify, use methods from DatabaseTools

Author: PhilippSalvisberg

sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.java

@@ -16,7 +16,6 @@
 package org.utplsql.sqldev.parser;
 
 import java.sql.Connection;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -26,8 +25,8 @@
 import javax.swing.text.JTextComponent;
 
 import org.utplsql.sqldev.dal.UtplsqlDao;
-import org.utplsql.sqldev.exception.GenericDatabaseAccessException;
 import org.utplsql.sqldev.exception.GenericRuntimeException;
+import org.utplsql.sqldev.model.DatabaseTools;
 import org.utplsql.sqldev.model.parser.PlsqlObject;
 import org.utplsql.sqldev.model.parser.Unit;
 import org.utplsql.sqldev.model.ut.Annotation;
@@ -126,22 +125,14 @@ private void populateUnits() {
         }
     }
 
-    private String getSchema(Connection conn) {
-        try {
-            return conn.getSchema();
-        } catch (SQLException e) {
-            throw new GenericDatabaseAccessException("getSchema failed", e);
-        }
-    }
-
     private void processAnnotations(final Connection conn, final String owner) {
         this.owner = owner;
         if (conn != null) {
             final UtplsqlDao dao = new UtplsqlDao(conn);
             if (dao.isUtAnnotationManagerInstalled()) {
                 for (final PlsqlObject o : objects) {
                     final List<String> segments = Arrays.asList(fixName(o.getName()).split("\\."));
-                    final String schema = owner != null ? owner : getSchema(conn);
+                    final String schema = owner != null ? owner : DatabaseTools.getSchema(conn);
                     final List<Annotation> annotations = dao.annotations(schema,
                             segments.get(segments.size() - 1).toUpperCase());
                     if (annotations.stream().anyMatch(it -> it.getName().equals("suite"))) {