Merge pull request #5382 from dizzzz/feature/reduceWarningsDuringBuild

[ignore] reduce build warnings
eXist-db · Jul 31, 2024 · bd8b4eb · bd8b4eb
2 parents f90a462 + 5dcc2b7
commit bd8b4eb
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 8 deletions.
diff --git a/exist-core/pom.xml b/exist-core/pom.xml
@@ -1084,6 +1084,26 @@ The BaseX Team. The original license statement is also included below.]]></pream
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>software.xdev</groupId>
+                <artifactId>find-and-replace-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>replace-underscore-with-hyphen</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>file-contents</goal>
+                        </goals>
+                        <configuration>
+                            <baseDir>target/generated-sources/antlr/org/exist/xquery/parser/</baseDir>
+                            <fileMask>XQueryLexer.java</fileMask>
+                            <findRegex>new Integer</findRegex>
+                            <replaceValue>Integer.valueOf</replaceValue>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <executions>

diff --git a/exist-core/src/main/java/org/exist/collections/triggers/FilteringTrigger.java b/exist-core/src/main/java/org/exist/collections/triggers/FilteringTrigger.java
@@ -29,6 +29,7 @@
  * 
  * @deprecated use SAXTrigger
  */
+@Deprecated
 public abstract class FilteringTrigger extends SAXTrigger {
 
 }
diff --git a/exist-core/src/main/java/org/exist/scheduler/UserXQueryJob.java b/exist-core/src/main/java/org/exist/scheduler/UserXQueryJob.java
@@ -117,6 +117,7 @@ public String getXQueryResource() {
      * @return  The User for this Job
      * @deprecated use getCurrentSubject method
      */
+    @Deprecated
     public Subject getUser() {
         return subject;
     }

diff --git a/exist-core/src/main/java/org/exist/security/User.java b/exist-core/src/main/java/org/exist/security/User.java
@@ -103,6 +103,7 @@ public interface User extends Principal {
      * @return The users password
      * @deprecated
      */
+    @Deprecated
     String getPassword();
 
     @Deprecated

diff --git a/exist-core/src/main/java/org/exist/security/internal/AccountImpl.java b/exist-core/src/main/java/org/exist/security/internal/AccountImpl.java
@@ -241,7 +241,7 @@ public AccountImpl(final AbstractRealm realm, final Configuration configuration,
      * @return Description of the Return Value
      * @deprecated
      */
-    @Override
+    @Override @Deprecated
     public final String getPassword() {
         return password;
     }

diff --git a/exist-core/src/main/java/org/exist/storage/BrokerPool.java b/exist-core/src/main/java/org/exist/storage/BrokerPool.java
@@ -843,6 +843,7 @@ public ThreadGroup getThreadGroup() {
      * @deprecated use countActiveBrokers
      */
     //TODO : rename as getActiveBrokers ?
+    @Deprecated
     public int active() {
         return activeBrokers.size();
     }

diff --git a/exist-core/src/main/java/org/exist/util/ByteConversion.java b/exist-core/src/main/java/org/exist/util/ByteConversion.java
@@ -42,6 +42,7 @@ public class ByteConversion {
      * @deprecated reads the lowest byte first. will be replaced with
      *     {@link #byteToIntH(byte[], int)} for consistency.
      */
+    @Deprecated
     public final static int byteToInt(final byte[] data, final int start ) {
         return ( data[start] & 0xff ) |
             ( ( data[start + 1] & 0xff ) << 8 ) |
@@ -144,6 +145,7 @@ public final static long byteToLong(final ByteBuffer buf) {
      *
      * @return the short integer
      */
+    @Deprecated
     public final static short byteToShort( final byte[] data, final int start ) {
         return (short) ( ( ( data[start + 1] & 0xff ) << 8 ) |
             ( data[start] & 0xff ) );
@@ -190,6 +192,7 @@ public final static short byteToShortH(final ByteBuffer buf) {
      * @param  start  the offset
      * @return   the byte array
      */
+    @Deprecated
     public final static byte[] intToByte( final int v, final byte[] data, final int start ) {
         data[start] = (byte) ( ( v >>> 0 ) & 0xff );
         data[start + 1] = (byte) ( ( v >>> 8 ) & 0xff );
@@ -302,6 +305,7 @@ public final static byte[] longToByte( final long v ) {
      * @param  start  the offset
      * @return   the byte array
      */
+    @Deprecated
     public final static byte[] shortToByte( final short v, final byte[] data, final int start ) {
         data[start] = (byte) ( ( v >>> 0 ) & 0xff );
         data[start + 1] = (byte) ( ( v >>> 8 ) & 0xff );

diff --git a/exist-core/src/main/java/org/exist/util/NamedThreadFactory.java b/exist-core/src/main/java/org/exist/util/NamedThreadFactory.java
@@ -68,6 +68,7 @@ public NamedThreadFactory(final String instanceId, final String nameBase) {
      *
      * @deprecated use {@link #NamedThreadFactory(Database, String)}.
      */
+    @Deprecated
     public NamedThreadFactory(final Database database, final String nameBase) {
         this(database.getThreadGroup(), database.getId(), nameBase);
     }

diff --git a/exist-core/src/main/java/org/exist/xmldb/RemoteXMLResource.java b/exist-core/src/main/java/org/exist/xmldb/RemoteXMLResource.java
@@ -110,6 +110,7 @@ public RemoteXMLResource(final RemoteCollection parent, final XmldbURI docId, fi
      * @throws XMLDBException if an error occurs during construction
      * @deprecated Use {@link #RemoteXMLResource(RemoteCollection, int, int, XmldbURI, Optional, Optional)}.
      */
+    @Deprecated
     public RemoteXMLResource(final RemoteCollection parent, final XmldbURI docId, final Optional<String> id, final Optional<String> type)
             throws XMLDBException {
         this(parent, -1, -1, docId, id, type);

diff --git a/exist-parent/pom.xml b/exist-parent/pom.xml
@@ -617,6 +617,11 @@
 
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>software.xdev</groupId>
+                    <artifactId>find-and-replace-maven-plugin</artifactId>
+                    <version>1.0.2</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-clean-plugin</artifactId>
@@ -979,6 +984,11 @@
                                 <exclude>FDB-backport-LGPL-21-ONLY-license.xml.template.txt</exclude>
                                 <exclude>LGPL-21-license.template.txt</exclude>                    
                                 <exclude>LGPL-21-license.txt</exclude>
+                                <exclude>LGPL-21-license.template.txt</exclude>
+                                <exclude>**/README.md</exclude>
+                                <exclude>**/README</exclude>
+                                <exclude>**/LICENSE</exclude>
+                                <exclude>**/*.xar</exclude>
                             </excludes>
                         </licenseSet>
                     </licenseSets>
@@ -1006,13 +1016,6 @@
                         <email>${contact.email}</email>
                         <url>${project.organization.url}</url>
                     </properties>
-                    <excludes>
-                        <exclude>LGPL-21-license.template.txt</exclude>
-                        <exclude>**/README.md</exclude>
-                        <exclude>**/README</exclude>
-                        <exclude>**/LICENSE</exclude>
-                        <exclude>**/*.xar</exclude>
-                    </excludes>
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
                 <executions>
@@ -1041,6 +1044,7 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <configuration>
                     <encoding>${project.build.sourceEncoding}</encoding>
+                    <propertiesEncoding>${project.build.sourceEncoding}</propertiesEncoding>
                 </configuration>
             </plugin>
             <plugin>