You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2020/04/14 10:42:33 UTC
[cayenne] branch master updated: Use constant lists instead of
dynamic creation
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new cdc961b Use constant lists instead of dynamic creation
cdc961b is described below
commit cdc961b3c631bbe320b016b88e00399e3e71813d
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Tue Apr 14 13:42:24 2020 +0300
Use constant lists instead of dynamic creation
---
.../src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java | 4 ++--
.../src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java | 6 +++---
.../main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java | 4 ++--
.../java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
index b1792f4..d9bf587 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
@@ -83,7 +83,7 @@ public class MySQLAdapter extends JdbcAdapter {
protected String storageEngine;
- private String[] SYSTEM_CATALOGS = new String[]{"sys", "information_schema", "mysql", "performance_schema"};
+ private List<String> SYSTEM_CATALOGS = Arrays.asList("sys", "information_schema", "mysql", "performance_schema");
public MySQLAdapter(@Inject RuntimeProperties runtimeProperties,
@Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
@@ -358,7 +358,7 @@ public class MySQLAdapter extends JdbcAdapter {
@Override
public List<String> getSystemCatalogs() {
- return Arrays.asList(SYSTEM_CATALOGS);
+ return SYSTEM_CATALOGS;
}
final class PKComparator implements Comparator<DbAttribute> {
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
index 453aae8..06485eb 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
@@ -83,13 +83,13 @@ public class OracleAdapter extends JdbcAdapter {
protected static boolean supportsOracleLOB;
- private String[] SYSTEM_SCHEMAS = new String[]{
+ private List<String> SYSTEM_SCHEMAS = Arrays.asList(
"ANONYMOUS", "APPQOSSYS", "AUDSYS", "CTXSYS", "DBSFWUSER",
"DBSNMP", "DIP", "DVF", "GGSYS", "DVSYS", "GSMADMIN_INTERNAL",
"GSMCATUSER", "GSMUSER", "LBACSYS", "MDDATA", "MDSYS", "OJVMSYS",
"OLAPSYS", "ORACLE_OCM", "ORDDATA", "ORDPLUGINS", "ORDSYS", "OUTLN",
"REMOTE_SCHEDULER_AGENT", "SYSTEM", "WMSYS", "SI_INFORMTN_SCHEMA",
- "SYS", "SYSBACKUP", "SYSDG", "SYSKM", "SYSRAC", "SYS$UMF", "XDB", "XS$NULL"};
+ "SYS", "SYSBACKUP", "SYSDG", "SYSKM", "SYSRAC", "SYS$UMF", "XDB", "XS$NULL");
static {
// TODO: as CAY-234 shows, having such initialization done in a static
@@ -302,7 +302,7 @@ public class OracleAdapter extends JdbcAdapter {
@Override
public List<String> getSystemSchemas() {
- return Arrays.asList(SYSTEM_SCHEMAS);
+ return SYSTEM_SCHEMAS;
}
/**
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
index edf5e79..2bf1c9e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
@@ -67,7 +67,7 @@ public class PostgresAdapter extends JdbcAdapter {
public static final String BYTEA = "bytea";
- private String[] SYSTEM_SCHEMAS = new String[]{"information_schema", "pg_catalog"};
+ private List<String> SYSTEM_SCHEMAS = Arrays.asList("information_schema", "pg_catalog");
public PostgresAdapter(@Inject RuntimeProperties runtimeProperties,
@Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
@@ -272,7 +272,7 @@ public class PostgresAdapter extends JdbcAdapter {
@Override
public List<String> getSystemSchemas() {
- return Arrays.asList(SYSTEM_SCHEMAS);
+ return SYSTEM_SCHEMAS;
}
}
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
index 470444f..9237cd5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
@@ -81,10 +81,10 @@ public class SQLServerAdapter extends SybaseAdapter {
@Deprecated
public static final String TRIM_FUNCTION = "RTRIM";
- private String[] SYSTEM_SCHEMAS = new String[]{"db_accessadmin", "db_backupoperator",
+ private List<String> SYSTEM_SCHEMAS = Arrays.asList("db_accessadmin", "db_backupoperator",
"db_datareader", "db_datawriter", "db_ddladmin", "db_denydatareader",
"db_denydatawriter","dbo", "sys", "db_owner", "db_securityadmin", "guest",
- "INFORMATION_SCHEMA"};
+ "INFORMATION_SCHEMA");
public SQLServerAdapter(@Inject RuntimeProperties runtimeProperties,
@Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
@@ -125,7 +125,7 @@ public class SQLServerAdapter extends SybaseAdapter {
@Override
public List<String> getSystemSchemas() {
- return Arrays.asList(SYSTEM_SCHEMAS);
+ return SYSTEM_SCHEMAS;
}
}