You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by gg...@apache.org on 2023/06/24 03:48:50 UTC
[juneau] 14/29: [juneau-utest] Use "L" instead of "l" for long literals (legibility)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 3815d954daa624874034331b137c7201eb1cf396
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:07:28 2023 -0400
[juneau-utest] Use "L" instead of "l" for long literals (legibility)
---
.../test/java/org/apache/juneau/BeanMapTest.java | 4 +-
.../a/rttests/RoundTripBeanPropertiesTest.java | 8 ++--
.../rttests/RoundTripPrimitiveObjectBeansTest.java | 4 +-
.../a/rttests/RoundTripPrimitivesBeansTest.java | 22 ++++-----
.../a/rttests/RoundTripSimpleObjectsTest.java | 28 +++++------
.../juneau/assertions/AnyAssertion_Test.java | 2 +-
.../apache/juneau/assertions/Assertions_Test.java | 4 +-
.../juneau/assertions/DateAssertion_Test.java | 4 +-
.../juneau/assertions/LongAssertion_Test.java | 56 +++++++++++-----------
.../java/org/apache/juneau/config/ConfigTest.java | 28 +++++------
.../juneau/html/HtmlSchemaSerializerTest.java | 2 +-
.../apache/juneau/http/BasicHttpResource_Test.java | 10 ++--
.../juneau/http/SerializedHttpEntity_Test.java | 2 +-
.../juneau/http/header/BasicLongHeader_Test.java | 4 +-
.../juneau/http/header/ContentLength_Test.java | 2 +-
.../remote/Remote_FormDataAnnotation_Test.java | 52 ++++++++++----------
.../http/remote/Remote_HeaderAnnotation_Test.java | 52 ++++++++++----------
.../http/remote/Remote_PathAnnotation_Test.java | 52 ++++++++++----------
.../http/remote/Remote_QueryAnnotation_Test.java | 52 ++++++++++----------
.../juneau/httppart/OpenApiPartParser_Test.java | 8 ++--
.../httppart/OpenApiPartSerializer_Test.java | 56 +++++++++++-----------
.../juneau/json/JsonSchemaSerializerTest.java | 2 +-
.../juneau/jsonschema/JsonSchemaGeneratorTest.java | 4 +-
.../apache/juneau/mstat/MethodExecStore_Test.java | 6 +--
.../org/apache/juneau/mstat/ThrownStore_Test.java | 24 +++++-----
.../java/org/apache/juneau/oapi/OpenApiTest.java | 2 +-
.../apache/juneau/objecttools/ObjectRest_Test.java | 52 ++++++++++----------
.../org/apache/juneau/reflect/ClassInfoTest.java | 2 +-
.../rest/client/RestClient_Headers_Test.java | 2 +-
.../rest/client/RestClient_Response_Body_Test.java | 6 +--
.../client/RestClient_Response_Headers_Test.java | 2 +-
.../rest/client/RestClient_Response_Test.java | 2 +-
.../juneau/transform/AutoNumberSwapTest.java | 10 ++--
33 files changed, 283 insertions(+), 283 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
index ff0bcb13b..ea8303023 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -76,7 +76,7 @@ public class BeanMapTest {
m.put("b1", null);
assertEquals(Integer.valueOf(0), m.get("i1"));
assertEquals(Short.valueOf((short)0), m.get("s1"));
- assertEquals(Long.valueOf(0l), m.get("l1"));
+ assertEquals(Long.valueOf(0L), m.get("l1"));
assertEquals(Double.valueOf(0d), m.get("d1"));
assertEquals(Float.valueOf(0f), m.get("f1"));
assertEquals(Boolean.valueOf(false), m.get("b1"));
@@ -155,7 +155,7 @@ public class BeanMapTest {
m.put("b1", null);
assertEquals(Integer.valueOf(0), m.get("i1"));
assertEquals(Short.valueOf((short)0), m.get("s1"));
- assertEquals(Long.valueOf(0l), m.get("l1"));
+ assertEquals(Long.valueOf(0L), m.get("l1"));
assertEquals(Double.valueOf(0d), m.get("d1"));
assertEquals(Float.valueOf(0f), m.get("f1"));
assertEquals(Boolean.valueOf(false), m.get("b1"));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanPropertiesTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanPropertiesTest.java
index 4e4be7c78..df1ca3b83 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanPropertiesTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanPropertiesTest.java
@@ -47,7 +47,7 @@ public class RoundTripBeanPropertiesTest extends RoundTripTest {
public void a01_arrayOfListOfLongs() throws Exception {
A01 o = new A01();
o.f1 = new List[1];
- o.f1[0] = alist(123l);
+ o.f1[0] = alist(123L);
o = roundTrip(o);
assertEquals(123, o.f1[0].get(0).intValue());
assertTrue(o.f1[0].get(0) instanceof Long);
@@ -60,7 +60,7 @@ public class RoundTripBeanPropertiesTest extends RoundTripTest {
@Test
public void a02_ListOfArrayOfLongs() throws Exception {
A02 o = new A02();
- o.f1 = CollectionUtils.<Long[]>alist(new Long[]{123l});
+ o.f1 = CollectionUtils.<Long[]>alist(new Long[]{123L});
o = roundTrip(o);
assertEquals(123, o.f1.get(0)[0].intValue());
assertTrue(o.f1.get(0)[0] instanceof Long);
@@ -74,7 +74,7 @@ public class RoundTripBeanPropertiesTest extends RoundTripTest {
public void a03_2dArrayOfListOfLongs() throws Exception {
A03 o = new A03();
o.f1 = new List[1][1];
- o.f1[0] = new List[]{alist(123l)};
+ o.f1[0] = new List[]{alist(123L)};
o = roundTrip(o);
assertEquals(123, o.f1[0][0].get(0).intValue());
assertTrue(o.f1[0][0].get(0) instanceof Long);
@@ -87,7 +87,7 @@ public class RoundTripBeanPropertiesTest extends RoundTripTest {
@Test
public void a04_ListOf2dArrayOfLongs() throws Exception {
A04 o = new A04();
- o.f1 = CollectionUtils.<Long[][]>alist(new Long[][]{new Long[]{123l}});
+ o.f1 = CollectionUtils.<Long[][]>alist(new Long[][]{new Long[]{123L}});
o = roundTrip(o);
assertEquals(123, o.f1.get(0)[0][0].intValue());
assertTrue(o.f1.get(0)[0][0] instanceof Long);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java
index 445808b91..e8f45ecd3 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java
@@ -109,7 +109,7 @@ public class RoundTripPrimitiveObjectBeansTest extends RoundTripTest {
assertEquals(Character.valueOf('a'), t.poalChar.get(0)[0]);
assertEquals(Short.valueOf((short)1), t.poalShort.get(0)[0]);
assertEquals(Integer.valueOf(1), t.poalInt.get(0)[0]);
- assertEquals(Long.valueOf(1l), t.poalLong.get(0)[0]);
+ assertEquals(Long.valueOf(1L), t.poalLong.get(0)[0]);
assertEquals(Float.valueOf(1f), t.poalFloat.get(0)[0]);
assertEquals(Double.valueOf(1d), t.poalDouble.get(0)[0]);
assertEquals(1, t.poalBigInteger.get(0)[0].intValue());
@@ -132,7 +132,7 @@ public class RoundTripPrimitiveObjectBeansTest extends RoundTripTest {
assertEquals(Character.valueOf('a'), t.polChar.get(0)[0]);
assertEquals(Short.valueOf((short)1), t.polShort.get(0)[0]);
assertEquals(Integer.valueOf(1), t.polInt.get(0)[0]);
- assertEquals(Long.valueOf(1l), t.polLong.get(0)[0]);
+ assertEquals(Long.valueOf(1L), t.polLong.get(0)[0]);
assertEquals(Float.valueOf(1f), t.polFloat.get(0)[0]);
assertEquals(Double.valueOf(1d), t.polDouble.get(0)[0]);
assertEquals(1, t.polBigInteger.get(0)[0].intValue());
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitivesBeansTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitivesBeansTest.java
index d74386f4f..2957d0d5f 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitivesBeansTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitivesBeansTest.java
@@ -47,7 +47,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('a', t.pChar);
assertEquals(2, t.pShort);
assertEquals(3, t.pInt);
- assertEquals(4l, t.pLong);
+ assertEquals(4L, t.pLong);
assertEquals(5f, t.pFloat, 0.1f);
assertEquals(6d, t.pDouble, 0.1f);
@@ -57,7 +57,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals((char)0, t.puChar);
assertEquals(0, t.puShort);
assertEquals(0, t.puInt);
- assertEquals(0l, t.puLong);
+ assertEquals(0L, t.puLong);
assertEquals(0f, t.puFloat, 0.1f);
assertEquals(0d, t.puDouble, 0.1f);
@@ -67,7 +67,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('b', t.paChar[1][0]);
assertEquals(2, t.paShort[1][0]);
assertEquals(2, t.paInt[1][0]);
- assertEquals(2l, t.paLong[1][0]);
+ assertEquals(2L, t.paLong[1][0]);
assertEquals(2f, t.paFloat[1][0], 0.1f);
assertEquals(2d, t.paDouble[1][0], 0.1f);
assertNull(t.paBoolean[2]);
@@ -95,7 +95,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('a', t.palChar.get(0)[0]);
assertEquals(1, t.palShort.get(0)[0]);
assertEquals(1, t.palInt.get(0)[0]);
- assertEquals(1l, t.palLong.get(0)[0]);
+ assertEquals(1L, t.palLong.get(0)[0]);
assertEquals(1f, t.palFloat.get(0)[0], 0.1f);
assertEquals(1d, t.palDouble.get(0)[0], 0.1f);
assertNull(t.palBoolean.get(1));
@@ -113,7 +113,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('a', t.plChar.get(0)[0]);
assertEquals(1, t.plShort.get(0)[0]);
assertEquals(1, t.plInt.get(0)[0]);
- assertEquals(1l, t.plLong.get(0)[0]);
+ assertEquals(1L, t.plLong.get(0)[0]);
assertEquals(1f, t.plFloat.get(0)[0], 0.1f);
assertEquals(1d, t.plDouble.get(0)[0], 0.1f);
assertNull(t.plBoolean.get(1));
@@ -195,7 +195,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
pChar = 'a';
pShort = 2;
pInt = 3;
- pLong = 4l;
+ pLong = 4L;
pFloat = 5f;
pDouble = 6d;
@@ -266,7 +266,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('a', t2.pChar);
assertEquals(2, t2.pShort);
assertEquals(3, t2.pInt);
- assertEquals(4l, t2.pLong);
+ assertEquals(4L, t2.pLong);
assertEquals(5f, t2.pFloat, 0.1f);
assertEquals(6d, t2.pDouble, 0.1f);
@@ -276,7 +276,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals((char)0, t2.puChar);
assertEquals(0, t2.puShort);
assertEquals(0, t2.puInt);
- assertEquals(0l, t2.puLong);
+ assertEquals(0L, t2.puLong);
assertEquals(0f, t2.puFloat, 0.1f);
assertEquals(0d, t2.puDouble, 0.1f);
@@ -286,7 +286,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('b', t2.paChar[1][0]);
assertEquals(2, t2.paShort[1][0]);
assertEquals(2, t2.paInt[1][0]);
- assertEquals(2l, t2.paLong[1][0]);
+ assertEquals(2L, t2.paLong[1][0]);
assertEquals(2f, t2.paFloat[1][0], 0.1f);
assertEquals(2d, t2.paDouble[1][0], 0.1f);
assertNull(t2.paBoolean[2]);
@@ -314,7 +314,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('a', t2.palChar.get(0)[0]);
assertEquals(1, t2.palShort.get(0)[0]);
assertEquals(1, t2.palInt.get(0)[0]);
- assertEquals(1l, t2.palLong.get(0)[0]);
+ assertEquals(1L, t2.palLong.get(0)[0]);
assertEquals(1f, t2.palFloat.get(0)[0], 0.1f);
assertEquals(1d, t2.palDouble.get(0)[0], 0.1f);
assertNull(t2.palBoolean.get(1));
@@ -332,7 +332,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('a', t2.plChar.get(0)[0]);
assertEquals(1, t2.plShort.get(0)[0]);
assertEquals(1, t2.plInt.get(0)[0]);
- assertEquals(1l, t2.plLong.get(0)[0]);
+ assertEquals(1L, t2.plLong.get(0)[0]);
assertEquals(1f, t2.plFloat.get(0)[0], 0.1f);
assertEquals(1d, t2.plDouble.get(0)[0], 0.1f);
assertNull(t2.plBoolean.get(1));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
index 69dd550a3..8bcc63451 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
@@ -295,9 +295,9 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testLong() throws Exception {
- long t = 1l;
+ long t = 1L;
t = roundTrip(t, long.class);
- assertEquals(1l, t);
+ assertEquals(1L, t);
}
//====================================================================================================
@@ -305,9 +305,9 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testLongArray() throws Exception {
- long[] t = {1l};
+ long[] t = {1L};
t = roundTrip(t, long[].class);
- assertEquals(1l, t[0]);
+ assertEquals(1L, t[0]);
}
//====================================================================================================
@@ -315,9 +315,9 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testLong2dArray() throws Exception {
- long[][] t = {{1l},null};
+ long[][] t = {{1L},null};
t = roundTrip(t, long[][].class);
- assertEquals(1l, t[0][0]);
+ assertEquals(1L, t[0][0]);
assertNull(t[1]);
}
@@ -328,7 +328,7 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
public void testShort() throws Exception {
short t = (short)1;
t = roundTrip(t, short.class);
- assertEquals(1l, t);
+ assertEquals(1L, t);
}
//====================================================================================================
@@ -338,7 +338,7 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
public void testShortArray() throws Exception {
short[] t = {(short)1};
t = roundTrip(t, short[].class);
- assertEquals(1l, t[0]);
+ assertEquals(1L, t[0]);
}
//====================================================================================================
@@ -540,9 +540,9 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testLongObject() throws Exception {
- Long t = 1l;
+ Long t = 1L;
t = roundTrip(t, Long.class);
- assertEquals(Long.valueOf(1l), t);
+ assertEquals(Long.valueOf(1L), t);
}
//====================================================================================================
@@ -550,9 +550,9 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testLongObjectArray() throws Exception {
- Long[] t = {1l, null};
+ Long[] t = {1L, null};
t = roundTrip(t, Long[].class);
- assertEquals(Long.valueOf(1l), t[0]);
+ assertEquals(Long.valueOf(1L), t[0]);
assertNull(t[1]);
}
@@ -561,9 +561,9 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testLongObject2dArray() throws Exception {
- Long[][] t = {{1l,null},null};
+ Long[][] t = {{1L,null},null};
t = roundTrip(t, Long[][].class);
- assertEquals(Long.valueOf(1l), t[0][0]);
+ assertEquals(Long.valueOf(1L), t[0][0]);
assertNull(t[0][1]);
assertNull(t[1]);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java b/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
index 919dc36cc..dc54facf9 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
@@ -264,7 +264,7 @@ public class AnyAssertion_Test {
@Test
public void bb17_asLong() throws Exception {
- Long x1 = 1l, nil = null;
+ Long x1 = 1L, nil = null;
Object x2 = "";
test(x1).asLong().isString("1");
test(nil).asLong().isNull();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
index 4478eca91..e8abb99b2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
@@ -49,7 +49,7 @@ public class Assertions_Test {
@Test
public void a03_assertLong() throws Exception {
- assertLong(2l).isGt(1l);
+ assertLong(2L).isGt(1L);
}
@Test
@@ -145,7 +145,7 @@ public class Assertions_Test {
@Test
public void a20b_assertLongArray() throws Exception {
- assertLongArray(new long[]{1l}).asLength().is(1);
+ assertLongArray(new long[]{1L}).asLength().is(1);
}
@Test
diff --git a/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java b/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
index 88a3cb4c3..95ce6717c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
@@ -110,14 +110,14 @@ public class DateAssertion_Test {
@Test
public void bc04a_asEpochMillis() throws Exception {
Date x = MID1, nil = null;
- test(x).asEpochMillis().is(959862896000l);
+ test(x).asEpochMillis().is(959862896000L);
test(nil).asEpochMillis().isNull();
}
@Test
public void bc04b_asEpochSeconds() throws Exception {
Date x = MID1, nil = null;
- test(x).asEpochSeconds().is(959862896l);
+ test(x).asEpochSeconds().is(959862896L);
test(nil).asEpochSeconds().isNull();
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java b/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
index 6e782d22e..73dc2baea 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
@@ -52,14 +52,14 @@ public class LongAssertion_Test {
@Test
public void ba01a_asString() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).asString().is("1");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("1");
test(nil).asString(s).is("null");
@@ -67,33 +67,33 @@ public class LongAssertion_Test {
@Test
public void ba01c_asString_wPredicate() throws Exception {
- Long x1 = 1l;
+ Long x1 = 1L;
test(x1).asString(x -> "foo").is("foo");
}
@Test
public void ba02_asJson() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).asJson().is("1");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() throws Exception {
- Long x1 = 1l, nil = null;
+ Long x1 = 1L, nil = null;
test(x1).asJsonSorted().is("1");
test(nil).asJsonSorted().is("null");
}
@Test
public void ba04_apply() throws Exception {
- Long x1 = 1l, x2 = 2l;
+ Long x1 = 1L, x2 = 2L;
test(x1).asTransformed(x -> x2).is(x2);
}
@Test
public void bc01_asInteger() throws Exception {
- Long x1 = 1l, nil = null;
+ Long x1 = 1L, nil = null;
test(x1).asInteger().is(1);
test(nil).asInteger().isNull();
}
@@ -104,28 +104,28 @@ public class LongAssertion_Test {
@Test
public void ca01_exists() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).isExists().isExists();
assertThrown(()->test(nil).isExists()).asMessage().is("Value was null.");
}
@Test
public void ca02_isNull() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(nil).isNull();
assertThrown(()->test(x).isNull()).asMessage().is("Value was not null.");
}
@Test
public void ca03_isNotNull() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).isNotNull();
assertThrown(()->test(nil).isNotNull()).asMessage().is("Value was null.");
}
@Test
public void ca04a_is_T() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -136,7 +136,7 @@ public class LongAssertion_Test {
@Test
public void ca04b_is_predicate() throws Exception {
- Long x1 = 1l;
+ Long x1 = 1L;
test(x1).is(x->x==1);
assertThrown(()->test(x1).is(x->x==2)).asMessage().asOneLine().is("Unexpected value: '1'.");
assertThrown(()->test(x1).is(ne(x1))).asMessage().asOneLine().is("Value unexpectedly matched. Value='1'.");
@@ -144,7 +144,7 @@ public class LongAssertion_Test {
@Test
public void ca05_isNot() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -154,7 +154,7 @@ public class LongAssertion_Test {
@Test
public void ca06_isAny() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value not found. Expect='[2]'. Actual='1'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value not found. Expect='[]'. Actual='1'.");
@@ -163,7 +163,7 @@ public class LongAssertion_Test {
@Test
public void ca07_isNotAny() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -173,7 +173,7 @@ public class LongAssertion_Test {
@Test
public void ca08_isSame() throws Exception {
- Long x1 = 1000l, x1a = 1000l, nil = null;
+ Long x1 = 1000L, x1a = 1000L, nil = null;
test(x1).isSame(x1);
test(nil).isSame(nil);
assertThrown(()->test(x1).isSame(x1a)).asMessage().asOneLine().isMatches("Not the same value. Expect='1000(Long@*)'. Actual='1000(Long@*)'.");
@@ -183,7 +183,7 @@ public class LongAssertion_Test {
@Test
public void ca09_isSameJsonAs() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected comparison. Expect='2'. Actual='1'.");
@@ -193,7 +193,7 @@ public class LongAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected comparison. Expect='2'. Actual='1'.");
@@ -203,7 +203,7 @@ public class LongAssertion_Test {
@Test
public void ca11_isSameSerializedAs() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -214,7 +214,7 @@ public class LongAssertion_Test {
@Test
public void ca12_isType() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).isType(Long.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected type. Expect='java.lang.String'. Actual='java.lang.Long'.");
@@ -224,7 +224,7 @@ public class LongAssertion_Test {
@Test
public void ca13_isExactType() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).isExactType(Long.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected type. Expect='java.lang.Object'. Actual='java.lang.Long'.");
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected type. Expect='java.lang.String'. Actual='java.lang.Long'.");
@@ -234,7 +234,7 @@ public class LongAssertion_Test {
@Test
public void ca14_isString() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).isString("1");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String differed at position 0. Expect='bad'. Actual='1'.");
@@ -244,7 +244,7 @@ public class LongAssertion_Test {
@Test
public void ca15_isJson() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).isJson("1");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String differed at position 0. Expect='bad'. Actual='1'.");
@@ -254,7 +254,7 @@ public class LongAssertion_Test {
@Test
public void cb01_isGt() throws Exception {
- Long x1 = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x2 = 2L, nil = null;
test(x2).isGt(x1);
assertThrown(()->test(x1).isGt(x1)).asMessage().asOneLine().is("Value was not greater than expected. Expect='1'. Actual='1'.");
assertThrown(()->test(x1).isGt(x2)).asMessage().asOneLine().is("Value was not greater than expected. Expect='2'. Actual='1'.");
@@ -264,7 +264,7 @@ public class LongAssertion_Test {
@Test
public void cb02_isGte() throws Exception {
- Long x1 = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x2 = 2L, nil = null;
test(x2).isGte(x1);
test(x1).isGte(x1);
assertThrown(()->test(x1).isGte(x2)).asMessage().asOneLine().is("Value was not greater than or equals to expected. Expect='2'. Actual='1'.");
@@ -274,7 +274,7 @@ public class LongAssertion_Test {
@Test
public void cb03_isLt() throws Exception {
- Long x1 = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x2 = 2L, nil = null;
test(x1).isLt(x2);
assertThrown(()->test(x1).isLt(x1)).asMessage().asOneLine().is("Value was not less than expected. Expect='1'. Actual='1'.");
assertThrown(()->test(x2).isLt(x1)).asMessage().asOneLine().is("Value was not less than expected. Expect='1'. Actual='2'.");
@@ -284,7 +284,7 @@ public class LongAssertion_Test {
@Test
public void cb04_isLte() throws Exception {
- Long x1 = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x2 = 2L, nil = null;
test(x1).isLte(x2);
test(x1).isLte(x1);
assertThrown(()->test(x2).isLte(x1)).asMessage().asOneLine().is("Value was not less than or equals to expected. Expect='1'. Actual='2'.");
@@ -294,7 +294,7 @@ public class LongAssertion_Test {
@Test
public void cb05_isBetween() throws Exception {
- Long x1 = 1l, x2 = 2l, x3 = 3l, x4 = 4l, nil = null;
+ Long x1 = 1L, x2 = 2L, x3 = 3L, x4 = 4L, nil = null;
test(x1).isBetween(x1, x3);
test(x2).isBetween(x1, x3);
test(x3).isBetween(x1, x3);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
index 534b75e94..e7130c3d2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
@@ -376,13 +376,13 @@ public class ConfigTest {
@Test
public void getLong1() throws Exception {
Config c = init("a1=1", "a2=2", "[S]", "b1=1", "b2=");
- assertLong(c.get("a1").asLong().orElse(0l)).is(1l);
- assertLong(c.get("a2").asLong().orElse(0l)).is(2l);
- assertLong(c.get("a3").asLong().orElse(0l)).is(0l);
- assertLong(c.get("S/b1").asLong().orElse(0l)).is(1l);
- assertLong(c.get("S/b2").asLong().orElse(0l)).is(0l);
- assertLong(c.get("S/b3").asLong().orElse(0l)).is(0l);
- assertLong(c.get("T/c1").asLong().orElse(0l)).is(0l);
+ assertLong(c.get("a1").asLong().orElse(0L)).is(1L);
+ assertLong(c.get("a2").asLong().orElse(0L)).is(2L);
+ assertLong(c.get("a3").asLong().orElse(0L)).is(0L);
+ assertLong(c.get("S/b1").asLong().orElse(0L)).is(1L);
+ assertLong(c.get("S/b2").asLong().orElse(0L)).is(0L);
+ assertLong(c.get("S/b3").asLong().orElse(0L)).is(0L);
+ assertLong(c.get("T/c1").asLong().orElse(0L)).is(0L);
}
@Test
@@ -400,10 +400,10 @@ public class ConfigTest {
@Test
public void getLong2() throws Exception {
Config c = init("a1=1", "a2=2", "[S]", "b1=1", "b2=");
- assertLong(c.get("a1").asLong().orElse(Long.MAX_VALUE)).is(1l);
- assertLong(c.get("a2").asLong().orElse(Long.MAX_VALUE)).is(2l);
+ assertLong(c.get("a1").asLong().orElse(Long.MAX_VALUE)).is(1L);
+ assertLong(c.get("a2").asLong().orElse(Long.MAX_VALUE)).is(2L);
assertLong(c.get("a3").asLong().orElse(Long.MAX_VALUE)).is(Long.MAX_VALUE);
- assertLong(c.get("S/b1").asLong().orElse(Long.MAX_VALUE)).is(1l);
+ assertLong(c.get("S/b1").asLong().orElse(Long.MAX_VALUE)).is(1L);
assertLong(c.get("S/b2").asLong().orElse(Long.MAX_VALUE)).is(Long.MAX_VALUE);
assertLong(c.get("S/b3").asLong().orElse(Long.MAX_VALUE)).is(Long.MAX_VALUE);
assertLong(c.get("T/c1").asLong().orElse(Long.MAX_VALUE)).is(Long.MAX_VALUE);
@@ -413,10 +413,10 @@ public class ConfigTest {
public void getLong2BadValues() throws Exception {
Config c = init("a1=foo", "a2=2.3", "a3=[1]", "a4=false");
- assertThrown(()->c.get("a1").asLong().orElse(-1l)).isType(NumberFormatException.class);
- assertThrown(()->c.get("a2").asLong().orElse(-1l)).isType(NumberFormatException.class);
- assertThrown(()->c.get("a3").asLong().orElse(-1l)).isType(NumberFormatException.class);
- assertThrown(()->c.get("a4").asLong().orElse(-1l)).isType(NumberFormatException.class);
+ assertThrown(()->c.get("a1").asLong().orElse(-1L)).isType(NumberFormatException.class);
+ assertThrown(()->c.get("a2").asLong().orElse(-1L)).isType(NumberFormatException.class);
+ assertThrown(()->c.get("a3").asLong().orElse(-1L)).isType(NumberFormatException.class);
+ assertThrown(()->c.get("a4").asLong().orElse(-1L)).isType(NumberFormatException.class);
}
//====================================================================================================
diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java
index 8c680ac5f..ca77de8cc 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java
@@ -36,7 +36,7 @@ public class HtmlSchemaSerializerTest {
assertEquals("<table><tr><td>type</td><td>integer</td></tr><tr><td>format</td><td>int16</td></tr></table>", s.serialize((short)1));
assertEquals("<table><tr><td>type</td><td>integer</td></tr><tr><td>format</td><td>int32</td></tr></table>", s.serialize(1));
- assertEquals("<table><tr><td>type</td><td>integer</td></tr><tr><td>format</td><td>int64</td></tr></table>", s.serialize(1l));
+ assertEquals("<table><tr><td>type</td><td>integer</td></tr><tr><td>format</td><td>int64</td></tr></table>", s.serialize(1L));
assertEquals("<table><tr><td>type</td><td>number</td></tr><tr><td>format</td><td>float</td></tr></table>", s.serialize(1f));
assertEquals("<table><tr><td>type</td><td>number</td></tr><tr><td>format</td><td>double</td></tr></table>", s.serialize(1d));
assertEquals("<table><tr><td>type</td><td>boolean</td></tr></table>", s.serialize(true));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
index 5ae0de926..3eb1adbd2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
@@ -94,12 +94,12 @@ public class BasicHttpResource_Test {
assertTrue(x.isRepeatable());
x.writeTo(new ByteArrayOutputStream());
- assertLong(stringResource("foo").getContentLength()).is(3l);
- assertLong(byteArrayResource("foo".getBytes()).getContentLength()).is(3l);
- assertLong(fileResource(f).getContentLength()).is(0l);
+ assertLong(stringResource("foo").getContentLength()).is(3L);
+ assertLong(byteArrayResource("foo".getBytes()).getContentLength()).is(3L);
+ assertLong(fileResource(f).getContentLength()).is(0L);
- assertLong(readerResource(reader("foo")).getContentLength()).is(-1l);
- assertLong(readerResource(reader("foo")).setContentLength(3).getContentLength()).is(3l);
+ assertLong(readerResource(reader("foo")).getContentLength()).is(-1L);
+ assertLong(readerResource(reader("foo")).setContentLength(3).getContentLength()).is(3L);
x = stringResource("foo", contentType("text/plain")).setContentEncoding("identity");
assertString(x.getContentType().getValue()).is("text/plain");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
index 8b9c095f8..7323515af 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
@@ -86,7 +86,7 @@ public class SerializedHttpEntity_Test {
@Test
public void a07_getContentLength() throws Exception {
- assertLong(serializedEntity(ABean.get(),null).getContentLength()).is(-1l);
+ assertLong(serializedEntity(ABean.get(),null).getContentLength()).is(-1L);
}
@Test
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
index 1270becf6..8434a373f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
@@ -35,7 +35,7 @@ public class BasicLongHeader_Test {
private static final String HEADER = "Foo";
private static final String VALUE = "123";
- private static final Long PARSED = 123l;
+ private static final Long PARSED = 123L;
@Rest
public static class A {
@@ -72,7 +72,7 @@ public class BasicLongHeader_Test {
@Test
public void a02_assertLong() throws Exception {
- longHeader(HEADER,1l).assertLong().is(1l);
+ longHeader(HEADER,1L).assertLong().is(1L);
}
//------------------------------------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLength_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLength_Test.java
index 8740cc3c2..98d28ce7a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLength_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLength_Test.java
@@ -32,7 +32,7 @@ public class ContentLength_Test {
private static final String HEADER = "Content-Length";
private static final String VALUE = "123";
- private static final Long PARSED = 123l;
+ private static final Long PARSED = 123L;
@Rest
public static class A {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
index 8ce01eb85..3fedad0a6 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
@@ -311,18 +311,18 @@ public class Remote_FormDataAnnotation_Test {
assertEquals("{x:'9'}",x.postX7((short)9));
assertThrown(()->x.postX7((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.postX7((short)10)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.postX8(1l));
- assertEquals("{x:'10'}",x.postX8(10l));
- assertThrown(()->x.postX8(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.postX8(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.postX9(1l));
- assertEquals("{x:'10'}",x.postX9(10l));
- assertThrown(()->x.postX9(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.postX9(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'2'}",x.postX10(2l));
- assertEquals("{x:'9'}",x.postX10(9l));
- assertThrown(()->x.postX10(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.postX10(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.postX8(1L));
+ assertEquals("{x:'10'}",x.postX8(10L));
+ assertThrown(()->x.postX8(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.postX8(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.postX9(1L));
+ assertEquals("{x:'10'}",x.postX9(10L));
+ assertThrown(()->x.postX9(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.postX9(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.postX10(2L));
+ assertEquals("{x:'9'}",x.postX10(9L));
+ assertThrown(()->x.postX10(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.postX10(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{x:'1.0'}",x.postX11(1f));
assertEquals("{x:'10.0'}",x.postX11(10f));
assertThrown(()->x.postX11(0.9f)).asMessages().isContains("Minimum value not met.");
@@ -413,20 +413,20 @@ public class Remote_FormDataAnnotation_Test {
assertThrown(()->x.postX31((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.postX31((short)10)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.postX31(null));
- assertEquals("{x:'1'}",x.postX32(1l));
- assertEquals("{x:'10'}",x.postX32(10l));
- assertThrown(()->x.postX32(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.postX32(11l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.postX32(1L));
+ assertEquals("{x:'10'}",x.postX32(10L));
+ assertThrown(()->x.postX32(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.postX32(11L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.postX32(null));
- assertEquals("{x:'1'}",x.postX33(1l));
- assertEquals("{x:'10'}",x.postX33(10l));
- assertThrown(()->x.postX33(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.postX33(11l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.postX33(1L));
+ assertEquals("{x:'10'}",x.postX33(10L));
+ assertThrown(()->x.postX33(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.postX33(11L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.postX33(null));
- assertEquals("{x:'2'}",x.postX34(2l));
- assertEquals("{x:'9'}",x.postX34(9l));
- assertThrown(()->x.postX34(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.postX34(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.postX34(2L));
+ assertEquals("{x:'9'}",x.postX34(9L));
+ assertThrown(()->x.postX34(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.postX34(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.postX34(null));
assertEquals("{x:'1.0'}",x.postX35(1f));
assertEquals("{x:'10.0'}",x.postX35(10f));
@@ -620,8 +620,8 @@ public class Remote_FormDataAnnotation_Test {
assertThrown(()->x.postX9(5)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4'}",x.postX10((short)4));
assertThrown(()->x.postX10((short)5)).asMessages().isContains("Multiple-of not met.");
- assertEquals("{x:'4'}",x.postX11(4l));
- assertThrown(()->x.postX11(5l)).asMessages().isContains("Multiple-of not met.");
+ assertEquals("{x:'4'}",x.postX11(4L));
+ assertThrown(()->x.postX11(5L)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.postX12(4f));
assertThrown(()->x.postX12(5f)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.postX13(4d));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
index 1f5c6a521..a0f371dfd 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
@@ -268,18 +268,18 @@ public class Remote_HeaderAnnotation_Test {
assertEquals("{x:'9'}",x.getX6((short)9));
assertThrown(()->x.getX6((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.getX6((short)10)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX7(1l));
- assertEquals("{x:'10'}",x.getX7(10l));
- assertThrown(()->x.getX7(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX7(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX8(1l));
- assertEquals("{x:'10'}",x.getX8(10l));
- assertThrown(()->x.getX8(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX8(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'2'}",x.getX9(2l));
- assertEquals("{x:'9'}",x.getX9(9l));
- assertThrown(()->x.getX9(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX9(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX7(1L));
+ assertEquals("{x:'10'}",x.getX7(10L));
+ assertThrown(()->x.getX7(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX7(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX8(1L));
+ assertEquals("{x:'10'}",x.getX8(10L));
+ assertThrown(()->x.getX8(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX8(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.getX9(2L));
+ assertEquals("{x:'9'}",x.getX9(9L));
+ assertThrown(()->x.getX9(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX9(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{x:'1.0'}",x.getX10(1f));
assertEquals("{x:'10.0'}",x.getX10(10f));
assertThrown(()->x.getX10(0.9f)).asMessages().isContains("Minimum value not met.");
@@ -370,20 +370,20 @@ public class Remote_HeaderAnnotation_Test {
assertThrown(()->x.getX30((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.getX30((short)10)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX30(null));
- assertEquals("{x:'1'}",x.getX31(1l));
- assertEquals("{x:'10'}",x.getX31(10l));
- assertThrown(()->x.getX31(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX31(11l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX31(1L));
+ assertEquals("{x:'10'}",x.getX31(10L));
+ assertThrown(()->x.getX31(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX31(11L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX31(null));
- assertEquals("{x:'1'}",x.getX32(1l));
- assertEquals("{x:'10'}",x.getX32(10l));
- assertThrown(()->x.getX32(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX32(11l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX32(1L));
+ assertEquals("{x:'10'}",x.getX32(10L));
+ assertThrown(()->x.getX32(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX32(11L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX32(null));
- assertEquals("{x:'2'}",x.getX33(2l));
- assertEquals("{x:'9'}",x.getX33(9l));
- assertThrown(()->x.getX33(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX33(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.getX33(2L));
+ assertEquals("{x:'9'}",x.getX33(9L));
+ assertThrown(()->x.getX33(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX33(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX33(null));
assertEquals("{x:'1.0'}",x.getX34(1f));
assertEquals("{x:'10.0'}",x.getX34(10f));
@@ -580,8 +580,8 @@ public class Remote_HeaderAnnotation_Test {
assertThrown(()->x.getX9(5)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4'}",x.getX10((short)4));
assertThrown(()->x.getX10((short)5)).asMessages().isContains("Multiple-of not met.");
- assertEquals("{x:'4'}",x.getX11(4l));
- assertThrown(()->x.getX11(5l)).asMessages().isContains("Multiple-of not met.");
+ assertEquals("{x:'4'}",x.getX11(4L));
+ assertThrown(()->x.getX11(5L)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.getX12(4f));
assertThrown(()->x.getX12(5f)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.getX13(4d));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
index cd516de99..2958d1d1f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
@@ -237,18 +237,18 @@ public class Remote_PathAnnotation_Test {
assertEquals("{x:'9'}",x.getX6((short)9));
assertThrown(()->x.getX6((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.getX6((short)10)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX7(1l));
- assertEquals("{x:'10'}",x.getX7(10l));
- assertThrown(()->x.getX7(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX7(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX8(1l));
- assertEquals("{x:'10'}",x.getX8(10l));
- assertThrown(()->x.getX8(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX8(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'2'}",x.getX9(2l));
- assertEquals("{x:'9'}",x.getX9(9l));
- assertThrown(()->x.getX9(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX9(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX7(1L));
+ assertEquals("{x:'10'}",x.getX7(10L));
+ assertThrown(()->x.getX7(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX7(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX8(1L));
+ assertEquals("{x:'10'}",x.getX8(10L));
+ assertThrown(()->x.getX8(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX8(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.getX9(2L));
+ assertEquals("{x:'9'}",x.getX9(9L));
+ assertThrown(()->x.getX9(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX9(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{x:'1.0'}",x.getX10(1f));
assertEquals("{x:'10.0'}",x.getX10(10f));
assertThrown(()->x.getX10(0.9f)).asMessages().isContains("Minimum value not met.");
@@ -333,18 +333,18 @@ public class Remote_PathAnnotation_Test {
assertEquals("{x:'9'}",x.getX30((short)9));
assertThrown(()->x.getX30((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.getX30((short)10)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX31(1l));
- assertEquals("{x:'10'}",x.getX31(10l));
- assertThrown(()->x.getX31(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX31(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX32(1l));
- assertEquals("{x:'10'}",x.getX32(10l));
- assertThrown(()->x.getX32(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX32(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'2'}",x.getX33(2l));
- assertEquals("{x:'9'}",x.getX33(9l));
- assertThrown(()->x.getX33(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX33(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX31(1L));
+ assertEquals("{x:'10'}",x.getX31(10L));
+ assertThrown(()->x.getX31(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX31(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX32(1L));
+ assertEquals("{x:'10'}",x.getX32(10L));
+ assertThrown(()->x.getX32(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX32(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.getX33(2L));
+ assertEquals("{x:'9'}",x.getX33(9L));
+ assertThrown(()->x.getX33(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX33(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{x:'1.0'}",x.getX34(1f));
assertEquals("{x:'10.0'}",x.getX34(10f));
assertThrown(()->x.getX34(0.9f)).asMessages().isContains("Minimum value not met.");
@@ -528,8 +528,8 @@ public class Remote_PathAnnotation_Test {
assertThrown(()->x.getX9(5)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4'}",x.getX10((short)4));
assertThrown(()->x.getX10((short)5)).asMessages().isContains("Multiple-of not met.");
- assertEquals("{x:'4'}",x.getX11(4l));
- assertThrown(()->x.getX11(5l)).asMessages().isContains("Multiple-of not met.");
+ assertEquals("{x:'4'}",x.getX11(4L));
+ assertThrown(()->x.getX11(5L)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.getX12(4f));
assertThrown(()->x.getX12(5f)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.getX13(4d));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
index 2de0a6120..33214c50a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
@@ -293,18 +293,18 @@ public class Remote_QueryAnnotation_Test {
assertEquals("{x:'9'}",x.getX6((short)9));
assertThrown(()->x.getX6((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.getX6((short)10)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX7(1l));
- assertEquals("{x:'10'}",x.getX7(10l));
- assertThrown(()->x.getX7(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX7(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX8(1l));
- assertEquals("{x:'10'}",x.getX8(10l));
- assertThrown(()->x.getX8(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX8(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'2'}",x.getX9(2l));
- assertEquals("{x:'9'}",x.getX9(9l));
- assertThrown(()->x.getX9(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX9(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX7(1L));
+ assertEquals("{x:'10'}",x.getX7(10L));
+ assertThrown(()->x.getX7(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX7(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX8(1L));
+ assertEquals("{x:'10'}",x.getX8(10L));
+ assertThrown(()->x.getX8(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX8(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.getX9(2L));
+ assertEquals("{x:'9'}",x.getX9(9L));
+ assertThrown(()->x.getX9(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX9(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{x:'1.0'}",x.getX10(1f));
assertEquals("{x:'10.0'}",x.getX10(10f));
assertThrown(()->x.getX10(0.9f)).asMessages().isContains("Minimum value not met.");
@@ -395,20 +395,20 @@ public class Remote_QueryAnnotation_Test {
assertThrown(()->x.getX30((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.getX30((short)10)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX30(null));
- assertEquals("{x:'1'}",x.getX31(1l));
- assertEquals("{x:'10'}",x.getX31(10l));
- assertThrown(()->x.getX31(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX31(11l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX31(1L));
+ assertEquals("{x:'10'}",x.getX31(10L));
+ assertThrown(()->x.getX31(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX31(11L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX31(null));
- assertEquals("{x:'1'}",x.getX32(1l));
- assertEquals("{x:'10'}",x.getX32(10l));
- assertThrown(()->x.getX32(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX32(11l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX32(1L));
+ assertEquals("{x:'10'}",x.getX32(10L));
+ assertThrown(()->x.getX32(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX32(11L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX32(null));
- assertEquals("{x:'2'}",x.getX33(2l));
- assertEquals("{x:'9'}",x.getX33(9l));
- assertThrown(()->x.getX33(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX33(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.getX33(2L));
+ assertEquals("{x:'9'}",x.getX33(9L));
+ assertThrown(()->x.getX33(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX33(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX33(null));
assertEquals("{x:'1.0'}",x.getX34(1f));
assertEquals("{x:'10.0'}",x.getX34(10f));
@@ -602,8 +602,8 @@ public class Remote_QueryAnnotation_Test {
assertThrown(()->x.getX9(5)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4'}",x.getX10((short)4));
assertThrown(()->x.getX10((short)5)).asMessages().isContains("Multiple-of not met.");
- assertEquals("{x:'4'}",x.getX11(4l));
- assertThrown(()->x.getX11(5l)).asMessages().isContains("Multiple-of not met.");
+ assertEquals("{x:'4'}",x.getX11(4L));
+ assertThrown(()->x.getX11(5L)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.getX12(4f));
assertThrown(()->x.getX12(5f)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.getX13(4d));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
index 3cb258a8a..1b66f3c06 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
@@ -100,7 +100,7 @@ public class OpenApiPartParser_Test {
@Test
public void a05_inputValidations_minMaxLength() throws Exception {
- HttpPartSchema s = tNone().minLength(1l).maxLength(2l).allowEmptyValue().build();
+ HttpPartSchema s = tNone().minLength(1L).maxLength(2L).allowEmptyValue().build();
assertEquals(null, parse(s, null, String.class));
assertEquals("1", parse(s, "1", String.class));
@@ -108,9 +108,9 @@ public class OpenApiPartParser_Test {
assertThrown(()->parse(s, "", String.class)).asMessage().is("Minimum length of value not met.");
assertThrown(()->parse(s, "123", String.class)).asMessage().is("Maximum length of value exceeded.");
- assertThrown(()->tNone().minLength(2l).maxLength(1l).build()).asMessage().isContains("maxLength cannot be less than minLength.");
- assertThrown(()->tNone().minLength(-2l).build()).asMessage().isContains("minLength cannot be less than zero.");
- assertThrown(()->tNone().maxLength(-2l).build()).asMessage().isContains("maxLength cannot be less than zero.");
+ assertThrown(()->tNone().minLength(2L).maxLength(1L).build()).asMessage().isContains("maxLength cannot be less than minLength.");
+ assertThrown(()->tNone().minLength(-2L).build()).asMessage().isContains("minLength cannot be less than zero.");
+ assertThrown(()->tNone().maxLength(-2L).build()).asMessage().isContains("maxLength cannot be less than zero.");
}
//-----------------------------------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
index 47f62d75f..f53435f9d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
@@ -90,7 +90,7 @@ public class OpenApiPartSerializer_Test {
@Test
public void a05_outputValidations_minMaxLength() throws Exception {
- HttpPartSchema ps = tNone().minLength(1l).maxLength(2l).allowEmptyValue().build();
+ HttpPartSchema ps = tNone().minLength(1L).maxLength(2L).allowEmptyValue().build();
assertEquals("null", serialize(ps, null));
assertEquals("1", serialize(ps, "1"));
@@ -529,7 +529,7 @@ public class OpenApiPartSerializer_Test {
assertEquals("1", serialize(ps, Integer.valueOf(1)));
assertEquals("1", serialize(ps, (short)1));
assertEquals("1", serialize(ps, Short.valueOf((short)1)));
- assertEquals("1", serialize(ps, 1l));
+ assertEquals("1", serialize(ps, 1L));
assertEquals("1", serialize(ps, Long.valueOf(1)));
assertEquals("1", serialize(ps, "1"));
assertEquals("1", serialize(ps, new F1(1)));
@@ -546,9 +546,9 @@ public class OpenApiPartSerializer_Test {
assertEquals("1,2", serialize(ps, new short[]{1,2}));
assertEquals("1,2,null", serialize(ps, new Short[]{1,2,null}));
assertEquals("1,2,null", serialize(ps, list(Short.valueOf((short)1),Short.valueOf((short)2),null)));
- assertEquals("1,2", serialize(ps, new long[]{1l,2l}));
- assertEquals("1,2,null", serialize(ps, new Long[]{1l,2l,null}));
- assertEquals("1,2,null", serialize(ps, list(1l,2l,null)));
+ assertEquals("1,2", serialize(ps, new long[]{1L,2L}));
+ assertEquals("1,2,null", serialize(ps, new Long[]{1L,2L,null}));
+ assertEquals("1,2,null", serialize(ps, list(1L,2L,null)));
assertEquals("1,2,null,null", serialize(ps, new String[]{"1","2","null",null}));
assertEquals("1,2,null,null", serialize(ps, list("1","2","null",null)));
assertEquals("1,2,null", serialize(ps, new Object[]{1,2,null}));
@@ -571,10 +571,10 @@ public class OpenApiPartSerializer_Test {
assertEquals("1,2|3,null|null", serialize(ps, new Short[][]{{1,2},{3,null},null}));
assertEquals("1,2|3,null|null", serialize(ps, list(new Short[]{1,2},new Short[]{3,null},null)));
assertEquals("1,2|3,null|null", serialize(ps, list(list(Short.valueOf((short)1),Short.valueOf((short)2)),list(Short.valueOf((short)3),null),null)));
- assertEquals("1,2|3|null", serialize(ps, new long[][]{{1l,2l},{3l},null}));
- assertEquals("1,2|3|null", serialize(ps, list(new long[]{1l,2l},new long[]{3l},null)));
- assertEquals("1,2|3,null|null", serialize(ps, new Long[][]{{1l,2l},{3l,null},null}));
- assertEquals("1,2|3,null|null", serialize(ps, list(new Long[]{1l,2l},new Long[]{3l,null},null)));
+ assertEquals("1,2|3|null", serialize(ps, new long[][]{{1L,2L},{3L},null}));
+ assertEquals("1,2|3|null", serialize(ps, list(new long[]{1L,2L},new long[]{3L},null)));
+ assertEquals("1,2|3,null|null", serialize(ps, new Long[][]{{1L,2L},{3L,null},null}));
+ assertEquals("1,2|3,null|null", serialize(ps, list(new Long[]{1L,2L},new Long[]{3L,null},null)));
assertEquals("1,2|3,null|null", serialize(ps, list(list(Long.valueOf(1),Long.valueOf(2)),list(Long.valueOf(3),null),null)));
assertEquals("1,2|3,null,null|null", serialize(ps, new String[][]{{"1","2"},{"3","null",null},null}));
assertEquals("1,2|3,null,null|null", serialize(ps, list(new String[]{"1","2"},new String[]{"3","null",null},null)));
@@ -596,10 +596,10 @@ public class OpenApiPartSerializer_Test {
assertEquals("1", serialize(ps, Integer.valueOf(1)));
assertEquals("1", serialize(ps, (short)1));
assertEquals("1", serialize(ps, Short.valueOf((short)1)));
- assertEquals("1", serialize(ps, 1l));
- assertEquals("1", serialize(ps, Long.valueOf(1l)));
+ assertEquals("1", serialize(ps, 1L));
+ assertEquals("1", serialize(ps, Long.valueOf(1L)));
assertEquals("1", serialize(ps, "1"));
- assertEquals("1", serialize(ps, new F3(1l)));
+ assertEquals("1", serialize(ps, new F3(1L)));
assertEquals("null", serialize(ps, null));
assertEquals("null", serialize(ps, "null"));
}
@@ -613,16 +613,16 @@ public class OpenApiPartSerializer_Test {
assertEquals("1,2", serialize(ps, new short[]{1,2}));
assertEquals("1,2,null", serialize(ps, new Short[]{1,2,null}));
assertEquals("1,2,null", serialize(ps, list((short)1,(short)2,null)));
- assertEquals("1,2", serialize(ps, new long[]{1l,2l}));
- assertEquals("1,2,null", serialize(ps, new Long[]{1l,2l,null}));
- assertEquals("1,2,null", serialize(ps, list(1l,2l,null)));
+ assertEquals("1,2", serialize(ps, new long[]{1L,2L}));
+ assertEquals("1,2,null", serialize(ps, new Long[]{1L,2L,null}));
+ assertEquals("1,2,null", serialize(ps, list(1L,2L,null)));
assertEquals("1,2,null,null", serialize(ps, new String[]{"1","2","null",null}));
assertEquals("1,2,null,null", serialize(ps, list("1","2","null",null)));
assertEquals("1,2,null", serialize(ps, new Object[]{1,2,null}));
assertEquals("1,2,null", serialize(ps, list((Object)1,(Object)2,null)));
- assertEquals("1,2,null,null", serialize(ps, new F3[]{new F3(1l),new F3(2l),new F3(null),null}));
- assertEquals("1,2,null,null", serialize(ps, list(new F3(1l),new F3(2l),new F3(null),null)));
- assertEquals("1,2,null", serialize(ps, new F4(1l,2l,null)));
+ assertEquals("1,2,null,null", serialize(ps, new F3[]{new F3(1L),new F3(2L),new F3(null),null}));
+ assertEquals("1,2,null,null", serialize(ps, list(new F3(1L),new F3(2L),new F3(null),null)));
+ assertEquals("1,2,null", serialize(ps, new F4(1L,2L,null)));
}
@Test
@@ -638,22 +638,22 @@ public class OpenApiPartSerializer_Test {
assertEquals("1,2|3,null|null", serialize(ps, new Short[][]{{1,2},{3,null},null}));
assertEquals("1,2|3,null|null", serialize(ps, list(new Short[]{1,2},new Short[]{3,null},null)));
assertEquals("1,2|3,null|null", serialize(ps, list(list((short)1,(short)2),list((short)3,null),null)));
- assertEquals("1,2|3|null", serialize(ps, new long[][]{{1l,2l},{3l},null}));
- assertEquals("1,2|3|null", serialize(ps, list(new long[]{1l,2l},new long[]{3l},null)));
- assertEquals("1,2|3,null|null", serialize(ps, new Long[][]{{1l,2l},{3l,null},null}));
- assertEquals("1,2|3,null|null", serialize(ps, list(new Long[]{1l,2l},new Long[]{3l,null},null)));
- assertEquals("1,2|3,null|null", serialize(ps, list(list(1l,2l),list(3l,null),null)));
+ assertEquals("1,2|3|null", serialize(ps, new long[][]{{1L,2L},{3L},null}));
+ assertEquals("1,2|3|null", serialize(ps, list(new long[]{1L,2L},new long[]{3L},null)));
+ assertEquals("1,2|3,null|null", serialize(ps, new Long[][]{{1L,2L},{3L,null},null}));
+ assertEquals("1,2|3,null|null", serialize(ps, list(new Long[]{1L,2L},new Long[]{3L,null},null)));
+ assertEquals("1,2|3,null|null", serialize(ps, list(list(1L,2L),list(3L,null),null)));
assertEquals("1,2|3,null,null|null", serialize(ps, new String[][]{{"1","2"},{"3","null",null},null}));
assertEquals("1,2|3,null,null|null", serialize(ps, list(new String[]{"1","2"},new String[]{"3","null",null},null)));
assertEquals("1,2|3,null,null|null", serialize(ps, list(list("1","2"),list("3","null",null),null)));
assertEquals("1,2|3,null|null", serialize(ps, new Object[][]{{1,2},{3,null},null}));
assertEquals("1,2|3,null|null", serialize(ps, list(new Object[]{1,2},new Object[]{3,null},null)));
assertEquals("1,2|3,null|null", serialize(ps, list(list((Object)1,(Object)2),list((Object)3,null),null)));
- assertEquals("1,2|3,null,null|null", serialize(ps, new F3[][]{{new F3(1l),new F3(2l)},{new F3(3l),new F3(null),null},null}));
- assertEquals("1,2|3,null,null|null", serialize(ps, list(new F3[]{new F3(1l),new F3(2l)},new F3[]{new F3(3l),new F3(null),null},null)));
- assertEquals("1,2|3,null,null|null", serialize(ps, list(list(new F3(1l),new F3(2l)),list(new F3(3l),new F3(null),null),null)));
- assertEquals("1,2|3,null|null", serialize(ps, new F4[]{new F4(1l,2l),new F4(3l,null),null}));
- assertEquals("1,2|3,null|null", serialize(ps, list(new F4(1l,2l),new F4(3l,null),null)));
+ assertEquals("1,2|3,null,null|null", serialize(ps, new F3[][]{{new F3(1L),new F3(2L)},{new F3(3L),new F3(null),null},null}));
+ assertEquals("1,2|3,null,null|null", serialize(ps, list(new F3[]{new F3(1L),new F3(2L)},new F3[]{new F3(3L),new F3(null),null},null)));
+ assertEquals("1,2|3,null,null|null", serialize(ps, list(list(new F3(1L),new F3(2L)),list(new F3(3L),new F3(null),null),null)));
+ assertEquals("1,2|3,null|null", serialize(ps, new F4[]{new F4(1L,2L),new F4(3L,null),null}));
+ assertEquals("1,2|3,null|null", serialize(ps, list(new F4(1L,2L),new F4(3L,null),null)));
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java b/juneau-utest/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java
index 5146fe208..f344c45f6 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java
@@ -34,7 +34,7 @@ public class JsonSchemaSerializerTest {
assertEquals("{type:'integer',format:'int16'}", s.serialize((short)1));
assertEquals("{type:'integer',format:'int32'}", s.serialize(1));
- assertEquals("{type:'integer',format:'int64'}", s.serialize(1l));
+ assertEquals("{type:'integer',format:'int64'}", s.serialize(1L));
assertEquals("{type:'number',format:'float'}", s.serialize(1f));
assertEquals("{type:'number',format:'double'}", s.serialize(1d));
assertEquals("{type:'boolean'}", s.serialize(true));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
index 2a4ca01f7..d6a871c6c 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
@@ -884,8 +884,8 @@ public class JsonSchemaGeneratorTest {
.example(Short.class, (short)3)
.example(int.class, 4)
.example(Integer.class, 5)
- .example(long.class, 6l)
- .example(Long.class, 7l)
+ .example(long.class, 6L)
+ .example(Long.class, 7L)
.example(float.class, 8f)
.example(Float.class, 9f)
.example(double.class, 10d)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java b/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
index 58414a257..da972640f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
@@ -165,7 +165,7 @@ public class MethodExecStore_Test {
MethodExecStore store = MethodExecStore.create().thrownStore(s).build();
MethodExecStats stats = store.getStats(m);
- assertLong(stats.getGuid()).isNot(0l);
+ assertLong(stats.getGuid()).isNot(0L);
assertObject(stats.getMethod()).isSame(m);
assertInteger(stats.getRuns()).is(0);
@@ -174,7 +174,7 @@ public class MethodExecStore_Test {
assertInteger(stats.getMinTime()).is(0);
assertInteger(stats.getMaxTime()).is(0);
assertInteger(stats.getAvgTime()).is(0);
- assertLong(stats.getTotalTime()).is(0l);
+ assertLong(stats.getTotalTime()).is(0L);
stats.started().finished(100*1000000).started().finished(200*1000000).started().error(new Throwable());
@@ -184,7 +184,7 @@ public class MethodExecStore_Test {
assertInteger(stats.getMinTime()).is(100);
assertInteger(stats.getMaxTime()).is(200);
assertInteger(stats.getAvgTime()).is(150);
- assertLong(stats.getTotalTime()).is(300l);
+ assertLong(stats.getTotalTime()).is(300L);
assertObject(stats).asString().isContains("300");
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
index 11a1e1e46..c27960128 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
@@ -285,28 +285,28 @@ public class ThrownStore_Test {
ThrownStore store = ThrownStore.create().build();
ThrownStats stats = store.add(t2);
- assertLong(stats.getHash()).isNot(0l);
- assertLong(stats.getGuid()).isNot(0l);
- assertLong(stats.getFirstOccurrence()).isNot(0l);
- assertLong(stats.getLastOccurrence()).isNot(0l);
+ assertLong(stats.getHash()).isNot(0L);
+ assertLong(stats.getGuid()).isNot(0L);
+ assertLong(stats.getFirstOccurrence()).isNot(0L);
+ assertLong(stats.getLastOccurrence()).isNot(0L);
assertString(stats.getFirstMessage()).is("bar");
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
assertObject(stats).asString().isContains("bar");
stats = stats.clone();
- assertLong(stats.getHash()).isNot(0l);
- assertLong(stats.getGuid()).isNot(0l);
- assertLong(stats.getFirstOccurrence()).isNot(0l);
- assertLong(stats.getLastOccurrence()).isNot(0l);
+ assertLong(stats.getHash()).isNot(0L);
+ assertLong(stats.getGuid()).isNot(0L);
+ assertLong(stats.getFirstOccurrence()).isNot(0L);
+ assertLong(stats.getLastOccurrence()).isNot(0L);
assertString(stats.getFirstMessage()).is("bar");
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
assertObject(stats).asString().isContains("bar");
stats = stats.getCausedBy().get();
- assertLong(stats.getHash()).isNot(0l);
- assertLong(stats.getGuid()).isNot(0l);
- assertLong(stats.getFirstOccurrence()).isNot(0l);
- assertLong(stats.getLastOccurrence()).isNot(0l);
+ assertLong(stats.getHash()).isNot(0L);
+ assertLong(stats.getGuid()).isNot(0L);
+ assertLong(stats.getFirstOccurrence()).isNot(0L);
+ assertLong(stats.getLastOccurrence()).isNot(0L);
assertString(stats.getFirstMessage()).is("foo");
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
assertObject(stats).asString().isContains("foo");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java b/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
index 118214692..7aec23d8f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
@@ -519,7 +519,7 @@ public class OpenApiTest {
@Test
public void d06_typeInteger_formatInt64_Long() throws Exception {
- Long in = 123l;
+ Long in = 123L;
HttpPartSchema ps = T_INT64;
String s = serialize(ps, in);
assertEquals("123", s);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
index f36c87d08..8f4d3ce54 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
@@ -337,7 +337,7 @@ public class ObjectRest_Test {
assertNull(model.get("f1"));
assertEquals(0, model.get("f2"));
- assertEquals(0l, model.get("f3"));
+ assertEquals(0L, model.get("f3"));
assertFalse((Boolean)model.get("f4"));
assertNull(model.get("f2a"));
assertNull(model.get("f3a"));
@@ -349,7 +349,7 @@ public class ObjectRest_Test {
assertEquals("foo", model.getWithDefault("f1", "foo"));
assertEquals(0, model.getWithDefault("f2", "foo"));
- assertEquals(0l, model.getWithDefault("f3", "foo"));
+ assertEquals(0L, model.getWithDefault("f3", "foo"));
assertEquals(false, model.getWithDefault("f4", "foo"));
assertEquals("foo", model.getWithDefault("f2a", "foo"));
assertEquals("foo", model.getWithDefault("f3a", "foo"));
@@ -419,17 +419,17 @@ public class ObjectRest_Test {
assertNull(model.getLong("f7"));
assertNull(model.getLong("f8"));
- assertEquals(1, (long)model.getLong("f1", 1l));
- assertEquals(0, (long)model.getLong("f2", 1l));
- assertEquals(0, (long)model.getLong("f3", 1l));
- assertEquals(0, (long)model.getLong("f4", 1l));
- assertEquals(1, (long)model.getLong("f2a", 1l));
- assertEquals(1, (long)model.getLong("f3a", 1l));
- assertEquals(1, (long)model.getLong("f4a", 1l));
- assertEquals(1, (long)model.getLong("f5", 1l));
- assertEquals(1, (long)model.getLong("f6", 1l));
- assertEquals(1, (long)model.getLong("f7", 1l));
- assertEquals(1, (long)model.getLong("f8", 1l));
+ assertEquals(1, (long)model.getLong("f1", 1L));
+ assertEquals(0, (long)model.getLong("f2", 1L));
+ assertEquals(0, (long)model.getLong("f3", 1L));
+ assertEquals(0, (long)model.getLong("f4", 1L));
+ assertEquals(1, (long)model.getLong("f2a", 1L));
+ assertEquals(1, (long)model.getLong("f3a", 1L));
+ assertEquals(1, (long)model.getLong("f4a", 1L));
+ assertEquals(1, (long)model.getLong("f5", 1L));
+ assertEquals(1, (long)model.getLong("f6", 1L));
+ assertEquals(1, (long)model.getLong("f7", 1L));
+ assertEquals(1, (long)model.getLong("f8", 1L));
assertNull(model.getBoolean("f1"));
assertEquals(false, model.getBoolean("f2"));
@@ -637,17 +637,17 @@ public class ObjectRest_Test {
assertThrown(()->model.getLong("f7")).isType(InvalidDataConversionException.class);
assertThrown(()->model.getInt("f8")).isType(InvalidDataConversionException.class);
- assertEquals(1, (long)model.getLong("f1", 9l));
- assertEquals(2, (long)model.getLong("f2", 9l));
- assertEquals(3, (long)model.getLong("f3", 9l));
- assertEquals(1, (long)model.getLong("f4", 9l));
- assertEquals(2, (long)model.getLong("f2a", 9l));
- assertEquals(3, (long)model.getLong("f3a", 9l));
- assertEquals(1, (long)model.getLong("f4a", 9l));
- assertThrown(()->model.getLong("f5", 9l)).isType(InvalidDataConversionException.class);
- assertThrown(()->model.getLong("f6", 9l)).isType(InvalidDataConversionException.class);
- assertThrown(()->model.getLong("f7", 9l)).isType(InvalidDataConversionException.class);
- assertThrown(()->model.getLong("f8", 9l)).isType(InvalidDataConversionException.class);
+ assertEquals(1, (long)model.getLong("f1", 9L));
+ assertEquals(2, (long)model.getLong("f2", 9L));
+ assertEquals(3, (long)model.getLong("f3", 9L));
+ assertEquals(1, (long)model.getLong("f4", 9L));
+ assertEquals(2, (long)model.getLong("f2a", 9L));
+ assertEquals(3, (long)model.getLong("f3a", 9L));
+ assertEquals(1, (long)model.getLong("f4a", 9L));
+ assertThrown(()->model.getLong("f5", 9L)).isType(InvalidDataConversionException.class);
+ assertThrown(()->model.getLong("f6", 9L)).isType(InvalidDataConversionException.class);
+ assertThrown(()->model.getLong("f7", 9L)).isType(InvalidDataConversionException.class);
+ assertThrown(()->model.getLong("f8", 9L)).isType(InvalidDataConversionException.class);
assertEquals(false, model.getBoolean("f1")); // String "1" equates to false.
assertEquals(true, model.getBoolean("f2"));
@@ -786,10 +786,10 @@ public class ObjectRest_Test {
public A init() {
f1 = "1";
f2 = 2;
- f3 = 3l;
+ f3 = 3L;
f4 = true;
f2a = 2;
- f3a = 3l;
+ f3a = 3L;
f4a = true;
try {
f5 = JsonMap.ofJson("{f5a:'a'}");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
index 76fcb12fd..82161c56d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
@@ -1233,7 +1233,7 @@ public class ClassInfoTest {
static List<Class<?>> primitives = list(boolean.class,byte.class,short.class,char.class,int.class,long.class,float.class,double.class);
static List<Class<?>> primitiveWrappers = list(Boolean.class,Byte.class,Short.class,Character.class,Integer.class,Long.class,Float.class,Double.class);
- static List<Object> primitiveDefaults = list(false,(byte)0,(short)0,(char)0,0,0l,0f,0d);
+ static List<Object> primitiveDefaults = list(false,(byte)0,(short)0,(char)0,0,0L,0f,0d);
@Test
public void hasPrimitiveWrapper() {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
index 247ca66b5..1ffed1926 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
@@ -167,7 +167,7 @@ public class RestClient_Headers_Test {
checkClient("Cache-Control").headers(new CacheControl("none")).header("X-Expect","none").build().get("/headers").run().assertContent("['none']");
checkClient("Client-Version").headers(new ClientVersion("1")).build().get("/headers").run().assertContent("['1']");
checkClient("Connection").headers(new Connection("foo")).build().get("/headers").run().assertContent("['foo']");
- checkClient("Content-Length").headers(new ContentLength(123l)).build().get("/headers").run().assertContent("['123']");
+ checkClient("Content-Length").headers(new ContentLength(123L)).build().get("/headers").run().assertContent("['123']");
checkClient("Content-Type").headers(new ContentType("foo")).build().get("/headers").run().assertContent("['foo']");
checkClient("Date").headers(new org.apache.juneau.http.header.Date(PARSEDZONEDDATETIME)).build().get("/headers").run().assertContent("['"+PARSEDZONEDDATETIME+"']");
checkClient("Date").headers(new org.apache.juneau.http.header.Date(ZONEDDATETIME)).build().get("/headers").run().assertContent("['"+PARSEDZONEDDATETIME+"']");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
index e55642be1..91e0c71f8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
@@ -275,10 +275,10 @@ public class RestClient_Response_Body_Test {
ResponseContent x2 = testClient().entity(inputStreamEntity("foo")).get().run().getContent();
assertFalse(x2.isRepeatable());
- assertLong(x2.getContentLength()).is(-1l);
+ assertLong(x2.getContentLength()).is(-1L);
x2.cache().asString();
assertTrue(x2.isRepeatable());
- assertLong(x2.getContentLength()).is(3l);
+ assertLong(x2.getContentLength()).is(3L);
assertFalse(x2.isChunked());
@@ -310,7 +310,7 @@ public class RestClient_Response_Body_Test {
public void b02_head() throws Exception {
assertFalse(client().build().head("").run().getContent().isRepeatable());
assertFalse(client().build().head("").run().getContent().isChunked());
- assertLong(client().build().head("").run().getContent().getContentLength()).is(-1l);
+ assertLong(client().build().head("").run().getContent().getContentLength()).is(-1L);
client().build().head("").run().getContent().getContentType().assertValue().isNull();
client().build().head("").run().getContent().getContentEncoding().assertValue().isNull();
client().build().head("").run().getContent().writeTo(new ByteArrayOutputStream());
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
index 0183a9544..1da02fe9b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
@@ -167,7 +167,7 @@ public class RestClient_Response_Headers_Test {
checkFooClient().build().get("/echo").header("Foo","bar").run().getHeader("Bar").assertValue().isNull();
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Foo").assertValue().asInteger().is(123);
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Bar").assertValue().isNull();
- checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Foo").assertValue().asLong().is(123l);
+ checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Foo").assertValue().asLong().is(123L);
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Bar").assertValue().asLong().isNull();
checkFooClient().build().get("/echo").header(dateHeader("Foo",ZONEDDATETIME)).run().getHeader("Foo").assertValue().asZonedDateTime().isExists();
checkFooClient().build().get("/echo").header(dateHeader("Foo",ZONEDDATETIME)).run().getHeader("Bar").assertValue().asZonedDateTime().isNull();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
index e5f75b73c..d55d85f8f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
@@ -148,7 +148,7 @@ public class RestClient_Response_Test {
@Test
public void c03_response_headerAssertions() throws Exception {
checkFooClient(C.class).build().get().json().header("Foo","123").run().assertHeader("Foo").asInteger().is(123);
- checkFooClient(C.class).build().get().json().header("Foo","123").run().assertHeader("Foo").asLong().is(123l);
+ checkFooClient(C.class).build().get().json().header("Foo","123").run().assertHeader("Foo").asLong().is(123L);
checkFooClient(C.class).build().get().json().header(dateHeader("Foo",ZONEDDATETIME)).run().assertHeader("Foo").asZonedDateTime().is(ZONEDDATETIME);
checkClient(C.class,"Content-Type").build().get().json().header("Content-Type","application/json;charset=iso-8859-1").run().assertCharset().is("iso-8859-1");
checkClient(C.class,"Content-Type").build().get().json().header("Content-Type","application/json;charset=iso-8859-1").run().assertHeader("Content-Type").is("application/json;charset=iso-8859-1");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/transform/AutoNumberSwapTest.java b/juneau-utest/src/test/java/org/apache/juneau/transform/AutoNumberSwapTest.java
index 266ea4c22..1fe1ef48f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/transform/AutoNumberSwapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/transform/AutoNumberSwapTest.java
@@ -63,12 +63,12 @@ public class AutoNumberSwapTest {
}
public static class A04 {
public Long toLong() {
- return 1l;
+ return 1L;
}
}
public static class A05 {
public long toLong() {
- return 1l;
+ return 1L;
}
}
public static class A06 {
@@ -222,7 +222,7 @@ public class AutoNumberSwapTest {
}
public static class B03 {
public Long toLong() {
- return 1l;
+ return 1L;
}
public static B03 fromLong(Long o) {
assertObject(o).asJson().is("1");
@@ -437,7 +437,7 @@ public class AutoNumberSwapTest {
assertObject(o).asJson().is("1");
}
public Long toLong() {
- return 1l;
+ return 1L;
}
}
public static class C04 {
@@ -446,7 +446,7 @@ public class AutoNumberSwapTest {
assertObject((Object) o).asJson().is("1");
}
public long toLong() {
- return 1l;
+ return 1L;
}
}
public static class C05 {