Merge pull request #159 from kbase/sdkdev

Fix reflection config for compilation report

Author: MrCreosote

src/main/java/us/kbase/sdk/compiler/TemplateBasedGenerator.java

@@ -76,7 +76,7 @@ public static void generate(List<KbService> srvs, String defaultUrl,
             pythonClient.close();
         }
         //////////////////////////////////////// Servers /////////////////////////////////////////
-        // AFAICT at this pint either
+        // AFAICT at this point either
         //     * the python server name is null and getPythonServer is false
         //     * the python server name is supplied and getPythonServer is true
         // so one implies the other

src/main/resources/META-INF/native-image/reflect-config.json

@@ -17,12 +17,6 @@
 {
   "name":"[Ljava.lang.String;"
 },
-{
-  "name":"[Lorg.eclipse.jetty.servlet.ServletHolder;"
-},
-{
-  "name":"[Lorg.eclipse.jetty.servlet.ServletMapping;"
-},
 {
   "name":"[Lsun.security.pkcs.SignerInfo;"
 },
@@ -685,6 +679,36 @@
   "name":"sun.security.x509.SubjectKeyIdentifierExtension",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
 },
+{
+  "name":"us.kbase.sdk.compiler.report.Function",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "allDeclaredConstructors":true
+},
+{
+  "name":"us.kbase.sdk.compiler.report.FunctionPlace",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "allDeclaredConstructors":true
+},
+{
+  "name":"us.kbase.sdk.compiler.report.Parameter",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "allDeclaredConstructors":true
+},
+{
+  "name":"us.kbase.sdk.compiler.report.Report",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "allDeclaredConstructors":true
+},
+{
+  "name":"us.kbase.sdk.compiler.report.SpecFile",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "allDeclaredConstructors":true
+},
 {
   "name":"us.kbase.catalog.CompilationReport",
   "allDeclaredFields":true,
@@ -734,10 +758,6 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setContent","parameterTypes":["java.lang.String"] }, {"name":"setFileName","parameterTypes":["java.lang.String"] }, {"name":"setIsMain","parameterTypes":["java.lang.Long"] }]
 },
-{
-  "name":"us.kbase.common.executionengine.CallbackServer",
-  "methods":[{"name":"getProvenance","parameterTypes":[] }]
-},
 {
   "name":"us.kbase.common.service.JsonServerServlet$RpcCallData",
   "allDeclaredFields":true,
@@ -903,18 +923,6 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
-{
-  "name":"us.kbase.narrativemethodstore.ScriptInputMapping",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-},
-{
-  "name":"us.kbase.narrativemethodstore.ScriptOutputMapping",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-},
 {
   "name":"us.kbase.narrativemethodstore.ServiceMethodInputMapping",
   "allDeclaredFields":true,
@@ -1057,23 +1065,5 @@
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
-},
-{
-  "name":"us.kbase.sdk.tester.SDKCallbackServer",
-  "queryAllPublicMethods":true
-},
-{
-  "name":"us.kbase.workspace.ProvenanceAction",
-  "allDeclaredFields":true,
-  "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"getAdditionalProperties","parameterTypes":[] }, {"name":"getCaller","parameterTypes":[] }, {"name":"getCustom","parameterTypes":[] }, {"name":"getDescription","parameterTypes":[] }, {"name":"getEpoch","parameterTypes":[] }, {"name":"getExternalData","parameterTypes":[] }, {"name":"getInputWsObjects","parameterTypes":[] }, {"name":"getIntermediateIncoming","parameterTypes":[] }, {"name":"getIntermediateOutgoing","parameterTypes":[] }, {"name":"getMethod","parameterTypes":[] }, {"name":"getMethodParams","parameterTypes":[] }, {"name":"getResolvedWsObjects","parameterTypes":[] }, {"name":"getScript","parameterTypes":[] }, {"name":"getScriptCommandLine","parameterTypes":[] }, {"name":"getScriptVer","parameterTypes":[] }, {"name":"getService","parameterTypes":[] }, {"name":"getServiceVer","parameterTypes":[] }, {"name":"getSubactions","parameterTypes":[] }, {"name":"getTime","parameterTypes":[] }]
-},
-{
-  "name":"us.kbase.workspace.SubAction",
-  "allDeclaredFields":true,
-  "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"getAdditionalProperties","parameterTypes":[] }, {"name":"getCodeUrl","parameterTypes":[] }, {"name":"getCommit","parameterTypes":[] }, {"name":"getEndpointUrl","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getVer","parameterTypes":[] }]
 }
-]
+]