Repository: commons-dbcp Updated Branches: refs/heads/master 180ff5a3c -> 1ad8fa191
Consistent formating to line length 120. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/1ad8fa19 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/1ad8fa19 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/1ad8fa19 Branch: refs/heads/master Commit: 1ad8fa191c5df90d9f0388d7c483d57724860040 Parents: 180ff5a Author: Gary Gregory <garydgreg...@gmail.com> Authored: Mon Jun 11 13:07:23 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Mon Jun 11 13:07:23 2018 -0600 ---------------------------------------------------------------------- .../PerUserPoolDataSourceFactory.java | 52 +++++++------------- 1 file changed, 19 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/1ad8fa19/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java index 5887734..8a91ba4 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java @@ -28,11 +28,8 @@ import javax.naming.Reference; * * @since 2.0 */ -public class PerUserPoolDataSourceFactory - extends InstanceKeyDataSourceFactory -{ - private static final String PER_USER_POOL_CLASSNAME = - PerUserPoolDataSource.class.getName(); +public class PerUserPoolDataSourceFactory extends InstanceKeyDataSourceFactory { + private static final String PER_USER_POOL_CLASSNAME = PerUserPoolDataSource.class.getName(); @Override protected boolean isCorrectClass(final String className) { @@ -41,69 +38,58 @@ public class PerUserPoolDataSourceFactory @SuppressWarnings("unchecked") // Avoid warnings on deserialization @Override - protected InstanceKeyDataSource getNewInstance(final Reference ref) - throws IOException, ClassNotFoundException { - final PerUserPoolDataSource pupds = new PerUserPoolDataSource(); + protected InstanceKeyDataSource getNewInstance(final Reference ref) throws IOException, ClassNotFoundException { + final PerUserPoolDataSource pupds = new PerUserPoolDataSource(); RefAddr ra = ref.get("defaultMaxTotal"); if (ra != null && ra.getContent() != null) { - pupds.setDefaultMaxTotal( - Integer.parseInt(ra.getContent().toString())); + pupds.setDefaultMaxTotal(Integer.parseInt(ra.getContent().toString())); } ra = ref.get("defaultMaxIdle"); if (ra != null && ra.getContent() != null) { - pupds.setDefaultMaxIdle( - Integer.parseInt(ra.getContent().toString())); + pupds.setDefaultMaxIdle(Integer.parseInt(ra.getContent().toString())); } ra = ref.get("defaultMaxWaitMillis"); if (ra != null && ra.getContent() != null) { - pupds.setDefaultMaxWaitMillis( - Integer.parseInt(ra.getContent().toString())); + pupds.setDefaultMaxWaitMillis(Integer.parseInt(ra.getContent().toString())); } ra = ref.get("perUserDefaultAutoCommit"); - if (ra != null && ra.getContent() != null) { + if (ra != null && ra.getContent() != null) { final byte[] serialized = (byte[]) ra.getContent(); - pupds.setPerUserDefaultAutoCommit( - (Map<String,Boolean>) deserialize(serialized)); + pupds.setPerUserDefaultAutoCommit((Map<String, Boolean>) deserialize(serialized)); } ra = ref.get("perUserDefaultTransactionIsolation"); - if (ra != null && ra.getContent() != null) { + if (ra != null && ra.getContent() != null) { final byte[] serialized = (byte[]) ra.getContent(); - pupds.setPerUserDefaultTransactionIsolation( - (Map<String,Integer>) deserialize(serialized)); + pupds.setPerUserDefaultTransactionIsolation((Map<String, Integer>) deserialize(serialized)); } ra = ref.get("perUserMaxTotal"); - if (ra != null && ra.getContent() != null) { + if (ra != null && ra.getContent() != null) { final byte[] serialized = (byte[]) ra.getContent(); - pupds.setPerUserMaxTotal( - (Map<String,Integer>) deserialize(serialized)); + pupds.setPerUserMaxTotal((Map<String, Integer>) deserialize(serialized)); } ra = ref.get("perUserMaxIdle"); - if (ra != null && ra.getContent() != null) { + if (ra != null && ra.getContent() != null) { final byte[] serialized = (byte[]) ra.getContent(); - pupds.setPerUserMaxIdle( - (Map<String,Integer>) deserialize(serialized)); + pupds.setPerUserMaxIdle((Map<String, Integer>) deserialize(serialized)); } ra = ref.get("perUserMaxWaitMillis"); - if (ra != null && ra.getContent() != null) { + if (ra != null && ra.getContent() != null) { final byte[] serialized = (byte[]) ra.getContent(); - pupds.setPerUserMaxWaitMillis( - (Map<String,Long>) deserialize(serialized)); + pupds.setPerUserMaxWaitMillis((Map<String, Long>) deserialize(serialized)); } ra = ref.get("perUserDefaultReadOnly"); - if (ra != null && ra.getContent() != null) { + if (ra != null && ra.getContent() != null) { final byte[] serialized = (byte[]) ra.getContent(); - pupds.setPerUserDefaultReadOnly( - (Map<String,Boolean>) deserialize(serialized)); + pupds.setPerUserDefaultReadOnly((Map<String, Boolean>) deserialize(serialized)); } return pupds; } } -
