Skip to content

Commit 41edc28

Browse files
stbischofstbischof
committed
rm user defines function
Signed-off-by: Stefan Bischof <stbischof@bipolis.org>
1 parent 9e07502 commit 41edc28

File tree

8 files changed

+101
-2446
lines changed

8 files changed

+101
-2446
lines changed

‎mondrian/src/main/java/mondrian/spi/UserDefinedFunction.java‎

Lines changed: 0 additions & 148 deletions
This file was deleted.

‎mondrian/src/main/java/mondrian/util/ServiceDiscovery.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.slf4j.LoggerFactory;
2020

2121
import aQute.bnd.annotation.spi.ServiceConsumer;
22-
import mondrian.spi.UserDefinedFunction;
2322

2423
/**
2524
* Utility functions to discover Java services.

‎mondrian/src/test/java/mondrian/rolap/SchemaModifiers.java‎

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
import org.eclipse.daanse.rolap.mapping.api.model.enums.AccessHierarchy;
3939
import org.eclipse.daanse.rolap.mapping.api.model.enums.AccessMember;
4040
import org.eclipse.daanse.rolap.mapping.api.model.enums.ColumnDataType;
41-
import org.eclipse.daanse.rolap.mapping.api.model.enums.InternalDataType;
4241
import org.eclipse.daanse.rolap.mapping.api.model.enums.HideMemberIfType;
42+
import org.eclipse.daanse.rolap.mapping.api.model.enums.InternalDataType;
4343
import org.eclipse.daanse.rolap.mapping.api.model.enums.LevelType;
4444
import org.eclipse.daanse.rolap.mapping.api.model.enums.RollupPolicyType;
4545
import org.eclipse.daanse.rolap.mapping.instance.rec.complex.foodmart.FoodmartMappingSupplier;
@@ -64,7 +64,6 @@
6464
import org.eclipse.daanse.rolap.mapping.pojo.CatalogMappingImpl;
6565
import org.eclipse.daanse.rolap.mapping.pojo.CellFormatterMappingImpl;
6666
import org.eclipse.daanse.rolap.mapping.pojo.CountMeasureMappingImpl;
67-
import org.eclipse.daanse.rolap.mapping.pojo.PhysicalColumnMappingImpl;
6867
import org.eclipse.daanse.rolap.mapping.pojo.CubeConnectorMappingImpl;
6968
import org.eclipse.daanse.rolap.mapping.pojo.CubeMappingImpl;
7069
import org.eclipse.daanse.rolap.mapping.pojo.DatabaseSchemaMappingImpl;
@@ -79,11 +78,11 @@
7978
import org.eclipse.daanse.rolap.mapping.pojo.MaxMeasureMappingImpl;
8079
import org.eclipse.daanse.rolap.mapping.pojo.MeasureGroupMappingImpl;
8180
import org.eclipse.daanse.rolap.mapping.pojo.MeasureMappingImpl;
82-
import org.eclipse.daanse.rolap.mapping.pojo.SumMeasureMappingImpl;
8381
import org.eclipse.daanse.rolap.mapping.pojo.MemberFormatterMappingImpl;
8482
import org.eclipse.daanse.rolap.mapping.pojo.MemberPropertyFormatterMappingImpl;
8583
import org.eclipse.daanse.rolap.mapping.pojo.MemberPropertyMappingImpl;
8684
import org.eclipse.daanse.rolap.mapping.pojo.ParentChildLinkMappingImpl;
85+
import org.eclipse.daanse.rolap.mapping.pojo.PhysicalColumnMappingImpl;
8786
import org.eclipse.daanse.rolap.mapping.pojo.PhysicalCubeMappingImpl;
8887
import org.eclipse.daanse.rolap.mapping.pojo.PhysicalTableMappingImpl;
8988
import org.eclipse.daanse.rolap.mapping.pojo.RowMappingImpl;
@@ -93,11 +92,14 @@
9392
import org.eclipse.daanse.rolap.mapping.pojo.SqlStatementMappingImpl;
9493
import org.eclipse.daanse.rolap.mapping.pojo.SqlViewMappingImpl;
9594
import org.eclipse.daanse.rolap.mapping.pojo.StandardDimensionMappingImpl;
95+
import org.eclipse.daanse.rolap.mapping.pojo.SumMeasureMappingImpl;
9696
import org.eclipse.daanse.rolap.mapping.pojo.TableQueryMappingImpl;
9797
import org.eclipse.daanse.rolap.mapping.pojo.TimeDimensionMappingImpl;
9898
import org.eclipse.daanse.rolap.mapping.pojo.VirtualCubeMappingImpl;
9999

100-
import mondrian.test.UdfTest;
100+
import mondrian.test.FormatterUtil;
101+
102+
101103

102104
public class SchemaModifiers {
103105

@@ -7229,7 +7231,7 @@ protected List<? extends CalculatedMemberMapping> cubeCalculatedMembers(CubeMapp
72297231
.build(),
72307232
CalculatedMemberPropertyMappingImpl.builder()
72317233
.withName("CELL_FORMATTER")
7232-
.withValue(UdfTest.FooBarCellFormatter.class.getName())
7234+
.withValue(FormatterUtil.FooBarCellFormatter.class.getName())
72337235
.build()
72347236
))
72357237
.build());
@@ -8138,7 +8140,7 @@ protected List<? extends MeasureGroupMapping> physicalCubeMeasureGroups(Physical
81388140
.withName("Unit Sales Foo Bar")
81398141
.withColumn(FoodmartMappingSupplier.UNIT_SALES_COLUMN_IN_SALES_FACT_1997)
81408142

8141-
.withFormatter(UdfTest.FooBarCellFormatter.class.getName())
8143+
.withFormatter(FormatterUtil.FooBarCellFormatter.class.getName())
81428144
.withMeasureGroup(mg)
81438145
.build()));
81448146
}
@@ -9426,7 +9428,7 @@ protected List<? extends MeasureGroupMapping> physicalCubeMeasureGroups(Physical
94269428
.withColumn(FoodmartMappingSupplier.UNIT_SALES_COLUMN_IN_SALES_FACT_1997)
94279429

94289430
.withFormatString("Standard")
9429-
.withFormatter(UdfTest.FooBarCellFormatter.class.getName())
9431+
.withFormatter(FormatterUtil.FooBarCellFormatter.class.getName())
94309432
.build()));
94319433
}
94329434
return result;
@@ -9501,7 +9503,7 @@ protected List<? extends CalculatedMemberMapping> cubeCalculatedMembers(CubeMapp
95019503
.withCalculatedMemberProperties(List.of(
95029504
CalculatedMemberPropertyMappingImpl.builder()
95039505
.withName("CELL_FORMATTER")
9504-
.withValue(UdfTest.FooBarCellFormatter.class.getName())
9506+
.withValue(FormatterUtil.FooBarCellFormatter.class.getName())
95059507
.build()
95069508
))
95079509
.build());
@@ -9535,7 +9537,7 @@ protected List<? extends CalculatedMemberMapping> cubeCalculatedMembers(CubeMapp
95359537
.withFormula("[Measures].[Unit Sales]")
95369538
//.dimension("Measures")
95379539
.withCellFormatter(CellFormatterMappingImpl.builder()
9538-
.withRef(UdfTest.FooBarCellFormatter.class.getName())
9540+
.withRef(FormatterUtil.FooBarCellFormatter.class.getName())
95399541
.build())
95409542
.build());
95419543
}
@@ -9622,7 +9624,7 @@ protected List<? extends DimensionConnectorMapping> cubeDimensionConnectors(Cube
96229624
.withUniqueMembers(true)
96239625
//.withFormatter(UdfTest.FooBarMemberFormatter.class.getName())
96249626
.withMemberFormatter(MemberFormatterMappingImpl.builder()
9625-
.withRef(UdfTest.FooBarMemberFormatter.class.getName())
9627+
.withRef(FormatterUtil.FooBarMemberFormatter.class.getName())
96269628
.build())
96279629
.build()
96289630
))
@@ -9746,7 +9748,7 @@ protected List<? extends DimensionConnectorMapping> cubeDimensionConnectors(Cube
97469748
MemberPropertyMappingImpl.builder()
97479749
.withName("Medium")
97489750
.withColumn(FoodmartMappingSupplier.MEDIA_TYPE_COLUMN_IN_PROMOTION)
9749-
.withFormatter(MemberPropertyFormatterMappingImpl.builder().withRef(UdfTest.FooBarPropertyFormatter.class.getName()).build())
9751+
.withFormatter(MemberPropertyFormatterMappingImpl.builder().withRef(FormatterUtil.FooBarPropertyFormatter.class.getName()).build())
97509752
.build()
97519753
))
97529754
.build()
@@ -9811,7 +9813,7 @@ protected List<? extends DimensionConnectorMapping> cubeDimensionConnectors(Cube
98119813
MemberPropertyMappingImpl.builder()
98129814
.withName("Medium")
98139815
.withColumn(FoodmartMappingSupplier.MEDIA_TYPE_COLUMN_IN_PROMOTION)
9814-
.withFormatter(MemberPropertyFormatterMappingImpl.builder().withRef(UdfTest.FooBarPropertyFormatter.class.getName()).build())
9816+
.withFormatter(MemberPropertyFormatterMappingImpl.builder().withRef(FormatterUtil.FooBarPropertyFormatter.class.getName()).build())
98159817
.build()
98169818
))
98179819
.build()
@@ -10045,34 +10047,34 @@ protected List<MappingUserDefinedFunction> schemaUserDefinedFunctions(MappingSch
1004510047
*/
1004610048
}
1004710049

10048-
public static class UdfTestModifier17 extends PojoMappingModifier {
10049-
10050-
/*
10051-
"<UserDefinedFunction name=\"Reverse\" className=\""
10052-
+ functionClass.getName()
10053-
+ "\"/>\n");
10054-
*/
10055-
10056-
private final Class<? extends UdfTest.ReverseFunction> functionClass;
10057-
10058-
public UdfTestModifier17(CatalogMapping catalog, final Class<? extends UdfTest.ReverseFunction> functionClass) {
10059-
super(catalog);
10060-
this.functionClass = functionClass;
10061-
}
10062-
10063-
/* TODO: UserDefinedFunction
10064-
@Override
10065-
protected List<MappingUserDefinedFunction> schemaUserDefinedFunctions(MappingSchema schema) {
10066-
List<MappingUserDefinedFunction> result = new ArrayList<>();
10067-
result.addAll(super.schemaUserDefinedFunctions(schema).stream().filter(f -> !"Reverse".equals(f.name())).toList());
10068-
result.add(UserDefinedFunctionRBuilder.builder()
10069-
.name("Reverse")
10070-
.className(functionClass.getName())
10071-
.build());
10072-
return result;
10073-
}
10074-
*/
10075-
}
10050+
// public static class UdfTestModifier17 extends PojoMappingModifier {
10051+
//
10052+
// /*
10053+
// "<UserDefinedFunction name=\"Reverse\" className=\""
10054+
// + functionClass.getName()
10055+
// + "\"/>\n");
10056+
// */
10057+
//
10058+
// private final Class<? extends FormatterUtil.ReverseFunction> functionClass;
10059+
//
10060+
// public UdfTestModifier17(CatalogMapping catalog, final Class<? extends FormatterUtil.ReverseFunction> functionClass) {
10061+
// super(catalog);
10062+
// this.functionClass = functionClass;
10063+
// }
10064+
//
10065+
// /* TODO: UserDefinedFunction
10066+
// @Override
10067+
// protected List<MappingUserDefinedFunction> schemaUserDefinedFunctions(MappingSchema schema) {
10068+
// List<MappingUserDefinedFunction> result = new ArrayList<>();
10069+
// result.addAll(super.schemaUserDefinedFunctions(schema).stream().filter(f -> !"Reverse".equals(f.name())).toList());
10070+
// result.add(UserDefinedFunctionRBuilder.builder()
10071+
// .name("Reverse")
10072+
// .className(functionClass.getName())
10073+
// .build());
10074+
// return result;
10075+
// }
10076+
// */
10077+
// }
1007610078

1007710079
public static class UdfTestModifier18 extends PojoMappingModifier {
1007810080

0 commit comments

Comments
 (0)