You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2019/04/01 00:45:54 UTC
[juneau] branch master updated: New org.apache.juneau.reflect
package.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 12ee318 New org.apache.juneau.reflect package.
12ee318 is described below
commit 12ee3186ecf345a8ed80eaab5abc37cc8b2b302a
Author: JamesBognar <ja...@apache.org>
AuthorDate: Sun Mar 31 20:45:32 2019 -0400
New org.apache.juneau.reflect package.
---
.../juneau/httppart/HttpPartSchemaTest_Body.java | 2 +-
.../httppart/HttpPartSchemaTest_FormData.java | 2 +-
.../juneau/httppart/HttpPartSchemaTest_Header.java | 2 +-
.../juneau/httppart/HttpPartSchemaTest_Path.java | 2 +-
.../juneau/httppart/HttpPartSchemaTest_Query.java | 2 +-
.../HttpPartSchemaTest_ResponseHeader.java | 2 +-
.../apache/juneau/reflection/ClassInfoTest.java | 35 +++++++++++-----------
.../juneau/reflection/ConstructorInfoTest.java | 3 +-
.../apache/juneau/reflection/ExecutorInfoTest.java | 1 +
.../apache/juneau/reflection/MethodInfoTest.java | 1 +
.../java/org/apache/juneau/jena/RdfClassMeta.java | 2 +-
.../main/java/org/apache/juneau/BeanContext.java | 2 +-
.../src/main/java/org/apache/juneau/BeanMap.java | 2 +-
.../src/main/java/org/apache/juneau/BeanMeta.java | 4 +--
.../java/org/apache/juneau/BeanPropertyMeta.java | 2 +-
.../apache/juneau/BeanProxyInvocationHandler.java | 2 +-
.../main/java/org/apache/juneau/BeanRegistry.java | 2 +-
.../main/java/org/apache/juneau/BeanSession.java | 2 +-
.../src/main/java/org/apache/juneau/ClassMeta.java | 4 +--
.../main/java/org/apache/juneau/ContextCache.java | 2 +-
.../juneau/FormattedIllegalArgumentException.java | 2 +-
.../juneau/InvalidDataConversionException.java | 2 +-
.../annotation/InvalidAnnotationException.java | 2 +-
.../org/apache/juneau/httppart/HttpPartSchema.java | 2 +-
.../juneau/httppart/HttpPartSchemaBuilder.java | 2 +-
.../juneau/httppart/bean/RequestBeanMeta.java | 2 +-
.../httppart/bean/RequestBeanPropertyMeta.java | 2 +-
.../juneau/httppart/bean/ResponseBeanMeta.java | 2 +-
.../httppart/bean/ResponseBeanPropertyMeta.java | 2 +-
.../org/apache/juneau/httppart/bean/Utils.java | 2 +-
.../org/apache/juneau/internal/ClassUtils.java | 2 +-
.../java/org/apache/juneau/internal/HttpUtils.java | 2 +-
.../org/apache/juneau/internal/TransformCache.java | 6 ++--
.../{reflection => reflect}/AnnotationInfo.java | 2 +-
.../juneau/{reflection => reflect}/ClassInfo.java | 12 ++++----
.../{reflection => reflect}/ConstructorInfo.java | 2 +-
.../{reflection => reflect}/ExecutableInfo.java | 18 +++++------
.../juneau/{reflection => reflect}/FieldInfo.java | 14 ++++-----
.../juneau/{reflection => reflect}/MethodInfo.java | 2 +-
.../{reflection => reflect}/MethodParamInfo.java | 2 +-
.../ClassFlags.java => reflect/ReflectFlags.java} | 12 ++++----
.../{reflection => reflect}/package-info.java | 2 +-
.../apache/juneau/remote/RemoteInterfaceMeta.java | 2 +-
.../juneau/serializer/SerializerSession.java | 2 +-
.../org/apache/juneau/transform/BuilderSwap.java | 2 +-
.../java/org/apache/juneau/transform/PojoSwap.java | 2 +-
.../org/apache/juneau/transform/SurrogateSwap.java | 2 +-
.../org/apache/juneau/utils/PojoIntrospector.java | 2 +-
.../java/org/apache/juneau/xml/XmlClassMeta.java | 2 +-
.../org/apache/juneau/svl/VarResolverContext.java | 2 +-
.../microservice/jetty/JettyMicroservice.java | 2 +-
.../org/apache/juneau/rest/client/RestCall.java | 2 +-
.../juneau/rest/client/RestCallException.java | 2 +-
.../juneau/rest/client/remote/RemoteMethodArg.java | 2 +-
.../rest/client/remote/RemoteMethodMeta.java | 2 +-
.../rest/client/remote/RemoteMethodReturn.java | 2 +-
.../rest/client/remote/RemoteResourceMeta.java | 2 +-
.../apache/juneau/rest/BasicRestInfoProvider.java | 2 +-
.../apache/juneau/rest/ClientVersionMatcher.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 2 +-
.../org/apache/juneau/rest/RestContextBuilder.java | 2 +-
.../org/apache/juneau/rest/RestJavaMethod.java | 2 +-
.../org/apache/juneau/rest/RestMethodParam.java | 2 +-
.../org/apache/juneau/rest/RestParamDefaults.java | 2 +-
.../java/org/apache/juneau/rest/RestServlet.java | 2 +-
.../org/apache/juneau/rest/SwaggerGenerator.java | 2 +-
66 files changed, 112 insertions(+), 108 deletions(-)
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Body.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Body.java
index 4698fb9..50857fa 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Body.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Body.java
@@ -23,7 +23,7 @@ import org.apache.juneau.http.annotation.*;
import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.jsonschema.annotation.Schema;
import org.apache.juneau.jsonschema.annotation.SubItems;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.utils.*;
import org.junit.*;
import org.junit.runners.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_FormData.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_FormData.java
index 411ee85..393e5ff 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_FormData.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_FormData.java
@@ -22,7 +22,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.jsonschema.annotation.SubItems;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.utils.*;
import org.junit.*;
import org.junit.runners.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Header.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Header.java
index 1d22668..c5a4bbc 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Header.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Header.java
@@ -22,7 +22,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.jsonschema.annotation.SubItems;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.utils.*;
import org.junit.*;
import org.junit.runners.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Path.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Path.java
index 9283c27..82dfeed 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Path.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Path.java
@@ -22,7 +22,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.jsonschema.annotation.SubItems;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.utils.*;
import org.junit.*;
import org.junit.runners.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Query.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Query.java
index c5f65fa..41d1cef 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Query.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_Query.java
@@ -22,7 +22,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.jsonschema.annotation.SubItems;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.utils.*;
import org.junit.*;
import org.junit.runners.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_ResponseHeader.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_ResponseHeader.java
index 39e8ef3..2840075 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_ResponseHeader.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/httppart/HttpPartSchemaTest_ResponseHeader.java
@@ -22,7 +22,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.jsonschema.annotation.SubItems;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.utils.*;
import org.junit.*;
import org.junit.runners.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
index 368cd6b..7082eff 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
@@ -14,9 +14,9 @@ package org.apache.juneau.reflection;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.reflection.ClassInfo.*;
+import static org.apache.juneau.reflect.ClassInfo.*;
+import static org.apache.juneau.reflect.ReflectFlags.*;
import static org.junit.Assert.*;
-import static org.apache.juneau.reflection.ClassFlags.*;
import java.io.*;
import java.lang.annotation.*;
@@ -26,6 +26,7 @@ import java.util.function.*;
import java.util.stream.*;
import org.apache.juneau.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.utils.*;
import org.junit.*;
@@ -1168,16 +1169,16 @@ public class ClassInfoTest {
@Test
public void isAll() {
- assertTrue(h2a.isAll(DEPRECATED, PUBLIC, STATIC, MEMBER, ABSTRACT, ClassFlags.CLASS));
+ assertTrue(h2a.isAll(DEPRECATED, PUBLIC, STATIC, MEMBER, ABSTRACT, ReflectFlags.CLASS));
assertTrue(h2b.isAll(NOT_DEPRECATED, NOT_PUBLIC, STATIC, ABSTRACT, INTERFACE));
}
@Test
public void isAll_onType() {
- assertTrue(aTypeInfo.isAll(PUBLIC, MEMBER, ClassFlags.CLASS));
- assertFalse(pTypeInfo.isAll(PUBLIC, MEMBER, ClassFlags.CLASS));
- assertFalse(pTypeDimensionalInfo.isAll(PUBLIC, MEMBER, ClassFlags.CLASS));
- assertFalse(pTypeGenericInfo.isAll(PUBLIC, MEMBER, ClassFlags.CLASS));
+ assertTrue(aTypeInfo.isAll(PUBLIC, MEMBER, ReflectFlags.CLASS));
+ assertFalse(pTypeInfo.isAll(PUBLIC, MEMBER, ReflectFlags.CLASS));
+ assertFalse(pTypeDimensionalInfo.isAll(PUBLIC, MEMBER, ReflectFlags.CLASS));
+ assertFalse(pTypeGenericInfo.isAll(PUBLIC, MEMBER, ReflectFlags.CLASS));
}
@Test
@@ -1252,19 +1253,19 @@ public class ClassInfoTest {
@Test
public void isAll_class() {
- assertFalse(aInterface.isAll(ClassFlags.CLASS));
- assertTrue(aClass.isAll(ClassFlags.CLASS));
+ assertFalse(aInterface.isAll(ReflectFlags.CLASS));
+ assertTrue(aClass.isAll(ReflectFlags.CLASS));
}
@Test
public void isAll_invalid() {
ClassInfo a = aClass;
try {
- a.isAll(HAS_ARGS);
+ a.isAll(HAS_PARAMS);
fail("Expected exception.");
} catch (Exception e) {}
try {
- a.isAll(HAS_NO_ARGS);
+ a.isAll(HAS_NO_PARAMS);
fail("Expected exception.");
} catch (Exception e) {}
try {
@@ -1284,7 +1285,7 @@ public class ClassInfoTest {
assertTrue(h2a.isAny(STATIC));
assertTrue(h2a.isAny(MEMBER));
assertTrue(h2a.isAny(ABSTRACT));
- assertTrue(h2a.isAny(ClassFlags.CLASS));
+ assertTrue(h2a.isAny(ReflectFlags.CLASS));
assertTrue(h2b.isAny(NOT_DEPRECATED));
assertTrue(h2b.isAny(NOT_PUBLIC));
assertTrue(h2b.isAny(STATIC));
@@ -1294,7 +1295,7 @@ public class ClassInfoTest {
@Test
public void isAny_onType() {
- assertFalse(aTypeInfo.isAny(new ClassFlags[0]));
+ assertFalse(aTypeInfo.isAny(new ReflectFlags[0]));
}
@Test
@@ -1369,19 +1370,19 @@ public class ClassInfoTest {
@Test
public void isAny_class() {
- assertFalse(aInterface.isAny(ClassFlags.CLASS));
- assertTrue(aClass.isAny(ClassFlags.CLASS));
+ assertFalse(aInterface.isAny(ReflectFlags.CLASS));
+ assertTrue(aClass.isAny(ReflectFlags.CLASS));
}
@Test
public void isAny_invalid() {
ClassInfo a = aClass;
try {
- a.isAny(HAS_ARGS);
+ a.isAny(HAS_PARAMS);
fail("Expected exception.");
} catch (Exception e) {}
try {
- a.isAny(HAS_NO_ARGS);
+ a.isAny(HAS_NO_PARAMS);
fail("Expected exception.");
} catch (Exception e) {}
try {
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ConstructorInfoTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ConstructorInfoTest.java
index 592d6b4..32ac2cd 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ConstructorInfoTest.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ConstructorInfoTest.java
@@ -12,14 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.reflection;
+import static org.apache.juneau.reflect.ConstructorInfo.*;
import static org.junit.Assert.*;
-import static org.apache.juneau.reflection.ConstructorInfo.*;
import java.lang.reflect.*;
import java.util.*;
import java.util.function.*;
import java.util.stream.*;
+import org.apache.juneau.reflect.*;
import org.junit.*;
public class ConstructorInfoTest {
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ExecutorInfoTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ExecutorInfoTest.java
index 76c43a1..b859b51 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ExecutorInfoTest.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ExecutorInfoTest.java
@@ -16,6 +16,7 @@ import static org.junit.Assert.*;
import java.util.*;
+import org.apache.juneau.reflect.*;
import org.junit.*;
public class ExecutorInfoTest {
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
index 45be5db..081113d 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
import java.lang.annotation.*;
import org.apache.juneau.*;
+import org.apache.juneau.reflect.*;
import org.junit.*;
public class MethodInfoTest {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java
index c979e08..9474a96 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java
@@ -16,7 +16,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.xml.*;
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index fb8f469..28cd7e5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -26,7 +26,7 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.http.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.transform.*;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
index 9a6da30..13cce3b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
@@ -21,7 +21,7 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.transform.*;
import org.apache.juneau.xml.annotation.*;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index aee78ad..a7e70a9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -15,7 +15,7 @@ package org.apache.juneau;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
-import static org.apache.juneau.reflection.ClassFlags.*;
+import static org.apache.juneau.reflect.ReflectFlags.*;
import static org.apache.juneau.BeanMeta.MethodType.*;
import java.beans.BeanInfo;
@@ -26,7 +26,7 @@ import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.transform.*;
import org.apache.juneau.utils.*;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index a6afae1..e20d12d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -26,7 +26,7 @@ import java.util.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.transform.*;
import org.apache.juneau.transforms.*;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java
index ccb4f98..e2e5157 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java
@@ -16,7 +16,7 @@ import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Provides an {@link InvocationHandler} for creating beans from bean interfaces.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
index f0946c2..bd161af 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
@@ -20,7 +20,7 @@ import java.util.*;
import java.util.concurrent.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* A lookup table for resolving bean types by name.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index aba4e75..baaa697 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -26,7 +26,7 @@ import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.transform.*;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 69fb31a..20db2af 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -14,7 +14,7 @@ package org.apache.juneau;
import static org.apache.juneau.ClassMeta.ClassCategory.*;
import static org.apache.juneau.internal.ClassUtils.*;
-import static org.apache.juneau.reflection.ClassFlags.*;
+import static org.apache.juneau.reflect.ReflectFlags.*;
import java.io.*;
import java.lang.annotation.*;
@@ -32,7 +32,7 @@ import org.apache.juneau.http.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.transform.*;
import org.apache.juneau.utils.*;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextCache.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextCache.java
index 762d157..a78a133 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextCache.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextCache.java
@@ -16,7 +16,7 @@ import static org.apache.juneau.internal.ClassUtils.*;
import java.util.*;
import java.util.concurrent.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Stores a cache of {@link Context} instances mapped by the property stores used to create them.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/FormattedIllegalArgumentException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/FormattedIllegalArgumentException.java
index 89747bf..21dcb94 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/FormattedIllegalArgumentException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/FormattedIllegalArgumentException.java
@@ -16,7 +16,7 @@ import static org.apache.juneau.internal.StringUtils.*;
import java.text.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Subclass of illegal-argument exceptions that take in a message and zero or more arguments.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
index 933187b..a895994 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
@@ -17,7 +17,7 @@ import static org.apache.juneau.internal.StringUtils.*;
import java.text.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* General invalid conversion exception.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/InvalidAnnotationException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/InvalidAnnotationException.java
index db43b6b..9c97ae2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/InvalidAnnotationException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/InvalidAnnotationException.java
@@ -15,7 +15,7 @@ package org.apache.juneau.annotation;
import java.lang.annotation.*;
import org.apache.juneau.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Defines an invalid usage of an annotation.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index 05bbdcb..22c166e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -28,7 +28,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.utils.*;
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchemaBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchemaBuilder.java
index 3ceb764..4a7e73f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchemaBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchemaBuilder.java
@@ -25,7 +25,7 @@ import org.apache.juneau.http.annotation.*;
import org.apache.juneau.jsonschema.annotation.Schema;
import org.apache.juneau.jsonschema.annotation.Items;
import org.apache.juneau.jsonschema.annotation.SubItems;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.httppart.HttpPartSchema.*;
import org.apache.juneau.httppart.HttpPartSchema.Type;
import org.apache.juneau.utils.*;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
index c809757..5774392 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
@@ -22,7 +22,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Represents the metadata gathered from a parameter or class annotated with {@link Request}.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
index 6cb5d9f..fc34ad2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
@@ -20,7 +20,7 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Represents the metadata gathered from a getter method of a class annotated with {@link Request}.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
index 845c84d..e2c6f17 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
@@ -25,7 +25,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Represents the metadata gathered from a parameter or class annotated with {@link Response}.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanPropertyMeta.java
index 4b040b2..6ac33fc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanPropertyMeta.java
@@ -19,7 +19,7 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Represents the metadata gathered from a getter method of a class annotated with {@link Response}.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/Utils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/Utils.java
index c3c0220..424f295 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/Utils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/Utils.java
@@ -15,7 +15,7 @@ package org.apache.juneau.httppart.bean;
import java.lang.annotation.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Utility methods.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
index 069c688..ae77f6d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
@@ -16,7 +16,7 @@ import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.utils.*;
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/HttpUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/HttpUtils.java
index d8d5c4d..babbdae 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/HttpUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/HttpUtils.java
@@ -17,7 +17,7 @@ import static org.apache.juneau.internal.ClassUtils.*;
import java.lang.reflect.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Utilities.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TransformCache.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TransformCache.java
index aea03ae..d1320f7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TransformCache.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TransformCache.java
@@ -13,11 +13,11 @@
package org.apache.juneau.internal;
import static org.apache.juneau.internal.ClassUtils.*;
-import static org.apache.juneau.reflection.ClassFlags.*;
+import static org.apache.juneau.reflect.ReflectFlags.*;
import java.util.concurrent.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import java.lang.reflect.*;
import java.util.*;
@@ -200,7 +200,7 @@ public class TransformCache {
if (t == null) {
for (MethodInfo m2 : ici.getAllMethods()) {
- if (m2.isAll(PUBLIC, NOT_STATIC, HAS_NO_ARGS, NOT_DEPRECATED) && m2.getSimpleName().startsWith("to") && m2.hasReturnType(oc)) {
+ if (m2.isAll(PUBLIC, NOT_STATIC, HAS_NO_PARAMS, NOT_DEPRECATED) && m2.getSimpleName().startsWith("to") && m2.hasReturnType(oc)) {
final Method m3 = m2.inner();
t = new Transform<I,O>() {
@Override
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/AnnotationInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
similarity index 98%
rename from juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/AnnotationInfo.java
rename to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
index 83ef47c..499578b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/AnnotationInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.reflection;
+package org.apache.juneau.reflect;
import java.lang.annotation.*;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ClassInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
similarity index 99%
rename from juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ClassInfo.java
rename to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index dedeac9..fcd3751 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ClassInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -10,10 +10,10 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.reflection;
+package org.apache.juneau.reflect;
import static org.apache.juneau.internal.StringUtils.*;
-import static org.apache.juneau.reflection.ClassFlags.*;
+import static org.apache.juneau.reflect.ReflectFlags.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.lang.annotation.*;
@@ -1037,8 +1037,8 @@ public final class ClassInfo {
* @param flags The flags to test for.
* @return <jk>true</jk> if all specified flags are applicable to this class.
*/
- public boolean isAll(ClassFlags...flags) {
- for (ClassFlags f : flags) {
+ public boolean isAll(ReflectFlags...flags) {
+ for (ReflectFlags f : flags) {
switch (f) {
case DEPRECATED:
if (isNotDeprecated())
@@ -1102,8 +1102,8 @@ public final class ClassInfo {
* @param flags The flags to test for.
* @return <jk>true</jk> if all specified flags are applicable to this class.
*/
- public boolean isAny(ClassFlags...flags) {
- for (ClassFlags f : flags) {
+ public boolean isAny(ReflectFlags...flags) {
+ for (ReflectFlags f : flags) {
switch (f) {
case DEPRECATED:
if (isDeprecated())
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ConstructorInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
similarity index 99%
rename from juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ConstructorInfo.java
rename to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
index a37dfaf..6fed09c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ConstructorInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.reflection;
+package org.apache.juneau.reflect;
import java.lang.reflect.*;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ExecutableInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
similarity index 98%
rename from juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ExecutableInfo.java
rename to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
index 923f53d..9450c96 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ExecutableInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.reflection;
+package org.apache.juneau.reflect;
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -332,8 +332,8 @@ public abstract class ExecutableInfo {
* @param flags The flags to test for.
* @return <jk>true</jk> if all specified flags are applicable to this method.
*/
- public final boolean isAll(ClassFlags...flags) {
- for (ClassFlags f : flags) {
+ public final boolean isAll(ReflectFlags...flags) {
+ for (ReflectFlags f : flags) {
switch (f) {
case DEPRECATED:
if (isNotDeprecated())
@@ -343,11 +343,11 @@ public abstract class ExecutableInfo {
if (isDeprecated())
return false;
break;
- case HAS_ARGS:
+ case HAS_PARAMS:
if (hasNoParams())
return false;
break;
- case HAS_NO_ARGS:
+ case HAS_NO_PARAMS:
if (hasParams())
return false;
break;
@@ -388,8 +388,8 @@ public abstract class ExecutableInfo {
* @param flags The flags to test for.
* @return <jk>true</jk> if all specified flags are applicable to this method.
*/
- public final boolean isAny(ClassFlags...flags) {
- for (ClassFlags f : flags) {
+ public final boolean isAny(ReflectFlags...flags) {
+ for (ReflectFlags f : flags) {
switch (f) {
case DEPRECATED:
if (isDeprecated())
@@ -399,11 +399,11 @@ public abstract class ExecutableInfo {
if (isNotDeprecated())
return true;
break;
- case HAS_ARGS:
+ case HAS_PARAMS:
if (hasParams())
return true;
break;
- case HAS_NO_ARGS:
+ case HAS_NO_PARAMS:
if (hasNoParams())
return true;
break;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/FieldInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
similarity index 97%
rename from juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/FieldInfo.java
rename to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
index 10583a2..88e03f4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/FieldInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.reflection;
+package org.apache.juneau.reflect;
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -111,8 +111,8 @@ public final class FieldInfo implements Comparable<FieldInfo> {
* @param flags The flags to test for.
* @return <jk>true</jk> if all specified flags are applicable to this field.
*/
- public boolean isAll(ClassFlags...flags) {
- for (ClassFlags f : flags) {
+ public boolean isAll(ReflectFlags...flags) {
+ for (ReflectFlags f : flags) {
switch (f) {
case DEPRECATED:
if (isNotDeprecated())
@@ -122,9 +122,9 @@ public final class FieldInfo implements Comparable<FieldInfo> {
if (isDeprecated())
return false;
break;
- case HAS_ARGS:
+ case HAS_PARAMS:
break;
- case HAS_NO_ARGS:
+ case HAS_NO_PARAMS:
break;
case PUBLIC:
if (isNotPublic())
@@ -163,8 +163,8 @@ public final class FieldInfo implements Comparable<FieldInfo> {
* @param flags The flags to test for.
* @return <jk>true</jk> if all specified flags are applicable to this field.
*/
- public boolean isAny(ClassFlags...flags) {
- for (ClassFlags f : flags) {
+ public boolean isAny(ReflectFlags...flags) {
+ for (ReflectFlags f : flags) {
switch (f) {
case DEPRECATED:
if (isDeprecated())
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/MethodInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
similarity index 99%
rename from juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/MethodInfo.java
rename to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
index 9ad8cad..302c4ec 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/MethodInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.reflection;
+package org.apache.juneau.reflect;
import static org.apache.juneau.internal.CollectionUtils.*;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/MethodParamInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodParamInfo.java
similarity index 99%
rename from juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/MethodParamInfo.java
rename to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodParamInfo.java
index 4fe35b8..7a71774 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/MethodParamInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodParamInfo.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.reflection;
+package org.apache.juneau.reflect;
import static org.apache.juneau.internal.CollectionUtils.*;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ClassFlags.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ReflectFlags.java
similarity index 93%
rename from juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ClassFlags.java
rename to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ReflectFlags.java
index 05748e3..86272d6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ClassFlags.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ReflectFlags.java
@@ -10,12 +10,12 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.reflection;
+package org.apache.juneau.reflect;
/**
* Identifies possible modifiers on classes, methods, fields, and constructors.
*/
-public enum ClassFlags {
+public enum ReflectFlags {
/** PUBLIC */
PUBLIC,
@@ -41,11 +41,11 @@ public enum ClassFlags {
/** CLASS */
CLASS,
- /** HAS_ARGS */
- HAS_ARGS,
+ /** HAS_PARAMS */
+ HAS_PARAMS,
- /** HAS_NO_ARGS */
- HAS_NO_ARGS,
+ /** HAS_NO_PARAMS */
+ HAS_NO_PARAMS,
/** DEPRECATED */
DEPRECATED,
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/package-info.java
similarity index 96%
rename from juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/package-info.java
rename to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/package-info.java
index dd644ec..01b54f1 100755
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/package-info.java
@@ -14,5 +14,5 @@
/**
* Reflection API
*/
-package org.apache.juneau.reflection;
+package org.apache.juneau.reflect;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterfaceMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterfaceMeta.java
index 8efe8f7..5abffd0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterfaceMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterfaceMeta.java
@@ -19,7 +19,7 @@ import static org.apache.juneau.internal.ClassUtils.*;
import java.lang.reflect.*;
import java.util.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Contains the meta-data about a remote proxy REST interface.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index 7c79fb4..fc2a4dd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -22,7 +22,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.soap.*;
import org.apache.juneau.transform.*;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BuilderSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BuilderSwap.java
index 07442d0..275b765 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BuilderSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BuilderSwap.java
@@ -18,7 +18,7 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Specialized transform for builder classes.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
index 2b06ff0..a59ff8c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
@@ -20,7 +20,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.http.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java
index f054786..638f3ff 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java
@@ -20,7 +20,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoIntrospector.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoIntrospector.java
index 3d97cc4..22c8718 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoIntrospector.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoIntrospector.java
@@ -17,7 +17,7 @@ import java.lang.reflect.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Used to invoke methods on {@code Objects} using arguments in serialized form.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
index 19db8f1..c6d902f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
@@ -17,7 +17,7 @@ import static org.apache.juneau.internal.StringUtils.*;
import java.util.*;
import org.apache.juneau.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.xml.annotation.*;
/**
diff --git a/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/VarResolverContext.java b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/VarResolverContext.java
index 8f49c41..e130813 100644
--- a/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/VarResolverContext.java
+++ b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/VarResolverContext.java
@@ -18,7 +18,7 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
import java.util.concurrent.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Configurable properties on the {@link VarResolver} class.
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index 76b3501..d39a157 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -27,7 +27,7 @@ import org.apache.juneau.*;
import org.apache.juneau.config.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.microservice.*;
-import org.apache.juneau.reflection.ClassInfo;
+import org.apache.juneau.reflect.ClassInfo;
import org.apache.juneau.rest.*;
import org.apache.juneau.svl.*;
import org.apache.juneau.utils.*;
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
index d3d3015..43713c9 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
@@ -48,7 +48,7 @@ import org.apache.juneau.internal.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.parser.ParseException;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.utils.*;
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
index 2006186..6dbdf64 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
@@ -27,7 +27,7 @@ import org.apache.http.*;
import org.apache.http.client.*;
import org.apache.http.util.*;
import org.apache.juneau.parser.ParseException;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Exception representing a <code>400+</code> HTTP response code against a remote resource.
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodArg.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodArg.java
index d4bff04..9d625a1 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodArg.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodArg.java
@@ -18,7 +18,7 @@ import static org.apache.juneau.httppart.HttpPartType.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Represents the metadata about an annotated argument of a method on a REST proxy class.
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodMeta.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodMeta.java
index 4babdba..804edfb 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodMeta.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodMeta.java
@@ -24,7 +24,7 @@ import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.httppart.bean.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Contains the meta-data about a Java method on a REST proxy class.
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodReturn.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodReturn.java
index 615077c..ebe9d66 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodReturn.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodReturn.java
@@ -17,7 +17,7 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.bean.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Represents the metadata about the returned object of a method on a remote proxy interface.
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResourceMeta.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResourceMeta.java
index 708d842..67f0988 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResourceMeta.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResourceMeta.java
@@ -19,7 +19,7 @@ import static org.apache.juneau.internal.ClassUtils.*;
import java.lang.reflect.*;
import java.util.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
/**
* Contains the meta-data about a REST proxy class.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
index 2f62f89..4962294 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
@@ -22,7 +22,7 @@ import java.util.concurrent.*;
import org.apache.juneau.dto.swagger.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.svl.*;
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ClientVersionMatcher.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ClientVersionMatcher.java
index 45c8226..2479219 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ClientVersionMatcher.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ClientVersionMatcher.java
@@ -15,7 +15,7 @@ package org.apache.juneau.rest;
import static org.apache.juneau.internal.StringUtils.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.annotation.*;
/**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 98d6bed..252d3bb 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -55,7 +55,7 @@ import org.apache.juneau.msgpack.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.plaintext.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.remote.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.converters.*;
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index 3dde71b..33fdb38 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -35,7 +35,7 @@ import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.reshandlers.*;
import org.apache.juneau.rest.util.RestUtils;
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
index 0170721..bc54f8f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
@@ -42,7 +42,7 @@ import org.apache.juneau.httppart.bean.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.internal.HttpUtils;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.exception.*;
import org.apache.juneau.rest.util.RestUtils;
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodParam.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodParam.java
index 0ccbec5..fdbbc49 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodParam.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodParam.java
@@ -25,7 +25,7 @@ import org.apache.juneau.dto.swagger.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.Date;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.utils.*;
/**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
index ced2de2..efa3002 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
@@ -40,7 +40,7 @@ import org.apache.juneau.httppart.*;
import org.apache.juneau.httppart.bean.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.exception.*;
import org.apache.juneau.rest.util.UrlPathPattern;
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
index 2cbf1aa..bf64118 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
@@ -24,7 +24,7 @@ import java.util.logging.*;
import javax.servlet.*;
import javax.servlet.http.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.exception.*;
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
index 232566c..375285a 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
@@ -42,7 +42,7 @@ import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.jsonschema.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.reflection.*;
+import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.util.RestUtils;
import org.apache.juneau.serializer.*;