From dev-return-63074-archive-asf-public=cust-asf.ponee.io@openoffice.apache.org Sun May 6 18:00:28 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id C5591180674 for ; Sun, 6 May 2018 18:00:27 +0200 (CEST) Received: (qmail 23849 invoked by uid 500); 6 May 2018 16:00:26 -0000 Mailing-List: contact dev-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list dev@openoffice.apache.org Received: (qmail 23834 invoked by uid 99); 6 May 2018 16:00:25 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 May 2018 16:00:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 68144CA1A1 for ; Sun, 6 May 2018 16:00:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.098 X-Spam-Level: X-Spam-Status: No, score=0.098 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id JfD6DvA8QlZa for ; Sun, 6 May 2018 16:00:21 +0000 (UTC) Received: from waikiki.ops.eusc.inter.net (waikiki.ops.eusc.inter.net [84.23.254.155]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTPS id 528845F178 for ; Sun, 6 May 2018 16:00:21 +0000 (UTC) X-Trace: 507c6d617474686961732e73656964656c4068616d627572672e64657c33312e31 372e3131312e3230307c3166464d35382d3030305074442d486c7c313532353632 32343134 Received: from waikiki.ops.eusc.inter.net ([10.155.10.15] helo=localhost) by waikiki.ops.eusc.inter.net with esmtpsa (Exim 4.91) id 1fFM58-000PtD-Hl for dev@openoffice.apache.org; Sun, 06 May 2018 18:00:14 +0200 Subject: Re: svn commit: r1830949 - /openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ To: dev@openoffice.apache.org References: <20180505035911.714013A00A1@svn01-us-west.apache.org> From: Matthias Seidel Openpgp: preference=signencrypt Autocrypt: addr=matthias.seidel@hamburg.de; prefer-encrypt=mutual; keydata= xsBNBFk6vDABCAClNCJJxBQm53ptQQohG6JweA0m6hyklxKqPWoPvMktHbqIASZ7joYJXyF9 25Ae10WBNkuM0f0acFvJLjXmoeruyycAYXqIt7HV3gL/F4xOrmLovTsYvhH5uRWoEHlLv6h8 ELzy1p1+J2QGpxQay/AECn95SWyOaYxnyGbw2nKPhodAMiwV2ogYmZbCIg/C1hrqOYch1kNi eS+DB5neBWpGzY/7Ke5+brZ0vNpFtEsNScpoMU1fVltw8xAAA2BK1kiKroABQaVHe4BpXMnL g2GxwHvcLHxdtjFG3BYVFcgm40pV8/1d2aoxdqSTWBwLA+qOg631T1gZyYFHekEF+kPVABEB AAHNJE1hdHRoaWFzIFNlaWRlbCA8bXNlaWRlbEBhcGFjaGUub3JnPsLAegQTAQgAJAIbAwUL CQgHAgYVCAkKCwIEFgIDAQIeAQIXgAUCWZlEFwIZAQAKCRALO+Eu5XMefeXIB/9nEqGzpBWZ rfVTWa0UpC32jzvCPep5lghVwGXA3IKUwB4O108NEsyuhioQ85Htn54YTRi9Uty891tEzNE8 lakGKOJmD7SpuFzslPtVZQpMlDsKG1sW4eUisWQl+rBo0w6P26W+/RqbPaaVUAFpKiSg9j3p Z4mHHMOuWQpgbnZib7v8Zhva9b/iP5OfJjpAck68cA5puM73zbDA0YxHuoEaAXlwNDDxQ6RB +xFDEKiXolyFWFNJV0Hx3aSFqRt/nQUNUEEEchzOGOb3nh8ShFj/D19zR66J7cmv4ZoL8YM0 KUTHfq7I5TgHrjmxVAWXNpoi019nAMQ9qza/kxmAfJQNzsBNBFk6vDABCAC5yOcirylBMMQL MtVKdhldA9KuXj5lefAZko29DzecxN5/yJQ87i6A28d+6+5q6qSomzgGLIFftNrL0yVDPmzA 9Pwu9QhaLUAHO6OAtQhXh/47yPS93cu0qzwbPtKn3EMUajXphCGohvahZkeaGgXj2QpHjYtb oAzacq9YLwQ7hSPgxbOswv4vSq4Cg5SZft8EP9jV56yy9s+BKWTIl5a7xB9kaeIb92PsWxK+ KcvDgsfr9scHsfyCM5X0nsBSHuUGMaLGkMkH52sG8Ts+GWON9w56hhklnxuoepnPctWQpA39 HqO8Toqjvi35TH1Czj63SwNFPX1Vkkos16Aqx2PnABEBAAHCwF8EGAEIAAkFAlk6vDACGwwA CgkQCzvhLuVzHn0rcQgAmj0gIm8INEaREsyMRGyDKZ22yPjJJsfCFzZSZutklk2iw++6LR9s 8j0InA6WTCZ5bbvsgDNLgH56bP4jmC69Xz3TxheanW4o6w1a6EEdG2Nt0gnXVz/0tF4QLFvo mmLlsaY3AiocXpkSTUiPk9waYdl4XYidr5fqoDyqgGHBPu00utgDbmH8ne2BQe8fnV0+ARq+ ZzhD7RekZj9HYaDq0kGT8dqsJ1RwDJk6QLIek9f5lQ5HgiAF9a/+dQevuwCt7avXVrDhbIS+ YecNa0VrqqWxV1BkgjyKzOdNNdfciGW6xCxRiBsojSjMnEer+7pVCf908O/NmOjBNrKzVFVz Ng== Message-ID: <7fc52b91-419f-8d7c-826e-bc659ec972e7@hamburg.de> Date: Sun, 6 May 2018 18:00:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180505035911.714013A00A1@svn01-us-west.apache.org> Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="------------ms080201080205050006000804" X-SA-Exim-Connect-IP: 31.17.111.200 X-SA-Exim-Mail-From: matthias.seidel@hamburg.de X-SA-Exim-Scanned: No (on waikiki.ops.eusc.inter.net); SAEximRunCond expanded to false --------------ms080201080205050006000804 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Language: en-US Hi Damjan, I just built the latest SVN for Windows and saw a warning: --- javadoc: Generating Javadoc Javadoc execution Loading source files for package com.sun.star.comp.sdbc... Constructing Javadoc information... Creating destination directory: "C:\Source\aoo\main\connectivity\wntmsci12.pro\doc\sdbc_jdbc\javadoc\" Standard Doclet version 1.8.0_172 Building tree for all the packages and classes... C:\Source\aoo\main\connectivity\java\sdbc_jdbc\src\com\sun\star\comp\sdbc= \JavaSQLConnection.java:542: warning: no @return =C2=A0=C2=A0=C2=A0 public ConnectionLog getLogger() { =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ^ Building index for all the packages and classes... Building index for all classes... Generating C:\Source\aoo\main\connectivity\wntmsci12.pro\doc\sdbc_jdbc\javadoc\help-= doc.html... 1 warning --- I don't know if this is really important... ;-) Regards, =C2=A0=C2=A0 Matthias Am 05.05.2018 um 05:59 schrieb damjan@apache.org: > Author: damjan > Date: Sat May 5 03:59:10 2018 > New Revision: 1830949 > > URL: http://svn.apache.org/viewvc?rev=3D1830949&view=3Drev > Log: > Move the PropertyValue helper methods to the tools class for now. > > Some "@Override" and "final" cleanups as per NetBeans. > > Patch by: me > > > Modified: > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/BoundedInputStream.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/ClassMap.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/ContextClassLoaderScope.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JDBCDriver.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLArray.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLBlob.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLCallableStatement.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLClob.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLConnection.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLDatabaseMetaData.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLPreparedStatement.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLRef.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLResultSetMetaData.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLStatement.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLStatementBase.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/ReaderInputStream.java > openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/Tools.java > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/BoundedInputStream.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java?rev=3D183= 0949&r1=3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/BoundedInputStream.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/BoundedInputStream.java Sat May 5 03:59:10 2018 > @@ -24,7 +24,7 @@ import java.io.IOException; > import java.io.InputStream; > =20 > public class BoundedInputStream extends InputStream { > - private InputStream is; > + private final InputStream is; > private long remaining; > =20 > public BoundedInputStream(InputStream is, long max) { > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/ClassMap.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java?rev=3D1830949&r1=3D= 1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/ClassMap.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/ClassMap.java Sat May 5 03:59:10 2018 > @@ -59,8 +59,8 @@ import com.sun.star.util.XMacroExpander; > */ > public class ClassMap { > public static class ClassLoaderAndClass { > - private ClassLoader classLoader; > - private Class classObject; > + private final ClassLoader classLoader; > + private final Class classObject; > =20 > public ClassLoaderAndClass(ClassLoader classLoader, Class c= lassObject) { > this.classLoader =3D classLoader; > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/ContextClassLoaderScope.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java?rev=3D= 1830949&r1=3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/ContextClassLoaderScope.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/ContextClassLoaderScope.java Sat May 5 03:59:10 2018 > @@ -21,8 +21,8 @@ > package com.sun.star.comp.sdbc; > =20 > public class ContextClassLoaderScope implements AutoCloseable { > - private Thread currentThread; > - private ClassLoader oldClassLoader; > + private final Thread currentThread; > + private final ClassLoader oldClassLoader; > =20 > public ContextClassLoaderScope(ClassLoader classLoader) { > currentThread =3D Thread.currentThread(); > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/JDBCDriver.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java?rev=3D1830949&r1=3D= 1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JDBCDriver.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JDBCDriver.java Sat May 5 03:59:10 2018 > @@ -44,7 +44,7 @@ public class JDBCDriver extends Componen > "com.sun.star.sdbc.Driver" > }; > private XComponentContext context; > - private ResourceBasedEventLogger logger; > + private final ResourceBasedEventLogger logger; > =20 > public static XSingleComponentFactory __getComponentFactory(String= implName) { > XSingleComponentFactory xSingleComponentFactory =3D null; > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/JavaSQLArray.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLArray.java?rev=3D1830949&r= 1=3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLArray.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLArray.java Sat May 5 03:59:10 2018 > @@ -34,8 +34,8 @@ import com.sun.star.sdbc.XResultSet; > import com.sun.star.uno.Any; > =20 > public class JavaSQLArray extends ComponentBase implements XArray { > - private ResourceBasedEventLogger logger; > - private java.sql.Array jdbcArray; > + private final ResourceBasedEventLogger logger; > + private final java.sql.Array jdbcArray; > =20 > public JavaSQLArray(ResourceBasedEventLogger logger, java.sql.Arra= y jdcbArray) { > this.logger =3D logger; > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/JavaSQLBlob.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLBlob.java?rev=3D1830949&r1= =3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLBlob.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLBlob.java Sat May 5 03:59:10 2018 > @@ -36,8 +36,8 @@ import com.sun.star.sdbc.XBlob; > import com.sun.star.uno.Any; > =20 > public class JavaSQLBlob extends ComponentBase implements XBlob { > - private ResourceBasedEventLogger logger; > - private java.sql.Blob jdbcBlob; > + private final ResourceBasedEventLogger logger; > + private final java.sql.Blob jdbcBlob; > =20 > public JavaSQLBlob(ResourceBasedEventLogger logger, java.sql.Blob = jdbcBlob) { > this.logger =3D logger; > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/JavaSQLCallableStatement.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLCallableStatement.java?rev= =3D1830949&r1=3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLCallableStatement.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLCallableStatement.java Sat May 5 03:59:10 2018 > @@ -62,7 +62,8 @@ public class JavaSQLCallableStatement ex > } > =20 > // XRow > - > + =20 > + @Override > public synchronized XInputStream getBinaryStream(int columnIndex) = throws SQLException { > createStatement(); > XBlob blob =3D getBlob(columnIndex); > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/JavaSQLClob.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLClob.java?rev=3D1830949&r1= =3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLClob.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLClob.java Sat May 5 03:59:10 2018 > @@ -36,8 +36,8 @@ import com.sun.star.sdbc.XClob; > import com.sun.star.uno.Any; > =20 > public class JavaSQLClob extends ComponentBase implements XClob { > - private ResourceBasedEventLogger logger; > - private java.sql.Clob jdbcClob; > + private final ResourceBasedEventLogger logger; > + private final java.sql.Clob jdbcClob; > =20 > public JavaSQLClob(ResourceBasedEventLogger logger, java.sql.Clob = jdbcClob) { > this.logger =3D logger; > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/JavaSQLConnection.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLConnection.java?rev=3D1830= 949&r1=3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLConnection.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLConnection.java Sat May 5 03:59:10 2018 > @@ -22,7 +22,6 @@ package com.sun.star.comp.sdbc; > =20 > import java.util.Iterator; > import java.util.Properties; > -import java.util.Set; > =20 > import org.apache.openoffice.comp.sdbc.dbtools.comphelper.CompHelper; > import org.apache.openoffice.comp.sdbc.dbtools.util.AutoRetrievingBase= ; > @@ -62,10 +61,10 @@ public class JavaSQLConnection extends C > }; > private static final ClassMap classMap =3D new ClassMap(); > =20 > - private AutoRetrievingBase autoRetrievingBase =3D new AutoRetrievi= ngBase(); > + private final AutoRetrievingBase autoRetrievingBase =3D new AutoRe= trievingBase(); > private String url; > - private JDBCDriver driver; > - private ConnectionLog logger;=20 > + private final JDBCDriver driver; > + private final ConnectionLog logger;=20 > private boolean useParameterSubstitution; > private boolean ignoreDriverPrivileges; > private boolean ignoreCurrency; > @@ -75,7 +74,7 @@ public class JavaSQLConnection extends C > private java.sql.Driver driverObject; > private java.sql.Connection connection; > private PropertyValue[] connectionInfo; > - private WeakMap statements =3D new WeakMap(); > + private final WeakMap statements =3D new WeakMap(); > =20 > public JavaSQLConnection(JDBCDriver driver) { > this.driver =3D driver; > @@ -103,6 +102,7 @@ public class JavaSQLConnection extends C > =20 > // XCloseable > =20 > + @Override > public void close() throws SQLException { > dispose(); > } > @@ -347,54 +347,6 @@ public class JavaSQLConnection extends C > =20 > // others: > =20 > - private static String getOrDefault(PropertyValue[] properties, Str= ing name, String defaultValue) throws IllegalArgumentException { > - String ret =3D defaultValue; > - for (PropertyValue property : properties) { > - if (property.Name.equals(name)) { > - ret =3D AnyConverter.toString(property.Value); > - break; > - } > - } > - return ret; > - } > - > - private static boolean getOrDefault(PropertyValue[] properties, St= ring name, boolean defaultValue) throws IllegalArgumentException { > - boolean ret =3D defaultValue; > - for (PropertyValue property : properties) { > - if (property.Name.equals(name)) { > - ret =3D AnyConverter.toBoolean(property.Value); > - break; > - } > - } > - return ret; > - } > - > - private static Object getOrDefault(PropertyValue[] properties, Str= ing name, Object defaultValue) throws IllegalArgumentException { > - Object ret =3D defaultValue; > - for (PropertyValue property : properties) { > - if (property.Name.equals(name)) { > - ret =3D property.Value; > - break; > - } > - } > - return ret; > - } > - > - private static NamedValue[] getOrDefault(PropertyValue[] propertie= s, String name, NamedValue[] defaultValue) throws IllegalArgumentExceptio= n { > - NamedValue[] ret =3D defaultValue; > - for (PropertyValue property : properties) { > - if (property.Name.equals(name)) { > - Object[] array =3D (Object[]) AnyConverter.toArray(pro= perty.Value); > - ret =3D new NamedValue[array.length]; > - for (int i =3D 0; i < array.length; i++) { > - ret[i] =3D (NamedValue) array[i]; > - } > - break; > - } > - } > - return ret; > - } > - > public boolean construct(String url, PropertyValue[] info) throws = SQLException { > this.url =3D url; > String generatedValueStatement =3D ""; // contains the stateme= nt which should be used when query for automatically generated values > @@ -404,19 +356,19 @@ public class JavaSQLConnection extends C > NamedValue[] systemProperties =3D new NamedValue[0]; > =20 > try { > - driverClass =3D getOrDefault(info, "JavaDriverClass", driv= erClass); > - driverClassPath =3D getOrDefault(info, "JavaDriverClassPat= h", driverClassPath); > + driverClass =3D Tools.getOrDefault(info, "JavaDriverClass"= , driverClass); > + driverClassPath =3D Tools.getOrDefault(info, "JavaDriverCl= assPath", driverClassPath); > if (driverClassPath.isEmpty()) { > driverClassPath =3D getJavaDriverClassPath(driverClass= ); > } > - autoRetrievingEnabled =3D getOrDefault(info, "IsAutoRetrie= vingEnabled", autoRetrievingEnabled); > - generatedValueStatement =3D getOrDefault(info, "AutoRetrie= vingStatement", generatedValueStatement); > - useParameterSubstitution =3D getOrDefault(info, "Parameter= NameSubstitution", useParameterSubstitution); > - ignoreDriverPrivileges =3D getOrDefault(info, "IgnoreDrive= rPrivileges", ignoreDriverPrivileges); > - ignoreCurrency =3D getOrDefault(info, "IgnoreCurrency", ig= noreCurrency); > - systemProperties =3D getOrDefault(info, "SystemProperties"= , systemProperties); > - catalogRestriction =3D getOrDefault(info, "ImplicitCatalog= Restriction", Any.VOID); > - schemaRestriction =3D getOrDefault(info, "ImplicitSchemaRe= striction", Any.VOID); > + autoRetrievingEnabled =3D Tools.getOrDefault(info, "IsAuto= RetrievingEnabled", autoRetrievingEnabled); > + generatedValueStatement =3D Tools.getOrDefault(info, "Auto= RetrievingStatement", generatedValueStatement); > + useParameterSubstitution =3D Tools.getOrDefault(info, "Par= ameterNameSubstitution", useParameterSubstitution); > + ignoreDriverPrivileges =3D Tools.getOrDefault(info, "Ignor= eDriverPrivileges", ignoreDriverPrivileges); > + ignoreCurrency =3D Tools.getOrDefault(info, "IgnoreCurrenc= y", ignoreCurrency); > + systemProperties =3D Tools.getOrDefault(info, "SystemPrope= rties", systemProperties); > + catalogRestriction =3D Tools.getOrDefault(info, "ImplicitC= atalogRestriction", Any.VOID); > + schemaRestriction =3D Tools.getOrDefault(info, "ImplicitSc= hemaRestriction", Any.VOID); > =20 > loadDriverFromProperties(driverClass, driverClassPath, sys= temProperties); > =20 > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/JavaSQLDatabaseMetaData.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLDatabaseMetaData.java?rev=3D= 1830949&r1=3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLDatabaseMetaData.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLDatabaseMetaData.java Sat May 5 03:59:10 2018 > @@ -45,9 +45,9 @@ import com.sun.star.uno.AnyConverter; > import com.sun.star.uno.UnoRuntime; > =20 > public class JavaSQLDatabaseMetaData extends WeakBase implements XData= baseMetaData2 { > - private java.sql.DatabaseMetaData jdbcDatabaseMetaData; > - private JavaSQLConnection connection; > - private ConnectionLog logger; > + private final java.sql.DatabaseMetaData jdbcDatabaseMetaData; > + private final JavaSQLConnection connection; > + private final ConnectionLog logger; > =20 > public JavaSQLDatabaseMetaData(java.sql.DatabaseMetaData jdbcDatab= aseMetaData, JavaSQLConnection connection) { > this.jdbcDatabaseMetaData =3D jdbcDatabaseMetaData; > @@ -1559,6 +1559,7 @@ public class JavaSQLDatabaseMetaData ext > } > } > =20 > + @Override > public boolean supportsMinimumSQLGrammar() { > try { > return jdbcDatabaseMetaData.supportsMinimumSQLGrammar(); > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/JavaSQLPreparedStatement.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLPreparedStatement.java?rev= =3D1830949&r1=3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLPreparedStatement.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLPreparedStatement.java Sat May 5 03:59:10 2018 > @@ -360,6 +360,7 @@ public class JavaSQLPreparedStatement ex > throw new SQLException(error, this, StandardSQLState.SQL_FEATU= RE_NOT_IMPLEMENTED.text(), 0, Any.VOID); > } > =20 > + @Override > public synchronized void setShort(int index, short x) throws SQLEx= ception { > createStatement(); > logger.log(LogLevel.FINE, Resources.STR_LOG_SHORT_PARAMETER, i= ndex, x); > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/JavaSQLRef.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLRef.java?rev=3D1830949&r1=3D= 1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLRef.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLRef.java Sat May 5 03:59:10 2018 > @@ -25,7 +25,7 @@ import com.sun.star.sdbc.SQLException; > import com.sun.star.sdbc.XRef; > =20 > public class JavaSQLRef extends WeakBase implements XRef { > - private java.sql.Ref jdbcRef; > + private final java.sql.Ref jdbcRef; > =20 > public JavaSQLRef(java.sql.Ref jdbcRef) { > this.jdbcRef =3D jdbcRef; > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/JavaSQLResultSetMetaData.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLResultSetMetaData.java?rev= =3D1830949&r1=3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLResultSetMetaData.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLResultSetMetaData.java Sat May 5 03:59:10 2018 > @@ -25,8 +25,8 @@ import com.sun.star.sdbc.SQLException; > import com.sun.star.sdbc.XResultSetMetaData; > =20 > public class JavaSQLResultSetMetaData extends WeakBase implements XRes= ultSetMetaData { > - private JavaSQLConnection connection; > - private java.sql.ResultSetMetaData jdbcResultSetMetaData; > + private final JavaSQLConnection connection; > + private final java.sql.ResultSetMetaData jdbcResultSetMetaData; > private int columnCount; > =20 > public JavaSQLResultSetMetaData(JavaSQLConnection connection, java= =2Esql.ResultSetMetaData jdbcResultSetMetaData) { > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/JavaSQLStatement.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLStatement.java?rev=3D18309= 49&r1=3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLStatement.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLStatement.java Sat May 5 03:59:10 2018 > @@ -65,6 +65,7 @@ public class JavaSQLStatement extends Ja > =20 > // XBatchExecution > =20 > + @Override > public synchronized void addBatch(String sql) throws SQLException = { > createStatement(); > try { > @@ -96,6 +97,7 @@ public class JavaSQLStatement extends Ja > =20 > // XStatement > =20 > + @Override > public synchronized boolean execute(String sql) throws SQLExceptio= n { > createStatement(); > sqlStatement =3D sql; > @@ -144,6 +146,7 @@ public class JavaSQLStatement extends Ja > =20 > // others > =20 > + @Override > protected synchronized void createStatement() throws SQLException = { > checkDisposed(); > if (jdbcStatement =3D=3D null) { > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/JavaSQLStatementBase.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLStatementBase.java?rev=3D1= 830949&r1=3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLStatementBase.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/JavaSQLStatementBase.java Sat May 5 03:59:10 2018 > @@ -448,6 +448,7 @@ public abstract class JavaSQLStatementBa > =20 > // XGeneratedResultSet > =20 > + @Override > public synchronized com.sun.star.sdbc.XResultSet getGeneratedValue= s() throws SQLException { > logger.log(LogLevel.FINE, Resources.STR_LOG_GENERATED_VALUES);= > createStatement(); > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/ReaderInputStream.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/ReaderInputStream.java?rev=3D1830= 949&r1=3D1830948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/ReaderInputStream.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/ReaderInputStream.java Sat May 5 03:59:10 2018 > @@ -25,7 +25,7 @@ import java.io.InputStream; > import java.io.Reader; > =20 > public class ReaderInputStream extends InputStream { > - private Reader reader; > + private final Reader reader; > private int nextByte =3D -1; > =20 > public ReaderInputStream(Reader reader) { > > Modified: openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun= /star/comp/sdbc/Tools.java > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/ja= va/sdbc_jdbc/src/com/sun/star/comp/sdbc/Tools.java?rev=3D1830949&r1=3D183= 0948&r2=3D1830949&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/Tools.java (original) > +++ openoffice/trunk/main/connectivity/java/sdbc_jdbc/src/com/sun/star/= comp/sdbc/Tools.java Sat May 5 03:59:10 2018 > @@ -23,9 +23,13 @@ package com.sun.star.comp.sdbc; > import org.apache.openoffice.comp.sdbc.dbtools.comphelper.ResourceBase= dEventLogger; > import org.apache.openoffice.comp.sdbc.dbtools.util.StandardSQLState; > =20 > +import com.sun.star.beans.NamedValue; > +import com.sun.star.beans.PropertyValue; > +import com.sun.star.lang.IllegalArgumentException; > import com.sun.star.logging.LogLevel; > import com.sun.star.sdbc.SQLException; > import com.sun.star.uno.Any; > +import com.sun.star.uno.AnyConverter; > =20 > public class Tools { > public static SQLException toUnoException(Object source, Throwable= throwable) { > @@ -69,4 +73,52 @@ public class Tools { > logger.log(LogLevel.SEVERE, exception); > return exception; > } > + > + public static String getOrDefault(PropertyValue[] properties, Stri= ng name, String defaultValue) throws IllegalArgumentException { > + String ret =3D defaultValue; > + for (PropertyValue property : properties) { > + if (property.Name.equals(name)) { > + ret =3D AnyConverter.toString(property.Value); > + break; > + } > + } > + return ret; > + } > + > + public static boolean getOrDefault(PropertyValue[] properties, Str= ing name, boolean defaultValue) throws IllegalArgumentException { > + boolean ret =3D defaultValue; > + for (PropertyValue property : properties) { > + if (property.Name.equals(name)) { > + ret =3D AnyConverter.toBoolean(property.Value); > + break; > + } > + } > + return ret; > + } > + > + public static Object getOrDefault(PropertyValue[] properties, Stri= ng name, Object defaultValue) throws IllegalArgumentException { > + Object ret =3D defaultValue; > + for (PropertyValue property : properties) { > + if (property.Name.equals(name)) { > + ret =3D property.Value; > + break; > + } > + } > + return ret; > + } > + > + public static NamedValue[] getOrDefault(PropertyValue[] properties= , String name, NamedValue[] defaultValue) throws IllegalArgumentException= { > + NamedValue[] ret =3D defaultValue; > + for (PropertyValue property : properties) { > + if (property.Name.equals(name)) { > + Object[] array =3D (Object[]) AnyConverter.toArray(pro= perty.Value); > + ret =3D new NamedValue[array.length]; > + for (int i =3D 0; i < array.length; i++) { > + ret[i] =3D (NamedValue) array[i]; > + } > + break; > + } > + } > + return ret; > + } > } > > > --------------ms080201080205050006000804 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0BBwEAAKCC Cy4wggVAMIIEKKADAgECAhEA+SKOWEPE3coyO2BXbmsw8zANBgkqhkiG9w0BAQsFADCBlzEL MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2Fs Zm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxPTA7BgNVBAMTNENPTU9ETyBSU0Eg Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwgQ0EwHhcNMTcwNzE4MDAw MDAwWhcNMTgwNzE4MjM1OTU5WjArMSkwJwYJKoZIhvcNAQkBFhptYXR0aGlhcy5zZWlkZWxA aGFtYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZS1xEVy4GWU/06 ViT9com+zfI6ugrd9r1Yr+CLfMTWNcmdd8RwtcSn62biSeAgR7QUJSsEVH3IGSn/khNMUque nJXOJkhfK3bkDQPmoEQlPeqwROz14tJEVd7lCupXLwJpBCJHK8QYgankS9yq9xFWvkaAMzko OlOA4nxbMh57aLtYrA4lzomH0t4LIGBBPxXHZLPbn1llAPjlwEpDLI7V4lIbUmaHm7i6dtZJ WoLWp0P6nY+IkrQMEldxxeJzsO2HaZnbLb2NSviJSEyQui8l2VU3pl/sI5WJw6wJE63jkPGZ tax3+/jS3lrIUcAhiVn+a+G2lH1UJTeWbgMolKECAwEAAaOCAfAwggHsMB8GA1UdIwQYMBaA FIKvbIz4xf6WYXzoHz0rcUhexIvAMB0GA1UdDgQWBBStbYAV7l7+acpP3q94oXzqljIQLzAO BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAgBgNVHSUEGTAXBggrBgEFBQcDBAYLKwYB BAGyMQEDBQIwEQYJYIZIAYb4QgEBBAQDAgUgMEYGA1UdIAQ/MD0wOwYMKwYBBAGyMQECAQEB MCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9kby5uZXQvQ1BTMFoGA1UdHwRT MFEwT6BNoEuGSWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQUNsaWVudEF1dGhl bnRpY2F0aW9uYW5kU2VjdXJlRW1haWxDQS5jcmwwgYsGCCsGAQUFBwEBBH8wfTBVBggrBgEF BQcwAoZJaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBQ2xpZW50QXV0aGVudGlj YXRpb25hbmRTZWN1cmVFbWFpbENBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29t b2RvY2EuY29tMCUGA1UdEQQeMByBGm1hdHRoaWFzLnNlaWRlbEBoYW1idXJnLmRlMA0GCSqG SIb3DQEBCwUAA4IBAQBrZSIHcCoaH+uHOjtjI6IGMrOQNjXAoqqpcdAXTF/chUZUo3fy3mA2 mNpcRF1h9ko5Zsq6tRd6WiRbfln9iJccmjGo7kz69FY+wzjut7O/RPAXsVt4f06J+8Mn4KnM BvwfFHz3YPescy2HHdg/Mk78SprIm571DZ8qL4aZEtYWJt8IhM4A+FvFDoD+BiMcHOfg3hIc MKgHjwrQc7RPBPehLGukFjCXYwrgTUME1x4vKE4y0l31t7A2hHPQs2wLiIiCqskZqRGz6OQz bahkius1LCIkRk1haxj6Hoz/b7li/K8LCXvj9wC06S4so5E38l1pTwbXa7d+satSdK+vsdUc MIIF5jCCA86gAwIBAgIQapvhODv/K2ufAdXZuKdSVjANBgkqhkiG9w0BAQwFADCBhTELMAkG A1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9y ZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2Vy dGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTMwMTEwMDAwMDAwWhcNMjgwMTA5MjM1OTU5WjCB lzELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMH U2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxPTA7BgNVBAMTNENPTU9ETyBS U0EgQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwgQ0EwggEiMA0GCSqG SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+s55XrCh2dUAWxzgDmNPGGHYhUPMleQtMtaDRfTpY PpynMS6n9jR22YRq2tA9NEjk6vW7rN/5sYFLIP1of3l0NKZ6fLWfF2VgJ5cijKYy/qlAckY1 wgOkUMgzKlWlVJGyK+UlNEQ1/5ErCsHq9x9aU/x1KwTdF/LCrT03Rl/FwFrf1XTCwa2QZYL5 5AqLPikFlgqOtzk06kb2qvGlnHJvijjI03BOrNpo+kZGpcHsgyO1/u1OZTaOo8wvEU17VVeP 1cHWse9tGKTDyUGg2hJZjrqck39UIm/nKbpDSZ0JsMoIw/JtOOg0JC56VzQgBo7ictReTQE5 LFLG3yQK+xS1AgMBAAGjggE8MIIBODAfBgNVHSMEGDAWgBS7r34CPfqm8TyEjq3uOJjs2TIy 1DAdBgNVHQ4EFgQUgq9sjPjF/pZhfOgfPStxSF7Ei8AwDgYDVR0PAQH/BAQDAgGGMBIGA1Ud EwEB/wQIMAYBAf8CAQAwEQYDVR0gBAowCDAGBgRVHSAAMEwGA1UdHwRFMEMwQaA/oD2GO2h0 dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQUNlcnRpZmljYXRpb25BdXRob3JpdHku Y3JsMHEGCCsGAQUFBwEBBGUwYzA7BggrBgEFBQcwAoYvaHR0cDovL2NydC5jb21vZG9jYS5j b20vQ09NT0RPUlNBQWRkVHJ1c3RDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNv bW9kb2NhLmNvbTANBgkqhkiG9w0BAQwFAAOCAgEAeFyygSg0TzzuX1bOn5dW7I+iaxf28/ZJ CAbU2C81zd9A/tNx4+jsQgwRGiHjZrAYayZrrm78hOx7aEpkfNPQIHGG6Fvq3EzWf/Lvx7/h k6zSPwIal9v5IkDcZoFD7f3iT7PdkHJY9B51csvU50rxpEg1OyOT8fk2zvvPBuM4qQNqbGWl nhMpIMwpWZT89RY0wpJO+2V6eXEGGHsROs3njeP9DqqqAJaBa4wBeKOdGCWn1/Jp2oY6dyNm NppI4ZNMUH4Tam85S1j6E95u4+1Nuru84OrMIzqvISE2HN/56ebTOWlcrurffade2022O/tU U1gb4jfWCcyvB8czm12FgX/y/lRjmDbEA08QJNB2729Y+io1IYO3ztveBdvUCIYZojTq/OCR 6MvnzS6X72HP0PRLRTiOSEmIDsS5N5w/8IW1Hva5hEFy6fDAfd9yI+O+IMMAj1KcL/Zo9jzJ 16HO5m60ttl1Enk8MQkz/W3JlHaeI5iKFn4UJu1/cP2YHXYPiWf2JyBzsLBrGk1II+3yL8ao rYew6CQvdVifC3HtwlSam9V1niiCfOBe2C12TdKGu05LWIA3ZkFcWJGaNXOZ6Ggyh/TqvXG5 v7zmEVDNXFnHn9tFpMpOUvxhcsjycBtH0dZ0WrNw6gH+HF8TIhCnH3+zzWuDN0Rk6h9KVkfK ehIxggQ4MIIENAIBATCBrTCBlzELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFu Y2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQx PTA7BgNVBAMTNENPTU9ETyBSU0EgQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUg RW1haWwgQ0ECEQD5Io5YQ8TdyjI7YFduazDzMA0GCWCGSAFlAwQCAQUAoIICWzAYBgkqhkiG 9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xODA1MDYxNjAwMTNaMC8GCSqG SIb3DQEJBDEiBCC+y5B39CExrgpk6U0gRMch1N0rOeBlEKUXHdHse0106TBsBgkqhkiG9w0B CQ8xXzBdMAsGCWCGSAFlAwQBKjALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcN AwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMIG+BgkrBgEE AYI3EAQxgbAwga0wgZcxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0 ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMT0wOwYD VQQDEzRDT01PRE8gUlNBIENsaWVudCBBdXRoZW50aWNhdGlvbiBhbmQgU2VjdXJlIEVtYWls IENBAhEA+SKOWEPE3coyO2BXbmsw8zCBwAYLKoZIhvcNAQkQAgsxgbCgga0wgZcxCzAJBgNV BAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQx GjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMT0wOwYDVQQDEzRDT01PRE8gUlNBIENsaWVu dCBBdXRoZW50aWNhdGlvbiBhbmQgU2VjdXJlIEVtYWlsIENBAhEA+SKOWEPE3coyO2BXbmsw 8zANBgkqhkiG9w0BAQEFAASCAQC0RNTjm5ABrDWMHRV1a5HIaVFBLwtLNmieqsuj2KVIqnnw FtWjITQZ8o1XhAfA25DfxlLTylf1Ge1C9vvlPe2J2R5cxKRfdCBeJ+WCQqytBBBsIMaMKADo 3GZGt4pu89hmhSk/OgC4ZmsU9tjxbp+SXu3QKfyw1cEQnh7hZblP5gRzi5bwFeSBzPjQ91q1 0JR5VPEUl0jw3GrvBp58Zj7Wjt97f55P2uo09Z8m0Fyuzk0MfBoVF4f0Amw8oRuNEw6yDXjN yjTQCVTl34P1J3ixl+aLOxpI510zmRpsOp871DlOF5MOAKmj9JxIN6xGSADhjBLmUJLtQFuy Yi4rXwTFAAAAAAAA --------------ms080201080205050006000804--