Skip to content

Commit 3ab00f4

Browse files
BillFarberBillFarber
committed
MLE-23004 - Cleaning up compiler warnings
1 parent 0ea2bb6 commit 3ab00f4

File tree

8 files changed

+36
-29
lines changed

8 files changed

+36
-29
lines changed

‎examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/DatabaseClientSingleton.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ private static void registerHandlers() {
3838
} catch (JAXBException e) {
3939
throw new IllegalStateException(e);
4040
}
41-
ObjectMapper mapper = new JacksonDatabindHandle(null).getMapper();
41+
42+
@SuppressWarnings("unchecked")
43+
ObjectMapper mapper = new JacksonDatabindHandle(null).getMapper();
4244
// we do the next three lines so dates are written in xs:dateTime format
4345
// which makes them ready for range indexes in MarkLogic Server
4446
String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";

‎marklogic-client-api/src/main/java/com/marklogic/client/datamovement/TypedRow.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ public String getUri() {
2020
}
2121

2222
public long getRowNum() {
23-
return new Long(rowNum).longValue();
23+
try {
24+
return Long.valueOf(rowNum).longValue();
25+
} catch (NumberFormatException e) {
26+
throw new IllegalArgumentException("Invalid rowNum value: " + rowNum, e);
27+
}
2428
}
2529

2630
public XsAnyAtomicTypeVal put(String name, XsAnyAtomicTypeVal val) {

‎marklogic-client-api/src/main/java/com/marklogic/client/impl/BasicPage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public BasicPage<T> setTotalSize(long totalSize) {
6969
}
7070

7171
public BasicPage<T> setSize(long size) {
72-
this.size = new Long(size);
72+
this.size = Long.valueOf(size);
7373
return this;
7474
}
7575

‎marklogic-client-api/src/main/java/com/marklogic/client/impl/OkHttpServices.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3580,10 +3580,10 @@ public Number getNumber() {
35803580
String value = getString();
35813581
if (value == null) return null;
35823582
if (getType() == EvalResult.Type.DECIMAL) return new BigDecimal(value);
3583-
else if (getType() == EvalResult.Type.DOUBLE) return new Double(value);
3584-
else if (getType() == EvalResult.Type.FLOAT) return new Float(value);
3583+
else if (getType() == EvalResult.Type.DOUBLE) return Double.valueOf(value);
3584+
else if (getType() == EvalResult.Type.FLOAT) return Float.valueOf(value);
35853585
// MarkLogic integers can be much larger than Java integers, so we'll use Long instead
3586-
else if (getType() == EvalResult.Type.INTEGER) return new Long(value);
3586+
else if (getType() == EvalResult.Type.INTEGER) return Long.valueOf(value);
35873587
else return new BigDecimal(value);
35883588
}
35893589

‎marklogic-client-api/src/test/java/com/marklogic/client/test/HandleAsTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ public void testBuiltinReadWrite()
7070
String binDocId = "/test/testAs1.bin";
7171
BinaryDocumentManager binMgr = Common.client.newBinaryDocumentManager();
7272

73-
byte[] beforeBytes = beforeText.getBytes("UTF-8");
73+
byte[] beforeBytes = beforeText.getBytes(java.nio.charset.StandardCharsets.UTF_8);
7474

7575
binMgr.writeAs(binDocId, beforeBytes);
76-
afterText = new String(binMgr.readAs(binDocId, byte[].class), "UTF-8");
76+
afterText = new String(binMgr.readAs(binDocId, byte[].class), java.nio.charset.StandardCharsets.UTF_8);
7777
binMgr.delete(binDocId);
7878
assertEquals(beforeText, afterText);
7979

8080
binMgr.writeAs(binDocId, new ByteArrayInputStream(beforeBytes));
81-
try ( Reader reader = new InputStreamReader( binMgr.readAs(binDocId, InputStream.class), "UTF-8") ) {
81+
try ( Reader reader = new InputStreamReader( binMgr.readAs(binDocId, InputStream.class), java.nio.charset.StandardCharsets.UTF_8) ) {
8282
cnum = reader.read(cbuf);
8383
binMgr.delete(binDocId);
8484
assertEquals(beforeText.length(), cnum);
@@ -341,7 +341,7 @@ private void verifyHandleRegistry(DatabaseClientFactory.Bean clientFactoryBean)
341341

342342
boolean threwError = false;
343343
try {
344-
textMgr.writeAs(textDocId, new Integer(5));
344+
textMgr.writeAs(textDocId, 5);
345345
} catch(Exception e) {
346346
threwError = true;
347347
}

‎marklogic-client-api/src/test/java/com/marklogic/client/test/ssl/SSLTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ public void testHostnameVerifier() throws SSLException, CertificateParsingExcept
116116
// if the entry is 2 it's a DNS or 7 then it's an IP address
117117
// according to https://docs.oracle.com/javase/8/docs/api/java/security/cert/X509Certificate.html#getSubjectAlternativeNames--
118118
Collection<List<?>> listSas = new ArrayList<>();
119-
listSas.add(Arrays.asList(new Object[] {new Integer(type_dnsName), passedSas[0]}));
120-
listSas.add(Arrays.asList(new Object[] {new Integer(type_ipAddress), passedSas[1]}));
121-
listSas.add(Arrays.asList(new Object[] {new Integer(type_dnsName), passedSas[2]}));
122-
listSas.add(Arrays.asList(new Object[] {new Integer(type_dnsName), passedSas[3]}));
119+
listSas.add(Arrays.asList(new Object[] { type_dnsName, passedSas[0] }));
120+
listSas.add(Arrays.asList(new Object[] { type_ipAddress, passedSas[1] }));
121+
listSas.add(Arrays.asList(new Object[] { type_dnsName, passedSas[2] }));
122+
listSas.add(Arrays.asList(new Object[] { type_dnsName, passedSas[3] }));
123123
when(cert.getSubjectAlternativeNames()).thenReturn(listSas);
124124

125125
// now that we have the cert all mocked with common names and subject alts, call the

‎ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ToolsPlugin.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ open class ToolsPlugin : Plugin<Project> {
1111

1212
project.extensions.add("endpointProxiesConfig", EndpointProxiesConfig())
1313

14-
project.tasks.create("generateEndpointProxies", EndpointProxiesGenTask::class.java)
15-
project.tasks.create("initializeModule", ModuleInitTask::class.java)
16-
project.tasks.create("checkCustomService", ServiceCompareTask::class.java)
14+
project.tasks.register("generateEndpointProxies", EndpointProxiesGenTask::class.java)
15+
project.tasks.register("initializeModule", ModuleInitTask::class.java)
16+
project.tasks.register("checkCustomService", ServiceCompareTask::class.java)
1717
}
1818
}

‎ml-development-tools/src/main/kotlin/com/marklogic/client/tools/proxy/Generator.kt‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -667,9 +667,9 @@ ${funcDecls}
667667
} else {
668668
"""return BaseProxy.${typeConverter(returnType)}.to${
669669
if (returnMapped.contains("."))
670-
returnMapped.substringAfterLast(".").capitalize()
670+
returnMapped.substringAfterLast(".").replaceFirstChar { it.uppercase() }
671671
else
672-
returnMapped.capitalize()
672+
returnMapped.replaceFirstChar { it.uppercase() }
673673
}(
674674
${callImpl}
675675
);"""
@@ -757,7 +757,7 @@ ${funcDecls}
757757
private ${className}(${paramSig}) {${
758758
paramNames.map{paramName ->
759759
"""
760-
set${paramName.capitalize()}(${paramName});"""
760+
set${paramName.replaceFirstChar { it.uppercase() }}(${paramName});"""
761761
}.joinToString("")}
762762
}"""
763763
return constructor
@@ -795,10 +795,10 @@ ${funcDecls}
795795
val mappedType = getJavaDataType(paramType, paramMapping, paramKind, isMultiple)
796796
val sigType = getSigDataType(mappedType, isMultiple)
797797
"""
798-
${getterAccess}${sigType} get${paramName.capitalize()}(){
798+
${getterAccess}${sigType} get${paramName.replaceFirstChar { it.uppercase() }}(){
799799
return arg_${paramName};
800800
}
801-
private void set${paramName.capitalize()}(${sigType} value){
801+
private void set${paramName.replaceFirstChar { it.uppercase() }}(${sigType} value){
802802
this.arg_${paramName} = value;
803803
}"""
804804
}.joinToString("")
@@ -809,9 +809,9 @@ ${funcDecls}
809809
if (paramType == "anyDocument") paramName
810810
else """BaseProxy.${typeConverter(paramType)}.from${
811811
if (mappedType.contains("."))
812-
mappedType.substringAfterLast(".").capitalize()
812+
mappedType.substringAfterLast(".").replaceFirstChar { it.uppercase() }
813813
else
814-
mappedType.capitalize()
814+
mappedType.replaceFirstChar { it.uppercase() }
815815
}(${paramName})"""
816816
val converter =
817817
"""BaseProxy.${paramKind}Param("${paramName}", ${isNullable}, ${convertExpr})"""
@@ -821,14 +821,14 @@ ${funcDecls}
821821
val converter =
822822
if (datatype == "int") "Integer"
823823
else if (datatype == "unsignedInt") "UnsignedInteger"
824-
else datatype.capitalize()
824+
else datatype.replaceFirstChar { it.uppercase() }
825825
return converter+"Type"
826826
}
827827
fun typeFormat(documentType: String) : String {
828828
val format =
829829
if (documentType == "array" || documentType == "object") "Format.JSON"
830830
else if (documentType == "anyDocument") "Format.UNKNOWN"
831-
else "Format."+documentType.substringBefore("Document").toUpperCase()
831+
else "Format."+documentType.substringBefore("Document").uppercase()
832832
return format
833833
}
834834
fun paramKindCardinality(currCardinality: ValueCardinality, param: ObjectNode): ValueCardinality {
@@ -953,7 +953,7 @@ declare option xdmp:mapping "false";
953953
when (paramType) {
954954
"array","object" ->
955955
if (moduleExtension == "mjs" || moduleExtension == "sjs")
956-
paramType.capitalize()+"Node"
956+
paramType.replaceFirstChar { it.uppercase() }+"Node"
957957
else
958958
paramType+"-node()"
959959
else ->
@@ -1104,15 +1104,16 @@ ${errorReport}"""
11041104
return rootPath+appendSuffix
11051105
}
11061106
fun checkObjectsEqual(errors: MutableList<String>, parentKey: String, customObj: ObjectNode, baseObj: ObjectNode) {
1107-
customObj.fields().forEach{(key, customVal) ->
1107+
customObj.fieldNames().forEach { key ->
1108+
val customVal = customObj.get(key)
11081109
if (key.startsWith("$")) {
11091110
} else if (!baseObj.has(key)) {
11101111
errors.add("${key} property of ${parentKey} exists in custom service but not base service")
11111112
} else {
11121113
checkValuesEqual(errors, key, customVal, baseObj.get(key))
11131114
}
11141115
}
1115-
baseObj.fields().forEach{(key, _) ->
1116+
baseObj.fieldNames().forEach { key ->
11161117
if (!customObj.has(key)) {
11171118
errors.add("${key} property of ${parentKey} exists in base service but not custom service")
11181119
}

0 commit comments

Comments
 (0)