Skip to content

Commit bd71653

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

File tree

8 files changed

+556
-549
lines changed

8 files changed

+556
-549
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: 122 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -7,126 +7,126 @@
77
import com.marklogic.client.Page;
88

99
public class BasicPage<T> implements Page<T> {
10-
private Iterator<T> iterator;
11-
private long start;
12-
private Long size = null;
13-
private long pageSize;
14-
private long totalSize;
15-
16-
protected BasicPage(Class<T> type) {
17-
}
18-
19-
public BasicPage(Iterator<T> iterator, long start, long pageSize, long totalSize) {
20-
this.iterator = iterator;
21-
this.start = start;
22-
this.pageSize = pageSize;
23-
this.totalSize = totalSize;
24-
}
25-
26-
@Override
27-
public Iterator<T> iterator() {
28-
return iterator;
29-
}
30-
31-
@Override
32-
public boolean hasNext() {
33-
return iterator.hasNext();
34-
}
35-
36-
@Override
37-
public T next() {
38-
return iterator.next();
39-
}
40-
41-
@Override
42-
public long getStart() {
43-
return start;
44-
}
45-
46-
public BasicPage<T> setStart(long start) {
47-
this.start = start;
48-
return this;
49-
}
50-
51-
@Override
52-
public long getPageSize() {
53-
return pageSize;
54-
}
55-
56-
public BasicPage<T> setPageSize(long pageSize) {
57-
this.pageSize = pageSize;
58-
return this;
59-
}
60-
61-
@Override
62-
public long getTotalSize() {
63-
return totalSize;
64-
}
65-
66-
public BasicPage<T> setTotalSize(long totalSize) {
67-
this.totalSize = totalSize;
68-
return this;
69-
}
70-
71-
public BasicPage<T> setSize(long size) {
72-
this.size = new Long(size);
73-
return this;
74-
}
75-
76-
@Override
77-
public long size() {
78-
if ( size != null ) return size.longValue();
79-
if ( getPageSize() == 0 ) {
80-
return 0;
81-
} else if ( hasNextPage() ) {
82-
return getPageSize();
83-
} else if ((getTotalSize() % getPageSize()) == 0) {
84-
return getPageSize();
85-
} else {
86-
return getTotalSize() % getPageSize();
87-
}
88-
}
89-
90-
@Override
91-
public long getTotalPages() {
92-
return ceilingDivision(getTotalSize(), getPageSize());
93-
}
94-
95-
@Override
96-
public boolean hasContent() {
97-
return size() > 0;
98-
}
99-
100-
@Override
101-
public boolean hasNextPage() {
102-
return getPageNumber() < getTotalPages();
103-
}
104-
105-
@Override
106-
public boolean hasPreviousPage() {
107-
return getPageNumber() > 1;
108-
}
109-
110-
@Override
111-
public long getPageNumber() {
112-
return ceilingDivision(getStart(), getPageSize());
113-
}
114-
115-
private long ceilingDivision(long dividend, long divisor) {
116-
if (divisor == 0) return 0;
117-
long quotient = dividend / divisor;
118-
return (dividend % divisor == 0) ? quotient : quotient + 1;
119-
}
120-
121-
@Override
122-
public boolean isFirstPage() {
123-
if ( getPageSize() == 0 ) return true;
124-
return getPageNumber() == 1;
125-
}
126-
127-
@Override
128-
public boolean isLastPage() {
129-
if ( getPageSize() == 0 ) return true;
130-
return getPageNumber() == getTotalPages();
131-
}
10+
private Iterator<T> iterator;
11+
private long start;
12+
private Long size = null;
13+
private long pageSize;
14+
private long totalSize;
15+
16+
protected BasicPage(Class<T> type) {
17+
}
18+
19+
public BasicPage(Iterator<T> iterator, long start, long pageSize, long totalSize) {
20+
this.iterator = iterator;
21+
this.start = start;
22+
this.pageSize = pageSize;
23+
this.totalSize = totalSize;
24+
}
25+
26+
@Override
27+
public Iterator<T> iterator() {
28+
return iterator;
29+
}
30+
31+
@Override
32+
public boolean hasNext() {
33+
return iterator.hasNext();
34+
}
35+
36+
@Override
37+
public T next() {
38+
return iterator.next();
39+
}
40+
41+
@Override
42+
public long getStart() {
43+
return start;
44+
}
45+
46+
public BasicPage<T> setStart(long start) {
47+
this.start = start;
48+
return this;
49+
}
50+
51+
@Override
52+
public long getPageSize() {
53+
return pageSize;
54+
}
55+
56+
public BasicPage<T> setPageSize(long pageSize) {
57+
this.pageSize = pageSize;
58+
return this;
59+
}
60+
61+
@Override
62+
public long getTotalSize() {
63+
return totalSize;
64+
}
65+
66+
public BasicPage<T> setTotalSize(long totalSize) {
67+
this.totalSize = totalSize;
68+
return this;
69+
}
70+
71+
public BasicPage<T> setSize(long size) {
72+
this.size = Long.valueOf(size);
73+
return this;
74+
}
75+
76+
@Override
77+
public long size() {
78+
if ( size != null ) return size.longValue();
79+
if ( getPageSize() == 0 ) {
80+
return 0;
81+
} else if ( hasNextPage() ) {
82+
return getPageSize();
83+
} else if ((getTotalSize() % getPageSize()) == 0) {
84+
return getPageSize();
85+
} else {
86+
return getTotalSize() % getPageSize();
87+
}
88+
}
89+
90+
@Override
91+
public long getTotalPages() {
92+
return ceilingDivision(getTotalSize(), getPageSize());
93+
}
94+
95+
@Override
96+
public boolean hasContent() {
97+
return size() > 0;
98+
}
99+
100+
@Override
101+
public boolean hasNextPage() {
102+
return getPageNumber() < getTotalPages();
103+
}
104+
105+
@Override
106+
public boolean hasPreviousPage() {
107+
return getPageNumber() > 1;
108+
}
109+
110+
@Override
111+
public long getPageNumber() {
112+
return ceilingDivision(getStart(), getPageSize());
113+
}
114+
115+
private long ceilingDivision(long dividend, long divisor) {
116+
if (divisor == 0) return 0;
117+
long quotient = dividend / divisor;
118+
return (dividend % divisor == 0) ? quotient : quotient + 1;
119+
}
120+
121+
@Override
122+
public boolean isFirstPage() {
123+
if ( getPageSize() == 0 ) return true;
124+
return getPageNumber() == 1;
125+
}
126+
127+
@Override
128+
public boolean isLastPage() {
129+
if ( getPageSize() == 0 ) return true;
130+
return getPageNumber() == getTotalPages();
131+
}
132132
}

‎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

0 commit comments

Comments
 (0)