MLE-23593 Fixing compiler warnings

rjrudin · rjrudin · commit 78b4d7b2cd1b · 2025-09-19T13:54:24.000-04:00
Knocks out all warnings, including warnings about build.gradle files. Big hat tip to Copilot.
diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,5 @@
+// Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+
 // Defines common configuration for each of the 3 subprojects.
 subprojects {
 	apply plugin: "java-library"
@@ -14,7 +16,7 @@ subprojects {
 		mavenCentral()
 		mavenLocal()
 		maven {
-			url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
+			url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
 		}
 	}
 
@@ -32,15 +34,25 @@ subprojects {
 		testImplementation 'org.slf4j:slf4j-api:2.0.17'
 	}
 
-	javadoc.failOnError = false
+	// Allows for quickly identifying compiler warnings.
+	tasks.withType(JavaCompile) {
+		options.compilerArgs += ["-Xlint:unchecked", "-Xlint:deprecation"]
+		options.deprecation = true
+		options.warnings = true
+	}
+
+	javadoc {
+		failOnError = false
+	}
+
 	// Ignores warnings on params that don't have descriptions, which is a little too noisy
 	javadoc.options.addStringOption('Xdoclint:none', '-quiet')
 
 	test {
 		useJUnitPlatform()
 		testLogging {
 			events 'started','passed', 'skipped', 'failed'
-			exceptionFormat 'full'
+			exceptionFormat = 'full'
 		}
 	}
 
@@ -89,17 +101,17 @@ subprojects {
 			maven {
 				if (project.hasProperty("mavenUser")) {
 					credentials {
-						username mavenUser
-						password mavenPassword
+						username = mavenUser
+						password = mavenPassword
 					}
 					url publishUrl
 					allowInsecureProtocol = true
 				} else {
 					name = "central"
 					url = mavenCentralUrl
 					credentials {
-						username mavenCentralUsername
-						password mavenCentralPassword
+						username = mavenCentralUsername
+						password = mavenCentralPassword
 					}
 				}
 			}
diff --git a/examples/local-testing-project/build.gradle b/examples/local-testing-project/build.gradle
@@ -1,8 +1,10 @@
+// Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+
 buildscript {
   repositories {
 	  mavenLocal()
 		maven {
-			url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
+			url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
 		}
 		mavenCentral()
   }
diff --git a/examples/marklogic-cloud-project/build.gradle b/examples/marklogic-cloud-project/build.gradle
@@ -1,8 +1,10 @@
+// Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+
 buildscript {
   repositories {
 	  mavenLocal()
 		maven {
-			url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
+			url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
 		}
 		mavenCentral()
   }
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java
@@ -206,8 +206,13 @@ protected boolean resourceMergingIsSupported(CommandContext context) {
 	 */
 	protected void storeResourceInCommandContextMap(CommandContext context, File resourceFile, String payload) {
 		final String contextKey = getContextKeyForResourcesToSave();
-		List<ResourceReference> references = (List<ResourceReference>) context.getContextMap().get(contextKey);
-		if (references == null) {
+		Object referencesObj = context.getContextMap().get(contextKey);
+		List<ResourceReference> references;
+		if (referencesObj != null) {
+			@SuppressWarnings("unchecked")
+			List<ResourceReference> existingReferences = (List<ResourceReference>) referencesObj;
+			references = existingReferences;
+		} else {
 			references = new ArrayList<>();
 			context.getContextMap().put(contextKey, references);
 		}
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/AbstractResourceCommand.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/AbstractResourceCommand.java
@@ -51,13 +51,17 @@ public void execute(CommandContext context) {
 		}
 
 		if (mergeResourcesBeforeSaving) {
-			List<ResourceReference> references = (List<ResourceReference>) context.getContextMap().get(getContextKeyForResourcesToSave());
-			if (references != null && !references.isEmpty()) {
-				List<ResourceReference> mergedReferences = mergeResources(references);
-				if (useCmaForDeployingResources(context)) {
-					saveMergedResourcesViaCma(context, mergedReferences);
-				} else {
-					saveMergedResources(context, getResourceManager(context), mergedReferences);
+			Object referencesObj = context.getContextMap().get(getContextKeyForResourcesToSave());
+			if (referencesObj != null) {
+				@SuppressWarnings("unchecked")
+				List<ResourceReference> references = (List<ResourceReference>) referencesObj;
+				if (!references.isEmpty()) {
+					List<ResourceReference> mergedReferences = mergeResources(references);
+					if (useCmaForDeployingResources(context)) {
+						saveMergedResourcesViaCma(context, mergedReferences);
+					} else {
+						saveMergedResources(context, getResourceManager(context), mergedReferences);
+					}
 				}
 			}
 		}
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/CommandContext.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/CommandContext.java
@@ -65,10 +65,15 @@ public Map<String, List<Forest>> getMapOfPrimaryForests() {
 		if (!appConfig.getCmaConfig().isDeployForests()) {
 			return null;
 		}
+
 		final String key = "ml-app-deployer-mapOfPrimaryForests";
-		if (contextMap.containsKey(key)) {
-			return (Map<String, List<Forest>>) contextMap.get(key);
+		if (contextMap.containsKey(key) && contextMap.get(key) instanceof Map) {
+			Object mapObj = contextMap.get(key);
+			@SuppressWarnings("unchecked")
+			Map<String, List<Forest>> forestMap = (Map<String, List<Forest>>) mapObj;
+			return forestMap;
 		}
+
 		Logger logger = LoggerFactory.getLogger(getClass());
 		try {
 			logger.info("Retrieving all forest details via CMA");
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/TestConnectionsCommand.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/TestConnectionsCommand.java
@@ -289,7 +289,7 @@ private TestResult testManageAppServer(ManageClient client) {
 			String version = new ClusterManager(client).getVersion();
 			return new TestResult(client.getManageConfig(), true, "MarkLogic version: " + version);
 		} catch (Exception ex) {
-			if (ex instanceof HttpClientErrorException && ((HttpClientErrorException) ex).getRawStatusCode() == 404) {
+			if (ex instanceof HttpClientErrorException && ((HttpClientErrorException) ex).getStatusCode().value() == 404) {
 				return new TestResult(client.getManageConfig(), false,
 					"Unable to access /manage/v2; received 404; unexpected response: " + ex.getMessage());
 			} else {
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsCommand.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsCommand.java
@@ -65,7 +65,7 @@ public void execute(CommandContext context) {
 
 	protected DatabaseClient buildDatabaseClient(AppConfig appConfig) {
 		String db = appConfig.getModelsDatabase();
-		if (StringUtils.isEmpty(db)) {
+		if (!StringUtils.hasText(db)) {
 			db = appConfig.getContentDatabaseName();
 		}
 		if (logger.isInfoEnabled()) {
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/ManageClient.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/ManageClient.java
@@ -218,7 +218,7 @@ private void delete(RestTemplate restTemplate, String path, String... headerName
 	 */
 	public HttpEntity<String> buildJsonEntity(String json) {
 		HttpHeaders headers = new HttpHeaders();
-		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+		headers.setContentType(MediaType.APPLICATION_JSON);
 		if (manageConfig != null && manageConfig.isCleanJsonPayloads()) {
 			json = cleanJsonPayload(json);
 		}
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/api/security/RoleObjectNodesSorter.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/api/security/RoleObjectNodesSorter.java
@@ -32,7 +32,7 @@ public List<ObjectNode> sortObjectNodes(List<ObjectNode> objectNodes) {
 		// This is to resolve bug #441, where capability-query's are being dropped because the Role class doesn't
 		// support them. It may be better to refactor this to not deserialize into Role instances so that ObjectNodes
 		// are used the entire time, even though we'd lose some of the convenience methods provided by the Role class.
-		final Map<String, ObjectNode> roleMap = new HashMap();
+		final Map<String, ObjectNode> roleMap = new HashMap<>();
 
 		ObjectReader reader = ObjectMapperFactory.getObjectMapper().readerFor(Role.class);
 		for (ObjectNode objectNode : objectNodes) {
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/mapper/DefaultResourceMapper.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/mapper/DefaultResourceMapper.java
@@ -74,7 +74,9 @@ public <T extends Resource> T readResource(String payload, Class<T> resourceType
 					}
 					jaxbContextMap.put(resourceType, context);
 				}
-				resource = (T) context.createUnmarshaller().unmarshal(new StringReader(payload));
+				@SuppressWarnings("unchecked")
+				T unmarshalledResource = (T) context.createUnmarshaller().unmarshal(new StringReader(payload));
+				resource = unmarshalledResource;
 			}
 			if (api != null && resource != null) {
 				resource.setApi(api);
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/template/GenericTemplateBuilder.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/template/GenericTemplateBuilder.java
@@ -30,7 +30,7 @@ public void addDefaultPropertyValue(String propertyName, Object value) {
 	public Resource buildTemplate(Map<String, Object> propertyMap) {
 		Resource r;
 		try {
-			r = (Resource) this.resourceClass.newInstance();
+			r = (Resource) this.resourceClass.getDeclaredConstructor().newInstance();
 		} catch (Exception ex) {
 			throw new RuntimeException(ex);
 		}
diff --git a/ml-app-deployer/src/main/java/com/marklogic/rest/util/PreviewInterceptor.java b/ml-app-deployer/src/main/java/com/marklogic/rest/util/PreviewInterceptor.java
@@ -240,11 +240,6 @@ public HttpStatus getStatusCode() {
 				return HttpStatus.OK;
 			}
 
-			@Override
-			public int getRawStatusCode() {
-				return 200;
-			}
-
 			@Override
 			public String getStatusText() {
 				return "OK";
diff --git a/ml-app-deployer/src/main/java/com/marklogic/rest/util/SpringWebUtil.java b/ml-app-deployer/src/main/java/com/marklogic/rest/util/SpringWebUtil.java
@@ -16,21 +16,15 @@
 public abstract class SpringWebUtil {
 
 	public static int getHttpStatusCode(ResponseEntity<?> response) {
-		// This method is deprecated in Spring 6.0 and slated to be removed in Spring 7.0. But it can be safely used
-		// by both Spring 5.x and 6.x. We'll need to revisit this when we want to support ml-gradle when Spring 7.0 is
-		// on the classpath as well.
-		return response.getStatusCodeValue();
+		return response.getStatusCode().value();
 	}
 
 	public static HttpStatus getHttpStatus(ResponseEntity<?> response) {
 		return HttpStatus.valueOf(getHttpStatusCode(response));
 	}
 
 	public static int getHttpStatusCode(RestClientResponseException ex) {
-		// This method is deprecated in Spring 6.0 and slated to be removed in Spring 7.0. But it can be safely used
-		// by both Spring 5.x and 6.x. We'll need to revisit this when we want to support ml-gradle when Spring 7.0 is
-		// on the classpath as well.
-		return ex.getRawStatusCode();
+		return ex.getStatusCode().value();
 	}
 
 	public static HttpStatus getHttpStatus(RestClientResponseException ex) {
diff --git a/ml-app-deployer/src/main/java/com/marklogic/rest/util/vendor/OkHttpClientHttpRequest.java b/ml-app-deployer/src/main/java/com/marklogic/rest/util/vendor/OkHttpClientHttpRequest.java
@@ -48,7 +48,6 @@ public URI getURI() {
 	}
 
 	@Override
-	@SuppressWarnings("removal")
 	protected ClientHttpResponse executeInternal(HttpHeaders headers, @Nullable Body body) throws IOException {
 
 		RequestBody requestBody;
@@ -57,7 +56,7 @@ protected ClientHttpResponse executeInternal(HttpHeaders headers, @Nullable Body
 		} else if (okhttp3.internal.http.HttpMethod.requiresRequestBody(getMethod().name())) {
 			String header = headers.getFirst(HttpHeaders.CONTENT_TYPE);
 			MediaType contentType = (header != null) ? MediaType.parse(header) : null;
-			requestBody = RequestBody.create(contentType, new byte[0]);
+			requestBody = RequestBody.create(new byte[0], contentType);
 		} else {
 			requestBody = null;
 		}
diff --git a/ml-app-deployer/src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java b/ml-app-deployer/src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java
@@ -28,7 +28,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class DefaultAppConfigFactoryTest {
+class DefaultAppConfigFactoryTest {
 
 	private DefaultAppConfigFactory factory;
 
@@ -211,7 +211,7 @@ public void dataConfigProperties() {
 		assertEquals(new File(projectDir, "src/main/more-data").getAbsolutePath(), config.getDataPaths().get(1));
 		assertEquals("apple", config.getCollections()[0]);
 		assertEquals("banana", config.getCollections()[1]);
-		assertEquals(new Integer(123), config.getBatchSize());
+		assertEquals(123, config.getBatchSize());
 		assertEquals("Documents", config.getDatabaseName());
 		assertEquals("manage-user,read,manage-user,update", config.getPermissions());
 		assertFalse(config.isReplaceTokensInData());
@@ -497,8 +497,8 @@ public void mostProperties() {
 		assertEquals("dev-.*", config.getResourceFilenamesExcludePattern().pattern());
 		assertEquals("qa-.*", config.getResourceFilenamesIncludePattern().pattern());
 
-		assertEquals(new Integer(1), config.getDatabaseNamesAndReplicaCounts().get("Documents"));
-		assertEquals(new Integer(2), config.getDatabaseNamesAndReplicaCounts().get("Security"));
+		assertEquals(1, config.getDatabaseNamesAndReplicaCounts().get("Documents"));
+		assertEquals(2, config.getDatabaseNamesAndReplicaCounts().get("Security"));
 
 		Set<String> set = config.getDatabasesWithForestsOnOneHost();
 		assertEquals(2, set.size());
diff --git a/ml-app-deployer/src/test/java/com/marklogic/appdeployer/scaffold/WriteServerTest.java b/ml-app-deployer/src/test/java/com/marklogic/appdeployer/scaffold/WriteServerTest.java
@@ -11,16 +11,16 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class WriteServerTest extends AbstractResourceWriterTest {
+class WriteServerTest extends AbstractResourceWriterTest {
 
 	@Test
-	public void defaultValues() {
+	void defaultValues() {
 		initializeAppDeployer(new DeployOtherServersCommand());
 
 		buildResourceAndDeploy(new ServerTemplateBuilder());
 
 		Server s = api.server("CHANGEME-name-of-server");
-		assertEquals(new Integer(8099), s.getPort());
+		assertEquals(8099, s.getPort());
 		assertEquals("Modules", s.getModulesDatabase());
 		assertEquals("Documents", s.getContentDatabase());
 		assertEquals("digest", s.getAuthentication());
diff --git a/ml-app-deployer/src/test/java/com/marklogic/appdeployer/scaffold/WriteTaskTest.java b/ml-app-deployer/src/test/java/com/marklogic/appdeployer/scaffold/WriteTaskTest.java
@@ -12,10 +12,10 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class WriteTaskTest extends AbstractResourceWriterTest {
+class WriteTaskTest extends AbstractResourceWriterTest {
 
 	@Test
-	public void defaultValues() {
+	void defaultValues() {
 		initializeAppDeployer(new DeployScheduledTasksCommand());
 
 		buildResourceAndDeploy(new TaskTemplateBuilder());
@@ -26,7 +26,7 @@ public void defaultValues() {
 		assertEquals("/CHANGEME-path-to-module.sjs", task.getTaskPath());
 		assertEquals("/", task.getTaskRoot());
 		assertEquals("daily", task.getTaskType());
-		assertEquals(new Integer(1), task.getTaskPeriod());
+		assertEquals(1, task.getTaskPeriod());
 		assertEquals("01:00:00", task.getTaskStartTime());
 		assertEquals("Documents", task.getTaskDatabase());
 		assertEquals("Modules", task.getTaskModules());
diff --git a/ml-gradle/build.gradle b/ml-gradle/build.gradle
@@ -37,8 +37,8 @@ gradlePlugin {
       id = 'com.marklogic.ml-gradle'
       displayName = 'ml-gradle for MarkLogic'
       description = 'Gradle plugin for configuring and deploying applications to MarkLogic'
-			tags.set(['marklogic', 'progress'])
-			implementationClass = 'com.marklogic.gradle.MarkLogicPlugin'
+      tags = ['marklogic', 'progress']
+      implementationClass = 'com.marklogic.gradle.MarkLogicPlugin'
     }
   }
 }
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/batch/BatchWriterSupport.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/batch/BatchWriterSupport.java
@@ -5,15 +5,15 @@
 
 import com.marklogic.client.document.DocumentWriteOperation;
 import com.marklogic.client.ext.helper.LoggingObject;
-import org.springframework.core.task.AsyncListenableTaskExecutor;
+import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.core.task.SyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.concurrent.ExecutorConfigurationSupport;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 
 /**
  * Support class for BatchWriter implementations that uses Spring's TaskExecutor interface for parallelizing writes to
@@ -74,24 +74,22 @@ protected void initializeDefaultTaskExecutor() {
 	}
 
 	/**
-	 * Will use the WriteListener if the TaskExecutor is an instance of AsyncListenableTaskExecutor. The WriteListener
+	 * Will use the WriteListener if the TaskExecutor is an instance of AsyncTaskExecutor. The WriteListener
 	 * will then be used to listen for failures.
 	 *
 	 * @param runnable
 	 * @param items
 	 */
 	protected void executeRunnable(Runnable runnable, final List<? extends DocumentWriteOperation> items) {
-		if (writeListener != null && taskExecutor instanceof AsyncListenableTaskExecutor) {
-			AsyncListenableTaskExecutor asyncListenableTaskExecutor = (AsyncListenableTaskExecutor)taskExecutor;
-			ListenableFuture<?> future = asyncListenableTaskExecutor.submitListenable(runnable);
-			future.addCallback(new ListenableFutureCallback<Object>() {
-				@Override
-				public void onFailure(Throwable ex) {
+		if (writeListener != null && taskExecutor instanceof AsyncTaskExecutor asyncTaskExecutor) {
+			CompletableFuture<?> future = asyncTaskExecutor.submitCompletable(runnable);
+			future.whenComplete((result, ex) -> {
+				if (ex != null) {
+					if (ex instanceof CompletionException ce && ce.getCause() != null) {
+						ex = ce.getCause();
+					}
 					writeListener.onWriteFailure(ex, items);
 				}
-				@Override
-				public void onSuccess(Object result) {
-				}
 			});
 		} else {
 			taskExecutor.execute(runnable);
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/datamovement/job/SimpleExportJob.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/datamovement/job/SimpleExportJob.java
@@ -15,6 +15,7 @@ public class SimpleExportJob extends AbstractQueryBatcherJob {
 
 	private ExportListener exportListener;
 
+	@SafeVarargs
 	public SimpleExportJob(Consumer<DocumentRecord>... consumers) {
 		exportListener = new ExportListener();
 		for (Consumer<DocumentRecord> consumer : consumers) {
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/datamovement/listener/AbstractExportBatchesListener.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/datamovement/listener/AbstractExportBatchesListener.java
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/file/CascadingPropertiesDrivenDocumentFileProcessor.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/file/CascadingPropertiesDrivenDocumentFileProcessor.java
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/file/DefaultDocumentFileReader.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/file/DefaultDocumentFileReader.java
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/file/DocumentFileProcessorWithFileVisitor.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/file/DocumentFileProcessorWithFileVisitor.java
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/tokenreplacer/DefaultTokenReplacer.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/tokenreplacer/DefaultTokenReplacer.java
diff --git a/ml-javaclient-util/src/test/java/com/marklogic/client/ext/datamovement/AbstractDataMovementTest.java b/ml-javaclient-util/src/test/java/com/marklogic/client/ext/datamovement/AbstractDataMovementTest.java
diff --git a/ml-javaclient-util/src/test/java/com/marklogic/client/ext/jaxb/JAXBHandleTest.java b/ml-javaclient-util/src/test/java/com/marklogic/client/ext/jaxb/JAXBHandleTest.java
diff --git a/ml-javaclient-util/src/test/java/com/marklogic/client/ext/modulesloader/impl/LoadModulesTest.java b/ml-javaclient-util/src/test/java/com/marklogic/client/ext/modulesloader/impl/LoadModulesTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
	`1`	`+// Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.`
	`2`	`+`
`1`	`3`	`buildscript {`
`2`	`4`	`repositories {`
`3`	`5`	`mavenLocal()`
`4`	`6`	`maven {`
`5`		`- url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"`
	`7`	`+ url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"`
`6`	`8`	`}`
`7`	`9`	`mavenCentral()`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,17 @@ public void execute(CommandContext context) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`if (mergeResourcesBeforeSaving) {`
`54`		`- List<ResourceReference> references = (List<ResourceReference>) context.getContextMap().get(getContextKeyForResourcesToSave());`
`55`		`- if (references != null && !references.isEmpty()) {`
`56`		`- List<ResourceReference> mergedReferences = mergeResources(references);`
`57`		`- if (useCmaForDeployingResources(context)) {`
`58`		`- saveMergedResourcesViaCma(context, mergedReferences);`
`59`		`- } else {`
`60`		`- saveMergedResources(context, getResourceManager(context), mergedReferences);`
	`54`	`+ Object referencesObj = context.getContextMap().get(getContextKeyForResourcesToSave());`
	`55`	`+ if (referencesObj != null) {`
	`56`	`+ @SuppressWarnings("unchecked")`
	`57`	`+ List<ResourceReference> references = (List<ResourceReference>) referencesObj;`
	`58`	`+ if (!references.isEmpty()) {`
	`59`	`+ List<ResourceReference> mergedReferences = mergeResources(references);`
	`60`	`+ if (useCmaForDeployingResources(context)) {`
	`61`	`+ saveMergedResourcesViaCma(context, mergedReferences);`
	`62`	`+ } else {`
	`63`	`+ saveMergedResources(context, getResourceManager(context), mergedReferences);`
	`64`	`+ }`
`61`	`65`	`}`
`62`	`66`	`}`
`63`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public void execute(CommandContext context) {`
`65`	`65`
`66`	`66`	`protected DatabaseClient buildDatabaseClient(AppConfig appConfig) {`
`67`	`67`	`String db = appConfig.getModelsDatabase();`
`68`		`- if (StringUtils.isEmpty(db)) {`
	`68`	`+ if (!StringUtils.hasText(db)) {`
`69`	`69`	`db = appConfig.getContentDatabaseName();`
`70`	`70`	`}`
`71`	`71`	`if (logger.isInfoEnabled()) {`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ private void delete(RestTemplate restTemplate, String path, String... headerName`
`218`	`218`	`*/`
`219`	`219`	`public HttpEntity<String> buildJsonEntity(String json) {`
`220`	`220`	`HttpHeaders headers = new HttpHeaders();`
`221`		`- headers.setContentType(MediaType.APPLICATION_JSON_UTF8);`
	`221`	`+ headers.setContentType(MediaType.APPLICATION_JSON);`
`222`	`222`	`if (manageConfig != null && manageConfig.isCleanJsonPayloads()) {`
`223`	`223`	`json = cleanJsonPayload(json);`
`224`	`224`	`}`