ACS-6188 Remove usage of deprecated constructors (#2295)

* Apply org.openrewrite.staticanalysis.PrimitiveWrapperClassConstructorToValueOf recipe * ACS-6188 Update copyright headers * ACS-6188 Update copyright header * ACS-6188 Clean-up --------- Co-authored-by: dsibilio <[email protected]> Co-authored-by: Domenico Sibilio <[email protected]>
Alfresco · Nov 8, 2023 · 1984056 · 1984056
1 parent a386dac
commit 1984056
Show file tree

Hide file tree

Showing 92 changed files with 274 additions and 275 deletions.
diff --git a/...fresco/module/org_alfresco_module_rm/test/legacy/jscript/JSONConversionComponentTest.java b/...fresco/module/org_alfresco_module_rm/test/legacy/jscript/JSONConversionComponentTest.java
@@ -139,7 +139,7 @@ private Serializable convertValue(String stringValue, String type)
             Serializable value = stringValue;
             if (type.equals("boolean"))
             {
-                value = new Boolean(stringValue);
+                value = Boolean.valueOf(stringValue);
             }
             return value;
         }

diff --git a/core/src/test/java/org/alfresco/query/CannedQueryTest.java b/core/src/test/java/org/alfresco/query/CannedQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
+ * Copyright (C) 2005-2023 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -55,11 +55,11 @@ public class CannedQueryTest extends TestCase
         RESULTS_TWO = new ArrayList<Long>(10);
         for (int i = 0; i < 10; i++)
         {
-            RESULTS_TWO.add(new Long(i));
+            RESULTS_TWO.add(Long.valueOf(i));
         }
         ANTI_RESULTS = new HashSet<Object>();
         ANTI_RESULTS.add("ONE_5");
-        ANTI_RESULTS.add(new Long(5));
+        ANTI_RESULTS.add(Long.valueOf(5));
     }
 
     @SuppressWarnings("rawtypes")

diff --git a/data-model/src/main/java/org/alfresco/service/cmr/repository/AssociationRef.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/AssociationRef.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Data model classes
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -121,7 +121,7 @@ public AssociationRef(String assocRefStr)
         String targetNodeRefStr = tokenizer.nextToken();
         String assocTypeQNameStr = tokenizer.nextToken();
 
-        this.id = new Long(idStr);
+        this.id = Long.valueOf(idStr);
         this.sourceRef = new NodeRef(sourceNodeRefStr);
         this.targetRef = new NodeRef(targetNodeRefStr);
         this.assocTypeQName = QName.createQName(assocTypeQNameStr);

diff --git a/...odel/src/main/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverter.java b/...odel/src/main/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Data model classes
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -391,7 +391,7 @@ public String convert(Class source)
         {
             public Boolean convert(Number source)
             {
-                return new Boolean(source.longValue() > 0);
+                return Boolean.valueOf(source.longValue() > 0);
             }
         });
         addConverter(Number.class, Byte.class, new TypeConverter.Converter<Number, Byte>()
@@ -549,8 +549,8 @@ public GregorianCalendar convert(Date source)
         //
         // Boolean ->
         //
-        final Long LONG_FALSE = new Long(0L);
-        final Long LONG_TRUE = new Long(1L);
+        final Long LONG_FALSE = Long.valueOf(0L);
+        final Long LONG_TRUE = Long.valueOf(1L);
         addConverter(Boolean.class, Long.class, new TypeConverter.Converter<Boolean, Long>()
                 {
                     public Long convert(Boolean source)

diff --git a/data-model/src/main/java/org/alfresco/service/cmr/repository/datatype/Duration.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/datatype/Duration.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Data model classes
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -190,7 +190,7 @@ public Duration(String duration)
             {
                if (token == StreamTokenizer.TT_NUMBER)
                {
-                  nval = new Double(tok.nval);
+                  nval = Double.valueOf(tok.nval);
                }
                else if (token == StreamTokenizer.TT_EOF)
                {

diff --git a/.../src/test/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverterTest.java b/.../src/test/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Data model classes
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -57,8 +57,8 @@ public DefaultTypeConverterTest(String arg0)
 
     public void testPrimitives()
     {
-        assertEquals(Boolean.valueOf(false), DefaultTypeConverter.INSTANCE.convert(Boolean.class, false));
-        assertEquals(Boolean.valueOf(true), DefaultTypeConverter.INSTANCE.convert(Boolean.class, true));
+        assertEquals(Boolean.FALSE, DefaultTypeConverter.INSTANCE.convert(Boolean.class, false));
+        assertEquals(Boolean.TRUE, DefaultTypeConverter.INSTANCE.convert(Boolean.class, true));
         assertEquals(Character.valueOf('a'), DefaultTypeConverter.INSTANCE.convert(Character.class, 'a'));
         assertEquals(Byte.valueOf("3"), DefaultTypeConverter.INSTANCE.convert(Byte.class, (byte) 3));
         assertEquals(Short.valueOf("4"), DefaultTypeConverter.INSTANCE.convert(Short.class, (short) 4));
@@ -70,8 +70,8 @@ public void testPrimitives()
 
     public void testNoConversion()
     {
-        assertEquals(Boolean.valueOf(false), DefaultTypeConverter.INSTANCE.convert(Boolean.class, Boolean.valueOf(false)));
-        assertEquals(Boolean.valueOf(true), DefaultTypeConverter.INSTANCE.convert(Boolean.class, Boolean.valueOf(true)));
+        assertEquals(Boolean.FALSE, DefaultTypeConverter.INSTANCE.convert(Boolean.class, Boolean.FALSE));
+        assertEquals(Boolean.TRUE, DefaultTypeConverter.INSTANCE.convert(Boolean.class, Boolean.TRUE));
         assertEquals(Character.valueOf('w'), DefaultTypeConverter.INSTANCE.convert(Character.class, Character.valueOf('w')));
         assertEquals(Byte.valueOf("3"), DefaultTypeConverter.INSTANCE.convert(Byte.class, Byte.valueOf("3")));
         assertEquals(Short.valueOf("4"), DefaultTypeConverter.INSTANCE.convert(Short.class, Short.valueOf("4")));
@@ -90,8 +90,8 @@ public void testNoConversion()
 
     public void testToString()
     {
-        assertEquals("true", DefaultTypeConverter.INSTANCE.convert(String.class, new Boolean(true)));
-        assertEquals("false", DefaultTypeConverter.INSTANCE.convert(String.class, new Boolean(false)));
+        assertEquals("true", DefaultTypeConverter.INSTANCE.convert(String.class, Boolean.TRUE));
+        assertEquals("false", DefaultTypeConverter.INSTANCE.convert(String.class, Boolean.FALSE));
         assertEquals("v", DefaultTypeConverter.INSTANCE.convert(String.class, Character.valueOf('v')));
         assertEquals("3", DefaultTypeConverter.INSTANCE.convert(String.class, Byte.valueOf("3")));
         assertEquals("4", DefaultTypeConverter.INSTANCE.convert(String.class, Short.valueOf("4")));
@@ -132,8 +132,8 @@ public void testToString()
 
     public void testFromString()
     {
-        assertEquals(Boolean.valueOf(true), DefaultTypeConverter.INSTANCE.convert(Boolean.class, "True"));
-        assertEquals(Boolean.valueOf(false), DefaultTypeConverter.INSTANCE.convert(Boolean.class, "woof"));
+        assertEquals(Boolean.TRUE, DefaultTypeConverter.INSTANCE.convert(Boolean.class, "True"));
+        assertEquals(Boolean.FALSE, DefaultTypeConverter.INSTANCE.convert(Boolean.class, "woof"));
         assertEquals(Character.valueOf('w'), DefaultTypeConverter.INSTANCE.convert(Character.class, "w"));
         assertEquals(Byte.valueOf("3"), DefaultTypeConverter.INSTANCE.convert(Byte.class, "3"));
         assertEquals(Short.valueOf("4"), DefaultTypeConverter.INSTANCE.convert(Short.class, "4"));
@@ -316,8 +316,8 @@ public void testMultiValue()
     private ArrayList<Object> makeList()
     {
         ArrayList<Object> list = new ArrayList<Object>();
-        list.add(Boolean.valueOf(true));
-        list.add(Boolean.valueOf(false));
+        list.add(Boolean.TRUE);
+        list.add(Boolean.FALSE);
         list.add(Character.valueOf('q'));
         list.add(Byte.valueOf("1"));
         list.add(Short.valueOf("2"));

diff --git a/remote-api/src/main/java/org/alfresco/repo/imap/scripts/ServerStatusWebScript.java b/remote-api/src/main/java/org/alfresco/repo/imap/scripts/ServerStatusWebScript.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -57,7 +57,7 @@ public void execute(WebScriptRequest req, WebScriptResponse res) throws IOExcept
         // hence providing ability for subsystem to be disabled (whilst still supporting ability to check status and/or dynamically start via JMX)
         String isEnabled = (String)subsystem.getProperty("imap.server.enabled");
 
-        if (new Boolean(isEnabled).booleanValue())
+        if (Boolean.valueOf(isEnabled).booleanValue())
         {
             res.getWriter().write("enabled");
         }

diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -109,7 +109,7 @@ protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
         int startPage = 1;
         try
         {
-            startPage = new Integer(startPageArg);
+            startPage = Integer.valueOf(startPageArg);
         }
         catch(NumberFormatException e)
         {
@@ -119,7 +119,7 @@ protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
         int itemsPerPage = DEFAULT_ITEMS_PER_PAGE;
         try
         {
-            itemsPerPage = new Integer(itemsPerPageArg);
+            itemsPerPage = Integer.valueOf(itemsPerPageArg);
         }
         catch(NumberFormatException e)
         {

diff --git a/...src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareThumbnailContentGet.java b/...src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareThumbnailContentGet.java
@@ -133,7 +133,7 @@ else if (c.equals("force"))
             String phString = req.getParameter("ph");
             if (phString != null)
             {
-               ph = new Boolean(phString);
+               ph = Boolean.valueOf(phString);
             }
 
             Scriptable scope = new BaseScopableProcessorExtension().getScope(); // note: required for ValueConverter (collection)

diff --git a/...in/java/org/alfresco/repo/web/scripts/rendition/patch/PatchThumbnailsAsRenditionsGet.java b/...in/java/org/alfresco/repo/web/scripts/rendition/patch/PatchThumbnailsAsRenditionsGet.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -149,7 +149,7 @@ public Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cach
         }
 
         Map<String, Object> model = new HashMap<String, Object>();
-    	model.put("patchedNodeCount", new Long(patchedNodeRefs));
+    	model.put("patchedNodeCount", Long.valueOf(patchedNodeRefs));
 
         return model;
     }

diff --git a/remote-api/src/main/java/org/alfresco/repo/web/util/paging/Paging.java b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/Paging.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -165,7 +165,7 @@ public Page createPageOrWindow(Map<String, String> args)
         {
             try
             {
-                pageNo = new Integer(strPageNo);
+                pageNo = Integer.valueOf(strPageNo);
             }
             catch(NumberFormatException e) {};
         }
@@ -177,7 +177,7 @@ public Page createPageOrWindow(Map<String, String> args)
         {
             try
             {
-                pageSize = new Integer(strPageSize);
+                pageSize = Integer.valueOf(strPageSize);
             }
             catch(NumberFormatException e) {};
         }
@@ -189,7 +189,7 @@ public Page createPageOrWindow(Map<String, String> args)
         {
             try
             {
-                skipCount = new Integer(strSkipCount);
+                skipCount = Integer.valueOf(strSkipCount);
             }
             catch(NumberFormatException e) {};
         }
@@ -201,7 +201,7 @@ public Page createPageOrWindow(Map<String, String> args)
         {
             try
             {
-                maxItems = new Integer(strMaxItems);
+                maxItems = Integer.valueOf(strMaxItems);
             }
             catch(NumberFormatException e) {};
         }

diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAV.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAV.java
@@ -351,7 +351,7 @@ public static Object getDAVPropertyValue( Map<QName, Serializable> props, String
             }
             else if (davPropName.equals(WebDAV.XML_GET_CONTENT_LENGTH))
             {
-                value = new Long(contentData.getSize());
+                value = Long.valueOf(contentData.getSize());
             }
         }
         return value;

diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/SearchSQLQuery.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/SearchSQLQuery.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -56,7 +56,7 @@ public SearchSQLQuery(@JsonProperty("stmt") String stmt,
         this.stmt = stmt;
         this.format = format != null ? format : "default";
         this.locales = locales != null ? locales : Collections.emptyList();
-        this.itemLimit = itemLimit == null || itemLimit < 1 ? new Integer(1000) : itemLimit;
+        this.itemLimit = itemLimit == null || itemLimit < 1 ? Integer.valueOf(1000) : itemLimit;
         this.includeMetadata = includeMetadata;
         this.timezone = timezone;
         this.filterQueries = filterQueries != null ? filterQueries : Collections.emptyList();

diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/CORSContextListener.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/CORSContextListener.java
@@ -72,7 +72,7 @@ private void initCORS(ServletContext servletContext)
         WebApplicationContext wc = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
 
         Properties gP = (Properties) wc.getBean(BEAN_GLOBAL_PROPERTIES);
-        Boolean corsEnabled = new Boolean(gP.getProperty(CORS_ENABLED));
+        Boolean corsEnabled = Boolean.valueOf(gP.getProperty(CORS_ENABLED));
 
         if(logger.isDebugEnabled())
         {

diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/admin/AdminWebScriptTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/admin/AdminWebScriptTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -146,7 +146,7 @@ public void testGetUsage() throws Exception
         RepoUsage usage = usageStatus.getUsage();
         LicenseDescriptor licenseDescriptor = descriptorService.getLicenseDescriptor();
         Date validUntil = (licenseDescriptor == null) ? null : licenseDescriptor.getValidUntil(); // might be null
-        Integer checkLevel = new Integer(usageStatus.getLevel().ordinal());
+        Integer checkLevel = Integer.valueOf(usageStatus.getLevel().ordinal());
 
         String url = "/api/admin/usage";
         TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);

diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -445,7 +445,7 @@ public void testQueryAuditRepo() throws Exception
         	Thread.sleep(1000);
         }
         assertTrue("Expected at least one entry", jsonEntries.length() > 0);
-        assertEquals("Entry count and physical count don't match", new Long(jsonEntries.length()), entryCount);
+        assertEquals("Entry count and physical count don't match", Long.valueOf(jsonEntries.length()), entryCount);
         JSONObject jsonEntry = jsonEntries.getJSONObject(0);
         Long entryId = jsonEntry.getLong(AbstractAuditWebScript.JSON_KEY_ENTRY_ID);
         assertNotNull("No entry ID", entryId);
@@ -483,7 +483,7 @@ public void testQueryAuditRepo() throws Exception
         assertTrue("Should have found entries", jsonEntries.length() > 0);
 
         // Now login with failure using a GUID and ensure that we can find it
-        String missingUser = new Long(System.currentTimeMillis()).toString();
+        String missingUser = Long.valueOf(System.currentTimeMillis()).toString();
 
         // Query for event that has not happened
         url = "/api/audit/query/" + APP_REPOTEST_NAME + "/repositorytest/login/error/user" + "?value=" + missingUser;

diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/quickshare/QuickShareRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/quickshare/QuickShareRestApiTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -147,7 +147,7 @@ protected void setUp() throws Exception
         userOneHome = repositoryHelper.getUserHome(personService.getPerson(USER_ONE));
         // no pun intended
         quickFile = AbstractContentTransformerTest.loadQuickTestFile("jpg");
-        TEST_CONTENT = new byte[new Long(quickFile.length()).intValue()];
+        TEST_CONTENT = new byte[Long.valueOf(quickFile.length()).intValue()];
         new FileInputStream(quickFile).read(TEST_CONTENT);
         testNode = createTestFile(userOneHome, TEST_NAME, quickFile);
 

diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -913,8 +913,8 @@ protected String updateFileVersions(String userId, String contentNodeId, int cnt
     {
         String[] parts = currentVersionLabel.split("\\.");
 
-        int majorVer = new Integer(parts[0]).intValue();
-        int minorVer = new Integer(parts[1]).intValue();
+        int majorVer = Integer.valueOf(parts[0]).intValue();
+        int minorVer = Integer.valueOf(parts[1]).intValue();
 
         Map<String, String> params = new HashMap<>();
         params.put(Nodes.PARAM_OVERWRITE, "true");