Mercurial > hg > digilib

changeset 1696:43d48324dceb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup: fix deprecation warnings for Java 10+. Change "new Integer/Float...(x)" to Integer.valueOf(x). Change clazz.newInstance to clazz.getConstructor().newInstance().
author Robert Casties <casties@mpiwg-berlin.mpg.de>
date Sun, 16 Dec 2018 15:08:01 +0100
parents ca28745836c1
children fc8e4f893db1
files common/src/main/java/digilib/auth/AuthnOpsFactory.java common/src/main/java/digilib/auth/AuthzOpsFactory.java common/src/main/java/digilib/conf/DigilibConfiguration.java common/src/main/java/digilib/conf/DigilibRequest.java common/src/main/java/digilib/image/DocuImageFactory.java common/src/main/java/digilib/image/ImageJobDescription.java common/src/main/java/digilib/io/DocuDirectoryFactory.java common/src/main/java/digilib/io/FileOps.java common/src/main/java/digilib/meta/MetaFactory.java common/src/main/java/digilib/util/Parameter.java pdf/src/main/java/digilib/conf/PDFRequest.java pdf/src/main/java/digilib/conf/PDFServletConfiguration.java servlet/src/main/java/digilib/conf/DigilibServletConfiguration.java servlet3/src/main/java/digilib/conf/DigilibServlet3Configuration.java
diffstat 14 files changed, 64 insertions(+), 64 deletions(-) [+]
line wrap: on
line diff
--- a/common/src/main/java/digilib/auth/AuthnOpsFactory.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/common/src/main/java/digilib/auth/AuthnOpsFactory.java	Sun Dec 16 15:08:01 2018 +0100
@@ -42,7 +42,7 @@
     public static AuthnOps getAuthnOpsInstance() {
         AuthnOps ao = null;
         try {
-            ao = authOpsClass.newInstance();
+            ao = authOpsClass.getDeclaredConstructor().newInstance();
         } catch (Exception e) {
             logger.error("Unable to create AuthnOps instance!", e);
         }
--- a/common/src/main/java/digilib/auth/AuthzOpsFactory.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/common/src/main/java/digilib/auth/AuthzOpsFactory.java	Sun Dec 16 15:08:01 2018 +0100
@@ -42,7 +42,7 @@
     public static AuthzOps getAuthzOpsInstance() {
         AuthzOps ao = null;
         try {
-            ao = authOpsClass.newInstance();
+            ao = authOpsClass.getDeclaredConstructor().newInstance();
         } catch (Exception e) {
             logger.error("Unable to create AuthzOps instance!", e);
         }
--- a/common/src/main/java/digilib/conf/DigilibConfiguration.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/common/src/main/java/digilib/conf/DigilibConfiguration.java	Sun Dec 16 15:08:01 2018 +0100
@@ -85,11 +85,11 @@
         // image hacks for DocuImage implementation
         newParameter("docuimage-hacks", "", null, 'f');
         // degree of subsampling on image load
-        newParameter("subsample-minimum", new Float(2f), null, 'f');
+        newParameter("subsample-minimum", Float.valueOf(2f), null, 'f');
         // default scaling quality
-        newParameter("default-quality", new Integer(2), null, 'f');
+        newParameter("default-quality", Integer.valueOf(2), null, 'f');
         // maximum destination image size (0 means no limit)
-        newParameter("max-image-size", new Integer(0), null, 'f');
+        newParameter("max-image-size", Integer.valueOf(0), null, 'f');
         // allow image toolkit to use disk cache
         newParameter("img-diskcache-allowed", Boolean.FALSE, null, 'f');
         // default type of error message (image, text, code)
@@ -178,9 +178,9 @@
             logger.debug("DocuImage ("+docuImageClass+") "+di.getVersion());
             // set hacks on instance
             try {
-                docuImageClass.newInstance().setHacks(config.getAsString("docuimage-hacks"));
-            } catch (InstantiationException | IllegalAccessException e) {
-                logger.error("Error creating instance of DocuImage class!");
+                docuImageClass.getDeclaredConstructor().newInstance().setHacks(config.getAsString("docuimage-hacks"));
+            } catch (Exception e) {
+                logger.error("Error creating instance of DocuImage class!", e);
             }
             // log supported formats
             StringBuilder fmts = new StringBuilder();
--- a/common/src/main/java/digilib/conf/DigilibRequest.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/common/src/main/java/digilib/conf/DigilibRequest.java	Sun Dec 16 15:08:01 2018 +0100
@@ -123,41 +123,41 @@
         // url of the page/document (second part)
         newParameter("fn", "", null, 's');
         // page number
-        newParameter("pn", new Integer(1), null, 's');
+        newParameter("pn", Integer.valueOf(1), null, 's');
         // width of client in pixels
-        newParameter("dw", new Integer(0), null, 's');
+        newParameter("dw", Integer.valueOf(0), null, 's');
         // height of client in pixels
-        newParameter("dh", new Integer(0), null, 's');
+        newParameter("dh", Integer.valueOf(0), null, 's');
         // left edge of image (float from 0 to 1)
-        newParameter("wx", new Float(0), null, 's');
+        newParameter("wx", Float.valueOf(0), null, 's');
         // top edge in image (float from 0 to 1)
-        newParameter("wy", new Float(0), null, 's');
+        newParameter("wy", Float.valueOf(0), null, 's');
         // width of image (float from 0 to 1)
-        newParameter("ww", new Float(1), null, 's');
+        newParameter("ww", Float.valueOf(1), null, 's');
         // height of image (float from 0 to 1)
-        newParameter("wh", new Float(1), null, 's');
+        newParameter("wh", Float.valueOf(1), null, 's');
         // scale factor
-        newParameter("ws", new Float(1), null, 's');
+        newParameter("ws", Float.valueOf(1), null, 's');
         // special options like 'fit' for gifs
         newParameter("mo", this.options, null, 's');
         // rotation angle (degree)
-        newParameter("rot", new Float(0), null, 's');
+        newParameter("rot", Float.valueOf(0), null, 's');
         // contrast enhancement factor
-        newParameter("cont", new Float(0), null, 's');
+        newParameter("cont", Float.valueOf(0), null, 's');
         // brightness enhancement factor
-        newParameter("brgt", new Float(0), null, 's');
+        newParameter("brgt", Float.valueOf(0), null, 's');
         // color multiplicative factors
         newParameter("rgbm", "0/0/0", null, 's');
         // color additive factors
         newParameter("rgba", "0/0/0", null, 's');
         // display dpi resolution (total)
-        newParameter("ddpi", new Float(0), null, 's');
+        newParameter("ddpi", Float.valueOf(0), null, 's');
         // display dpi X resolution
-        newParameter("ddpix", new Float(0), null, 's');
+        newParameter("ddpix", Float.valueOf(0), null, 's');
         // display dpi Y resolution
-        newParameter("ddpiy", new Float(0), null, 's');
+        newParameter("ddpiy", Float.valueOf(0), null, 's');
         // scale factor for mo=ascale
-        newParameter("scale", new Float(1), null, 's');
+        newParameter("scale", Float.valueOf(1), null, 's');
         // color conversion operation
         newParameter("colop", "", null, 's');
 
@@ -180,13 +180,13 @@
         // "real" filename
         newParameter("img.fn", "", null, 'c');
         // image dpi x
-        newParameter("img.dpix", new Integer(0), null, 'c');
+        newParameter("img.dpix", Integer.valueOf(0), null, 'c');
         // image dpi y
-        newParameter("img.dpiy", new Integer(0), null, 'c');
+        newParameter("img.dpiy", Integer.valueOf(0), null, 'c');
         // hires image size x
-        newParameter("img.pix_x", new Integer(0), null, 'c');
+        newParameter("img.pix_x", Integer.valueOf(0), null, 'c');
         // hires image size y
-        newParameter("img.pix_y", new Integer(0), null, 'c');
+        newParameter("img.pix_y", Integer.valueOf(0), null, 'c');
 
         /*
          * set local variables from config
--- a/common/src/main/java/digilib/image/DocuImageFactory.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/common/src/main/java/digilib/image/DocuImageFactory.java	Sun Dec 16 15:08:01 2018 +0100
@@ -49,7 +49,7 @@
     public static DocuImage getInstance() {
         DocuImage di = null;
         try {
-            di = docuImageClass.newInstance();
+            di = docuImageClass.getConstructor().newInstance();
         } catch (Exception e) {
             logger.error("Unable to create DocuImage instance!", e);
         }
--- a/common/src/main/java/digilib/image/ImageJobDescription.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/common/src/main/java/digilib/image/ImageJobDescription.java	Sun Dec 16 15:08:01 2018 +0100
@@ -112,41 +112,41 @@
         // url of the page/document (second part)
         newParameter("fn", "", null, 's');
         // page number
-        newParameter("pn", new Integer(1), null, 's');
+        newParameter("pn", Integer.valueOf(1), null, 's');
         // width of client in pixels
-        newParameter("dw", new Integer(0), null, 's');
+        newParameter("dw", Integer.valueOf(0), null, 's');
         // height of client in pixels
-        newParameter("dh", new Integer(0), null, 's');
+        newParameter("dh", Integer.valueOf(0), null, 's');
         // left edge of image (float from 0 to 1)
-        newParameter("wx", new Float(0), null, 's');
+        newParameter("wx", Float.valueOf(0), null, 's');
         // top edge in image (float from 0 to 1)
-        newParameter("wy", new Float(0), null, 's');
+        newParameter("wy", Float.valueOf(0), null, 's');
         // width of image (float from 0 to 1)
-        newParameter("ww", new Float(1), null, 's');
+        newParameter("ww", Float.valueOf(1), null, 's');
         // height of image (float from 0 to 1)
-        newParameter("wh", new Float(1), null, 's');
+        newParameter("wh", Float.valueOf(1), null, 's');
         // scale factor
-        newParameter("ws", new Float(1), null, 's');
+        newParameter("ws", Float.valueOf(1), null, 's');
         // special options like 'fit' for gifs
         newParameter("mo", this.options, null, 's');
         // rotation angle (degree)
-        newParameter("rot", new Float(0), null, 's');
+        newParameter("rot", Float.valueOf(0), null, 's');
         // contrast enhancement factor
-        newParameter("cont", new Float(0), null, 's');
+        newParameter("cont", Float.valueOf(0), null, 's');
         // brightness enhancement factor
-        newParameter("brgt", new Float(0), null, 's');
+        newParameter("brgt", Float.valueOf(0), null, 's');
         // color multiplicative factors
         newParameter("rgbm", "0/0/0", null, 's');
         // color additive factors
         newParameter("rgba", "0/0/0", null, 's');
         // display dpi resolution (total)
-        newParameter("ddpi", new Float(0), null, 's');
+        newParameter("ddpi", Float.valueOf(0), null, 's');
         // display dpi X resolution
-        newParameter("ddpix", new Float(0), null, 's');
+        newParameter("ddpix", Float.valueOf(0), null, 's');
         // display dpi Y resolution
-        newParameter("ddpiy", new Float(0), null, 's');
+        newParameter("ddpiy", Float.valueOf(0), null, 's');
         // scale factor for mo=ascale
-        newParameter("scale", new Float(1), null, 's');
+        newParameter("scale", Float.valueOf(1), null, 's');
         // color conversion operation
         newParameter("colop", "", null, 's');
     }
--- a/common/src/main/java/digilib/io/DocuDirectoryFactory.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/common/src/main/java/digilib/io/DocuDirectoryFactory.java	Sun Dec 16 15:08:01 2018 +0100
@@ -52,7 +52,7 @@
     public static DocuDirectory getInstance() {
         DocuDirectory dd = null;
         try {
-            dd = docuDirClass.newInstance();
+            dd = docuDirClass.getConstructor().newInstance();
         } catch (Exception e) {
             logger.error("Unable to create DocuDirectory instance!", e);
         }
--- a/common/src/main/java/digilib/io/FileOps.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/common/src/main/java/digilib/io/FileOps.java	Sun Dec 16 15:08:01 2018 +0100
@@ -60,11 +60,11 @@
 
 	public static enum FileClass {NONE, IMAGE, TEXT, SVG}
 
-	public static final Integer HINT_BASEDIRS = new Integer(1);
+	public static final Integer HINT_BASEDIRS = Integer.valueOf(1);
 
-	public static final Integer HINT_FILEEXT = new Integer(2);
+	public static final Integer HINT_FILEEXT = Integer.valueOf(2);
 
-	public static final Integer HINT_DIRS = new Integer(3);
+	public static final Integer HINT_DIRS = Integer.valueOf(3);
 
 	/**
 	 * static initializer for FileOps
--- a/common/src/main/java/digilib/meta/MetaFactory.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/common/src/main/java/digilib/meta/MetaFactory.java	Sun Dec 16 15:08:01 2018 +0100
@@ -52,7 +52,7 @@
         }
         FileMeta mo = null;
         try {
-            mo = fileMetaClass.newInstance();
+            mo = fileMetaClass.getConstructor().newInstance();
         } catch (Exception e) {
             logger.error("Unable to create FileMeta instance!", e);
         }
@@ -66,7 +66,7 @@
         }
         DirMeta mo = null;
         try {
-            mo = dirMetaClass.newInstance();
+            mo = dirMetaClass.getConstructor().newInstance();
         } catch (Exception e) {
             logger.error("Unable to create DirMeta instance!", e);
         }
--- a/common/src/main/java/digilib/util/Parameter.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/common/src/main/java/digilib/util/Parameter.java	Sun Dec 16 15:08:01 2018 +0100
@@ -129,18 +129,18 @@
 		}
 		// set Boolean if string == "true"
 		if (c == Boolean.class) {
-			this.value = new Boolean(val.compareToIgnoreCase("true") == 0);
+			this.value = Boolean.valueOf(val.compareToIgnoreCase("true") == 0);
 			return true;
 		}
 		try {
 			// set Integer
 			if (c == Integer.class) {
-				this.value = new Integer(Integer.parseInt(val));
+				this.value = Integer.valueOf(Integer.parseInt(val));
 				return true;
 			}
 			// set Float
 			if (c == Float.class) {
-				this.value = new Float(Float.parseFloat(val));
+				this.value = Float.valueOf(Float.parseFloat(val));
 				return true;
 			}
 		} catch (NumberFormatException e) {
@@ -287,7 +287,7 @@
 	 * @param value
 	 */
 	public void setValue(int value) {
-		this.value = new Integer(value);
+		this.value = Integer.valueOf(value);
 	}
 
 	/**
@@ -296,7 +296,7 @@
 	 * @param value
 	 */
 	public void setValue(float value) {
-		this.value = new Float(value);
+		this.value = Float.valueOf(value);
 	}
 
 	/**
--- a/pdf/src/main/java/digilib/conf/PDFRequest.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/pdf/src/main/java/digilib/conf/PDFRequest.java	Sun Dec 16 15:08:01 2018 +0100
@@ -91,11 +91,11 @@
 		// url of the page/document (second part)
 		newParameter("fn", "", null, 's');
 		// width of client in pixels
-		newParameter("dw", new Integer(0), null, 's');
+		newParameter("dw", Integer.valueOf(0), null, 's');
 		// height of client in pixels
-		newParameter("dh", new Integer(500), null, 's');
+		newParameter("dh", Integer.valueOf(500), null, 's');
         // page number (used internally)
-        newParameter("pn", new Integer(1), null, 'i');
+        newParameter("pn", Integer.valueOf(1), null, 'i');
 	}
 	
 	/* (non-Javadoc)
--- a/pdf/src/main/java/digilib/conf/PDFServletConfiguration.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/pdf/src/main/java/digilib/conf/PDFServletConfiguration.java	Sun Dec 16 15:08:01 2018 +0100
@@ -90,13 +90,13 @@
          */
 
         // number of pdf-generation threads
-        newParameter("pdf-worker-threads", new Integer(1), null, 'f');
+        newParameter("pdf-worker-threads", Integer.valueOf(1), null, 'f');
         // max number of waiting pdf-generation threads
-        newParameter("pdf-max-waiting-threads", new Integer(20), null, 'f');
+        newParameter("pdf-max-waiting-threads", Integer.valueOf(20), null, 'f');
         // number of pdf-image generation threads
-        newParameter("pdf-image-worker-threads", new Integer(1), null, 'f');
+        newParameter("pdf-image-worker-threads", Integer.valueOf(1), null, 'f');
         // max number of waiting pdf-image generation threads
-        newParameter("pdf-image-max-waiting-threads", new Integer(10), null, 'f');
+        newParameter("pdf-image-max-waiting-threads", Integer.valueOf(10), null, 'f');
         // PDF generation temp directory
         newParameter("pdf-temp-dir", "pdf_temp", null, 'f');
         // PDF generation cache directory
--- a/servlet/src/main/java/digilib/conf/DigilibServletConfiguration.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/servlet/src/main/java/digilib/conf/DigilibServletConfiguration.java	Sun Dec 16 15:08:01 2018 +0100
@@ -156,9 +156,9 @@
         // log4j config file location
         newParameter("log-config-file", new File("log4j-config.xml"), null, 'f');
         // number of working threads
-        newParameter("worker-threads", new Integer(2), null, 'f');
+        newParameter("worker-threads", Integer.valueOf(2), null, 'f');
         // max number of waiting threads
-        newParameter("max-waiting-threads", new Integer(20), null, 'f');
+        newParameter("max-waiting-threads", Integer.valueOf(20), null, 'f');
         // FileMeta implementation
         newParameter("filemeta-class", "digilib.meta.IndexMetaFileMeta", null, 'f');
         // DirMeta implementation
--- a/servlet3/src/main/java/digilib/conf/DigilibServlet3Configuration.java	Sat Dec 15 19:03:16 2018 +0100
+++ b/servlet3/src/main/java/digilib/conf/DigilibServlet3Configuration.java	Sun Dec 16 15:08:01 2018 +0100
@@ -58,7 +58,7 @@
         super();
         
         // timeout for worker threads (ms)
-        newParameter("worker-timeout", new Integer(60000), null, 'f');
+        newParameter("worker-timeout", Integer.valueOf(60000), null, 'f');
     }
 
     /* (non-Javadoc)