Major aggregation factory and completeness cleanup

ClientSupport/src/main/java/io/deephaven/treetable/RollupSnapshotImpl.java

@@ -2,7 +2,6 @@
 
 import io.deephaven.base.verify.Require;
 import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.impl.QueryTable;
 import io.deephaven.engine.updategraph.NotificationQueue;
 import io.deephaven.engine.table.MatchPair;
 import io.deephaven.engine.util.string.StringUtils;
@@ -162,7 +161,7 @@ private HierarchicalTable applyFilters(@NotNull HierarchicalTable table) {
 
         final Table source = Require.neqNull(table.getSourceTable(), "Hierarchical source table");
         final RollupInfo info = getInfo();
-        return (HierarchicalTable) ((QueryTable) source.where(filters)).rollup(info.factory,
+        return (HierarchicalTable) source.where(filters).rollup(info.aggregations,
                 info.getLeafType() == RollupInfo.LeafType.Constituent, info.getSelectColumns());
     }
 

Generators/Generators.gradle

@@ -227,8 +227,6 @@ def pythonStaticMethodsArgs = ['io.deephaven.time.calendar.Calendars',
                                'io.deephaven.engine.util.TableTools',
                                     '/Generators/src/main/java/io/deephaven/pythonPreambles/TableToolsPreamble.txt',
                                     '/Integrations/python/deephaven/TableTools/__init__.py',
-                               'io.deephaven.engine.table.impl.by.AggregationFactory',
-                                    '/Integrations/python/deephaven/AggregationFactory/__init__.py',
                                'io.deephaven.plot.colors.ColorMaps',
                                    '/Integrations/python/deephaven/Plot/ColorMaps/__init__.py',
                                'io.deephaven.engine.util.WindowCheck',

Integrations/python/deephaven/__init__.py

@@ -9,8 +9,6 @@
 
 * Calendars imported as cals
 
-* AggregationFactory imported as af
-
 * DateTimeUtils imported as dtu
 
 * MovingAverages imported as mavg
@@ -58,7 +56,7 @@
     'Aggregation', 'ColumnName', 'ColumnRenderersBuilder', 'DistinctFormatter', 'DownsampledWhereFilter', 'DynamicTableWriter',
     'LayoutHintBuilder', 'Replayer', 'SmartKey', 'SortColumn', 'TotalsTableBuilder', 'WindowCheck',  # from TableManipulation
 
-    "cals", "af", "dtu", "figw", "mavg", "plt", "pt", "ttools", "tloggers",  # subpackages with abbreviated names
+    "cals", "dtu", "figw", "mavg", "plt", "pt", "ttools", "tloggers",  # subpackages with abbreviated names
 
     "read_csv", "write_csv" # from csv
 ]
@@ -81,7 +79,6 @@
 
 
 from . import Calendars as cals, \
-    AggregationFactory as af, \
     DateTimeUtils as dtu, \
     MovingAverages as mavg, \
     ConsumeKafka as ck, \
@@ -107,7 +104,6 @@ def initialize():
 
     # ensure that all the symbols are called and reimport the broken symbols
     cals._defineSymbols()
-    af._defineSymbols()
     dtu._defineSymbols()
     dh._defineSymbols()
     ck._defineSymbols()

Integrations/python/deephaven/doc/io/deephaven/api/agg/Aggregation.json

@@ -2,27 +2,33 @@
  "className": "io.deephaven.api.agg.Aggregation",
  "methods": {
   "AggAbsSum": ":param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
+  "AggApproxPct": "*Overload 1*  \n  :param percentile: double\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 2*  \n  :param percentile: double\n  :param compression: double\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 3*  \n  :param inputColumn: java.lang.String\n  :param percentileOutputs: io.deephaven.api.agg.util.PercentileOutput...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 4*  \n  :param inputColumn: java.lang.String\n  :param compression: double\n  :param percentileOutputs: io.deephaven.api.agg.util.PercentileOutput...\n  :return: io.deephaven.api.agg.Aggregation",
   "AggAvg": ":param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
   "AggCount": ":param resultColumn: java.lang.String\n:return: io.deephaven.api.agg.Aggregation",
   "AggCountDistinct": "*Overload 1*  \n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 2*  \n  :param countNulls: boolean\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation",
   "AggDistinct": "*Overload 1*  \n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 2*  \n  :param includeNulls: boolean\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation",
   "AggFirst": ":param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
+  "AggFirstRowKey": ":param resultColumn: java.lang.String\n:return: io.deephaven.api.agg.Aggregation",
   "AggFormula": ":param formula: java.lang.String\n:param formulaParam: java.lang.String\n:param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
   "AggGroup": ":param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
   "AggLast": ":param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
+  "AggLastRowKey": ":param resultColumn: java.lang.String\n:return: io.deephaven.api.agg.Aggregation",
   "AggMax": ":param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
   "AggMed": "*Overload 1*  \n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 2*  \n  :param average: boolean\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation",
   "AggMin": ":param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
-  "AggPct": "*Overload 1*  \n  :param percentile: double\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 2*  \n  :param percentile: double\n  :param average: boolean\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation",
+  "AggPct": "*Overload 1*  \n  :param percentile: double\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 2*  \n  :param percentile: double\n  :param average: boolean\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 3*  \n  :param inputColumn: java.lang.String\n  :param percentileOutputs: io.deephaven.api.agg.util.PercentileOutput...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 4*  \n  :param inputColumn: java.lang.String\n  :param average: boolean\n  :param percentileOutputs: io.deephaven.api.agg.util.PercentileOutput...\n  :return: io.deephaven.api.agg.Aggregation",
   "AggSortedFirst": "*Overload 1*  \n  :param sortedColumn: java.lang.String\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 2*  \n  :param sortedColumns: java.util.Collection<? extendsjava.lang.String>\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation",
   "AggSortedLast": "*Overload 1*  \n  :param sortedColumn: java.lang.String\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 2*  \n  :param sortedColumns: java.util.Collection<? extendsjava.lang.String>\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation",
   "AggStd": ":param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
   "AggSum": ":param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
-  "AggUnique": "*Overload 1*  \n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 2*  \n  :param includeNulls: boolean\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation",
+  "AggTDigest": "*Overload 1*  \n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 2*  \n  :param compression: double\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation",
+  "AggUnique": "*Overload 1*  \n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 2*  \n  :param includeNulls: boolean\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 3*  \n  :param includeNulls: boolean\n  :param nonUniqueSentinel: io.deephaven.api.agg.util.Sentinel\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation",
   "AggVar": ":param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
   "AggWAvg": ":param weightColumn: java.lang.String\n:param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
   "AggWSum": ":param weightColumn: java.lang.String\n:param pairs: java.lang.String...\n:return: io.deephaven.api.agg.Aggregation",
-  "of": "*Overload 1*  \n  :param spec: io.deephaven.api.agg.spec.AggSpec\n  :param pair: java.lang.String\n  :return: io.deephaven.api.agg.NormalAggregation\n  \n*Overload 2*  \n  :param spec: io.deephaven.api.agg.spec.AggSpec\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation",
+  "PctOut": ":param percentile: double\n:param outputColumn: java.lang.String\n:return: io.deephaven.api.agg.util.PercentileOutput",
+  "Sentinel": "*Overload 1*  \n  :param value: java.lang.Object\n  :return: io.deephaven.api.agg.util.Sentinel\n  \n*Overload 2*  \n  :return: io.deephaven.api.agg.util.Sentinel",
+  "of": "*Overload 1*  \n  :param spec: io.deephaven.api.agg.spec.AggSpec\n  :param pair: java.lang.String\n  :return: io.deephaven.api.agg.ColumnAggregation\n  \n*Overload 2*  \n  :param spec: io.deephaven.api.agg.spec.AggSpec\n  :param pairs: java.lang.String...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 3*  \n  :param aggregations: io.deephaven.api.agg.Aggregation...\n  :return: io.deephaven.api.agg.Aggregation\n  \n*Overload 4*  \n  Note: Java generics information - <INPUT_TYPE>\n  \n  :param columnAggFactory: java.util.function.BiFunction<io.deephaven.api.ColumnName,INPUT_TYPE,io.deephaven.api.agg.ColumnAggregation>\n  :param inputColumn: java.lang.String\n  :param inputs: INPUT_TYPE...\n  :return: io.deephaven.api.agg.Aggregation",
   "walk": "Note: Java generics information - <V extends io.deephaven.api.agg.Aggregation.Visitor>\n\n:param visitor: V\n:return: V"
  },
  "path": "io.deephaven.api.agg.Aggregation",

Integrations/python/deephaven/doc/io/deephaven/api/agg/Aggregation/Visitor.json

@@ -1,7 +1,7 @@
 {
  "className": "io.deephaven.api.agg.Aggregation$Visitor",
  "methods": {
-  "visit": "*Overload 1*  \n  :param count: io.deephaven.api.agg.Count\n  \n*Overload 2*  \n  :param normalAgg: io.deephaven.api.agg.NormalAggregation\n  \n*Overload 3*  \n  :param normalAggs: io.deephaven.api.agg.NormalAggregations"
+  "visit": "*Overload 1*  \n  :param aggregations: io.deephaven.api.agg.Aggregations\n  \n*Overload 2*  \n  :param columnAgg: io.deephaven.api.agg.ColumnAggregation\n  \n*Overload 3*  \n  :param columnAggs: io.deephaven.api.agg.ColumnAggregations\n  \n*Overload 4*  \n  :param count: io.deephaven.api.agg.Count\n  \n*Overload 5*  \n  :param firstRowKey: io.deephaven.api.agg.FirstRowKey\n  \n*Overload 6*  \n  :param lastRowKey: io.deephaven.api.agg.LastRowKey"
  },
  "path": "io.deephaven.api.agg.Aggregation.Visitor",
  "typeName": "interface"

Integrations/python/deephaven/doc/io/deephaven/api/agg/AggregationDescriptions.json

@@ -0,0 +1,10 @@
+{
+ "className": "io.deephaven.api.agg.AggregationDescriptions",
+ "methods": {
+  "of": "*Overload 1*  \n  :param aggregation: io.deephaven.api.agg.Aggregation\n  :return: java.util.Map<java.lang.String,java.lang.String>\n  \n*Overload 2*  \n  :param aggregations: java.util.Collection<? extendsio.deephaven.api.agg.Aggregation>\n  :return: java.util.Map<java.lang.String,java.lang.String>",
+  "visit": "*Overload 1*  \n  :param aggregations: io.deephaven.api.agg.Aggregations\n  \n*Overload 2*  \n  :param columnAgg: io.deephaven.api.agg.ColumnAggregation\n  \n*Overload 3*  \n  :param columnAggs: io.deephaven.api.agg.ColumnAggregations\n  \n*Overload 4*  \n  :param count: io.deephaven.api.agg.Count\n  \n*Overload 5*  \n  :param firstRowKey: io.deephaven.api.agg.FirstRowKey\n  \n*Overload 6*  \n  :param lastRowKey: io.deephaven.api.agg.LastRowKey"
+ },
+ "path": "io.deephaven.api.agg.AggregationDescriptions",
+ "text": "A visitor to describe the input and aggregation column name pairs for aggregations.",
+ "typeName": "class"
+}

Integrations/python/deephaven/doc/io/deephaven/api/agg/AggregationOptimizer.json

@@ -3,9 +3,9 @@
  "methods": {
   "build": ":return: java.util.List<io.deephaven.api.agg.Aggregation>",
   "of": "Optimizes a collection of aggregations by grouping like-specced aggregations together. The\n input order will be preserved based on the spec-encountered order.\n\n:param aggregations: (java.util.Collection<? extendsio.deephaven.api.agg.Aggregation>) - the aggregations\n:return: (java.util.List<io.deephaven.api.agg.Aggregation>) the optimized aggregations",
-  "visit": "*Overload 1*  \n  :param count: io.deephaven.api.agg.Count\n  \n*Overload 2*  \n  :param normalAgg: io.deephaven.api.agg.NormalAggregation\n  \n*Overload 3*  \n  :param normalAggs: io.deephaven.api.agg.NormalAggregations"
+  "visit": "*Overload 1*  \n  :param aggregations: io.deephaven.api.agg.Aggregations\n  \n*Overload 2*  \n  :param columnAgg: io.deephaven.api.agg.ColumnAggregation\n  \n*Overload 3*  \n  :param columnAggs: io.deephaven.api.agg.ColumnAggregations\n  \n*Overload 4*  \n  :param count: io.deephaven.api.agg.Count\n  \n*Overload 5*  \n  :param firstRowKey: io.deephaven.api.agg.FirstRowKey\n  \n*Overload 6*  \n  :param lastRowKey: io.deephaven.api.agg.LastRowKey"
  },
  "path": "io.deephaven.api.agg.AggregationOptimizer",
- "text": "Optimizes a collection of aggregations by grouping like-speccedd aggregations together.",
+ "text": "Optimizes a collection of aggregations by grouping like-specced aggregations together.",
  "typeName": "class"
 }

Integrations/python/deephaven/doc/io/deephaven/api/agg/AggregationOutputs.json

@@ -1,10 +1,7 @@
 {
  "className": "io.deephaven.api.agg.AggregationOutputs",
- "methods": {
-  "of": "*Overload 1*  \n  :param aggregation: io.deephaven.api.agg.Aggregation\n  :return: java.util.stream.Stream<io.deephaven.api.ColumnName>\n  \n*Overload 2*  \n  :param aggregations: java.util.Collection<? extendsio.deephaven.api.agg.Aggregation>\n  :return: java.util.stream.Stream<io.deephaven.api.ColumnName>",
-  "visit": "*Overload 1*  \n  :param count: io.deephaven.api.agg.Count\n  \n*Overload 2*  \n  :param normalAgg: io.deephaven.api.agg.NormalAggregation\n  \n*Overload 3*  \n  :param normalAggs: io.deephaven.api.agg.NormalAggregations"
- },
+ "methods": {},
  "path": "io.deephaven.api.agg.AggregationOutputs",
- "text": "A visitor to get the ordered output column names for aggregations.",
+ "text": "Helper to get the ordered output column names for aggregations.",
  "typeName": "class"
 }

Integrations/python/deephaven/doc/io/deephaven/api/agg/AggregationPairs.json

@@ -0,0 +1,11 @@
+{
+ "className": "io.deephaven.api.agg.AggregationPairs",
+ "methods": {
+  "of": "*Overload 1*  \n  :param aggregation: io.deephaven.api.agg.Aggregation\n  :return: java.util.stream.Stream<io.deephaven.api.agg.Pair>\n  \n*Overload 2*  \n  :param aggregations: java.util.Collection<? extendsio.deephaven.api.agg.Aggregation>\n  :return: java.util.stream.Stream<io.deephaven.api.agg.Pair>",
+  "outputsOf": "*Overload 1*  \n  :param aggregation: io.deephaven.api.agg.Aggregation\n  :return: java.util.stream.Stream<io.deephaven.api.ColumnName>\n  \n*Overload 2*  \n  :param aggregations: java.util.Collection<? extendsio.deephaven.api.agg.Aggregation>\n  :return: java.util.stream.Stream<io.deephaven.api.ColumnName>",
+  "visit": "*Overload 1*  \n  :param aggregations: io.deephaven.api.agg.Aggregations\n  \n*Overload 2*  \n  :param columnAgg: io.deephaven.api.agg.ColumnAggregation\n  \n*Overload 3*  \n  :param columnAggs: io.deephaven.api.agg.ColumnAggregations\n  \n*Overload 4*  \n  :param count: io.deephaven.api.agg.Count\n  \n*Overload 5*  \n  :param firstRowKey: io.deephaven.api.agg.FirstRowKey\n  \n*Overload 6*  \n  :param lastRowKey: io.deephaven.api.agg.LastRowKey"
+ },
+ "path": "io.deephaven.api.agg.AggregationPairs",
+ "text": "A visitor to get the ordered input/output column name pairs for aggregations.",
+ "typeName": "class"
+}

Integrations/python/deephaven/doc/io/deephaven/api/agg/Aggregations.json

@@ -0,0 +1,11 @@
+{
+ "className": "io.deephaven.api.agg.Aggregations",
+ "methods": {
+  "aggregations": ":return: java.util.List<io.deephaven.api.agg.Aggregation>",
+  "builder": ":return: io.deephaven.api.agg.Aggregations.Builder",
+  "walk": "Note: Java generics information - <V extends io.deephaven.api.agg.Aggregation.Visitor>\n\n:param visitor: V\n:return: V"
+ },
+ "path": "io.deephaven.api.agg.Aggregations",
+ "text": "Aggregations is an Aggregation that is a collection of two or more aggregations.",
+ "typeName": "class"
+}

Integrations/python/deephaven/doc/io/deephaven/api/agg/Aggregations/Builder.json

@@ -0,0 +1,10 @@
+{
+ "className": "io.deephaven.api.agg.Aggregations$Builder",
+ "methods": {
+  "addAggregations": "*Overload 1*  \n  :param aggregation: io.deephaven.api.agg.Aggregation\n  :return: io.deephaven.api.agg.Aggregations.Builder\n  \n*Overload 2*  \n  :param aggregations: io.deephaven.api.agg.Aggregation...\n  :return: io.deephaven.api.agg.Aggregations.Builder",
+  "addAllAggregations": ":param aggregations: java.lang.Iterable<? extendsio.deephaven.api.agg.Aggregation>\n:return: io.deephaven.api.agg.Aggregations.Builder",
+  "build": ":return: io.deephaven.api.agg.Aggregations"
+ },
+ "path": "io.deephaven.api.agg.Aggregations.Builder",
+ "typeName": "interface"
+}

Integrations/python/deephaven/doc/io/deephaven/api/agg/NormalAggregation.json → Integrations/python/deephaven/doc/io/deephaven/api/agg/ColumnAggregation.json

@@ -1,12 +1,12 @@
 {
- "className": "io.deephaven.api.agg.NormalAggregation",
+ "className": "io.deephaven.api.agg.ColumnAggregation",
  "methods": {
-  "of": ":param spec: io.deephaven.api.agg.spec.AggSpec\n:param pair: io.deephaven.api.agg.Pair\n:return: io.deephaven.api.agg.NormalAggregation",
+  "of": ":param spec: io.deephaven.api.agg.spec.AggSpec\n:param pair: io.deephaven.api.agg.Pair\n:return: io.deephaven.api.agg.ColumnAggregation",
   "pair": ":return: io.deephaven.api.agg.Pair",
   "spec": ":return: io.deephaven.api.agg.spec.AggSpec",
   "walk": "Note: Java generics information - <V extends io.deephaven.api.agg.Aggregation.Visitor>\n\n:param visitor: V\n:return: V"
  },
- "path": "io.deephaven.api.agg.NormalAggregation",
- "text": "A normal aggregation is an Aggregation that is composed of a spec and a pair.",
+ "path": "io.deephaven.api.agg.ColumnAggregation",
+ "text": "A ColumnAggregation is an Aggregation that is composed of a spec and a single input/output\n column pair.",
  "typeName": "class"
 }

Integrations/python/deephaven/doc/io/deephaven/api/agg/NormalAggregations.json → Integrations/python/deephaven/doc/io/deephaven/api/agg/ColumnAggregations.json

@@ -1,12 +1,12 @@
 {
- "className": "io.deephaven.api.agg.NormalAggregations",
+ "className": "io.deephaven.api.agg.ColumnAggregations",
  "methods": {
-  "builder": ":return: io.deephaven.api.agg.NormalAggregations.Builder",
+  "builder": ":return: io.deephaven.api.agg.ColumnAggregations.Builder",
   "pairs": ":return: java.util.List<io.deephaven.api.agg.Pair>",
   "spec": ":return: io.deephaven.api.agg.spec.AggSpec",
   "walk": "Note: Java generics information - <V extends io.deephaven.api.agg.Aggregation.Visitor>\n\n:param visitor: V\n:return: V"
  },
- "path": "io.deephaven.api.agg.NormalAggregations",
- "text": "Normal aggregations is an Aggregation that is composed of a spec and multiple pairs.",
+ "path": "io.deephaven.api.agg.ColumnAggregations",
+ "text": "ColumnAggregations is an Aggregation that is composed of a spec and multiple input/output\n column pairs.",
  "typeName": "class"
 }

Integrations/python/deephaven/doc/io/deephaven/api/agg/ColumnAggregations/Builder.json

@@ -0,0 +1,11 @@
+{
+ "className": "io.deephaven.api.agg.ColumnAggregations$Builder",
+ "methods": {
+  "addAllPairs": ":param elements: java.lang.Iterable<? extendsio.deephaven.api.agg.Pair>\n:return: io.deephaven.api.agg.ColumnAggregations.Builder",
+  "addPairs": "*Overload 1*  \n  :param element: io.deephaven.api.agg.Pair\n  :return: io.deephaven.api.agg.ColumnAggregations.Builder\n  \n*Overload 2*  \n  :param elements: io.deephaven.api.agg.Pair...\n  :return: io.deephaven.api.agg.ColumnAggregations.Builder",
+  "build": ":return: io.deephaven.api.agg.ColumnAggregations",
+  "spec": ":param spec: io.deephaven.api.agg.spec.AggSpec\n:return: io.deephaven.api.agg.ColumnAggregations.Builder"
+ },
+ "path": "io.deephaven.api.agg.ColumnAggregations.Builder",
+ "typeName": "interface"
+}