Skip to content

Commit 7825b9b

Browse files
labkey-adamlabkey-adam
authored
Allow registering multiple InvoicedItemsProcessingService impls (#917)
1 parent b5dc3fc commit 7825b9b

10 files changed

Lines changed: 22 additions & 49 deletions

File tree

‎GoogleDrive/src/org/labkey/googledrive/GoogleDriveModule.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
import java.util.Set;
1818

1919
public class GoogleDriveModule extends ExtendedSimpleModule {
20-
@Override
21-
public boolean hasScripts() {
22-
return true;
23-
}
24-
2520
@Override
2621
@NotNull
2722
protected Collection<WebPartFactory> createWebPartFactories() {
@@ -34,16 +29,15 @@ protected void init() {
3429

3530
GoogleDriveService.set(new GoogleDriveServiceImpl());
3631

37-
Module thisModule = ModuleLoader.getInstance().getModule(GoogleDriveModule.class);
3832
Container home = ContainerManager.getHomeContainer();
3933

4034
// Ensure that we're enabled in the home module, since we'll use that for our queries.
4135
if (ModuleLoader.getInstance().shouldInsertData())
4236
{
4337
Set<Module> homeModules = new HashSet<>(home.getActiveModules());
44-
if (!homeModules.contains(thisModule))
38+
if (!homeModules.contains(this))
4539
{
46-
homeModules.add(thisModule);
40+
homeModules.add(this);
4741
home.setActiveModules(homeModules);
4842
}
4943
}
@@ -66,7 +60,7 @@ public void registerSchemas() {
6660
DefaultSchema.registerProvider(GoogleDriveSchema.NAME, new DefaultSchema.SchemaProvider(this) {
6761
@Override
6862
public QuerySchema createSchema(final DefaultSchema schema, Module module) {
69-
return (QuerySchema) new GoogleDriveSchema(schema.getUser(), schema.getContainer());
63+
return new GoogleDriveSchema(schema.getUser(), schema.getContainer());
7064
}
7165
});
7266
}

‎WNPRC_Compliance/src/org/labkey/wnprc_compliance/WNPRC_ComplianceController.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ public Object execute(CardExemptForm form, BindException errors) throws Exceptio
404404
@RequiresPermission(ComplianceAdminPermission.class)
405405
@Marshal(Marshaller.Jackson)
406406
public class GetPersonFromCardAPI extends ReadOnlyApiAction<SearchPersonFromCardForm> {
407+
@Override
407408
public Object execute(SearchPersonFromCardForm form, BindException errors) throws Exception {
408409
JSONObject json = new JSONObject();
409410
Map<String, List<JSONObject>> results = new HashMap<>();
@@ -443,6 +444,7 @@ public Object execute(SearchPersonFromCardForm form, BindException errors) throw
443444
@Marshal(Marshaller.Jackson)
444445
@CSRF(CSRF.Method.NONE)
445446
public class GetClearancesFromPerson extends ReadOnlyApiAction<SearchClearanceFromPersonForm> {
447+
@Override
446448
public Object execute(SearchClearanceFromPersonForm form, BindException errors)
447449
{
448450

@@ -526,6 +528,7 @@ public Object execute(Clearances form, BindException errors) throws Exception {
526528
@Marshal(Marshaller.Jackson)
527529
@CSRF(CSRF.Method.NONE)
528530
public class GetMeaslesClearanceFromPerson extends ReadOnlyApiAction<SearchPersonFromCardForm> {
531+
@Override
529532
public Object execute(SearchPersonFromCardForm form, BindException errors)
530533
{
531534
JSONObject json = new JSONObject();

‎WNPRC_Compliance/src/org/labkey/wnprc_compliance/WNPRC_ComplianceModule.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.labkey.api.data.Container;
55
import org.labkey.api.ldk.ExtendedSimpleModule;
66
import org.labkey.api.module.Module;
7-
import org.labkey.api.module.ModuleContext;
87
import org.labkey.api.query.DefaultSchema;
98
import org.labkey.api.query.QuerySchema;
109
import org.labkey.api.security.roles.RoleManager;
@@ -17,11 +16,6 @@
1716
import java.util.Set;
1817

1918
public class WNPRC_ComplianceModule extends ExtendedSimpleModule {
20-
@Override
21-
public boolean hasScripts() {
22-
return true;
23-
}
24-
2519
@Override
2620
@NotNull
2721
protected Collection<WebPartFactory> createWebPartFactories() {
@@ -52,7 +46,7 @@ public void registerSchemas() {
5246
DefaultSchema.registerProvider(WNPRC_ComplianceSchema.NAME, new DefaultSchema.SchemaProvider(this) {
5347
@Override
5448
public QuerySchema createSchema(final DefaultSchema schema, Module module) {
55-
return (QuerySchema) new WNPRC_ComplianceSchema(schema.getUser(), schema.getContainer());
49+
return new WNPRC_ComplianceSchema(schema.getUser(), schema.getContainer());
5650
}
5751
});
5852
}

‎WNPRC_EHR/src/org/labkey/wnprc_ehr/WNPRC_EHRModule.java‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ public class WNPRC_EHRModule extends ExtendedSimpleModule
175175
*/
176176
private boolean loadOnStart = false;
177177

178+
@Override
178179
public String getName()
179180
{
180181
return NAME;
@@ -185,11 +186,6 @@ public String getName()
185186
return forceUpdate ? Double.POSITIVE_INFINITY : 22.010;
186187
}
187188

188-
@Override
189-
public boolean hasScripts() {
190-
return true;
191-
}
192-
193189
@Override
194190
protected void init() {
195191
addController(CONTROLLER_NAME, WNPRC_EHRController.class);
@@ -202,16 +198,16 @@ protected void init() {
202198
registerPermissions();
203199
}
204200

205-
@Override
206-
@NotNull
207-
protected Collection<WebPartFactory> createWebPartFactories()
208-
{
209-
return new ArrayList<>(Arrays.asList(waterCalendarWebPart));
210-
}
201+
@Override
202+
@NotNull
203+
protected Collection<WebPartFactory> createWebPartFactories()
204+
{
205+
return new ArrayList<>(Arrays.asList(waterCalendarWebPart));
206+
}
211207

212-
@Override
213-
protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
214-
{
208+
@Override
209+
protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
210+
{
215211
ModuleUpdate.onStartup(moduleContext, this);
216212

217213
EHRService.get().registerModule(this);

‎WNPRC_r24/resources/views/welcome.html‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎WNPRC_r24/resources/views/welcome.view.xml‎

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

‎WNPRC_r24/resources/views/welcome.webpart.xml‎

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

‎WNPRC_r24/src/org/labkey/wnprc_r24/wnprc_r24Module.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public void doStartup(ModuleContext moduleContext)
7979
final DbSchema dbSchema = DbSchema.get(schemaName, DbSchemaType.Module);
8080
DefaultSchema.registerProvider(dbSchema.getQuerySchemaName(), new DefaultSchema.SchemaProvider(this)
8181
{
82+
@Override
8283
public QuerySchema createSchema(final DefaultSchema schema, Module module)
8384
{
8485
DbSchema dbSchema = DbSchema.get(schemaName, DbSchemaType.Module);

‎WNPRC_u24/src/org/labkey/wnprc_u24/wnprc_u24Module.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public void doStartup(ModuleContext moduleContext)
7979
final DbSchema dbSchema = DbSchema.get(schemaName, DbSchemaType.Module);
8080
DefaultSchema.registerProvider(dbSchema.getQuerySchemaName(), new DefaultSchema.SchemaProvider(this)
8181
{
82+
@Override
8283
public QuerySchema createSchema(final DefaultSchema schema, Module module)
8384
{
8485
DbSchema dbSchema = DbSchema.get(schemaName, DbSchemaType.Module);

‎wnprc_billing/src/org/labkey/wnprc_billing/WNPRC_BillingModule.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,16 @@
3131
import org.labkey.api.query.DefaultSchema;
3232
import org.labkey.api.query.QuerySchema;
3333
import org.labkey.api.security.roles.RoleManager;
34-
import org.labkey.api.services.ServiceRegistry;
3534
import org.labkey.api.view.WebPartFactory;
3635
import org.labkey.wnprc_billing.dataentry.ChargesFormType;
3736
import org.labkey.wnprc_billing.dataentry.NonAnimalChargesFormType;
3837
import org.labkey.wnprc_billing.notification.WNPRCBillingNotificationProvider;
3938
import org.labkey.wnprc_billing.pipeline.BillingPipelineProvider;
4039
import org.labkey.wnprc_billing.pipeline.InvoicedItemsProcessingServiceImpl;
4140
import org.labkey.wnprc_billing.query.WNPRC_BillingUserSchema;
42-
import org.labkey.wnprc_billing.table.WNPRC_BillingCustomizer;
4341
import org.labkey.wnprc_billing.security.permissions.EHRFinanceAdminPermission;
4442
import org.labkey.wnprc_billing.security.roles.EHRFinanceAdmin;
43+
import org.labkey.wnprc_billing.table.WNPRC_BillingCustomizer;
4544

4645
import java.util.Collection;
4746
import java.util.Collections;
@@ -69,12 +68,6 @@ public String getName()
6968
return 22.000;
7069
}
7170

72-
@Override
73-
public boolean hasScripts()
74-
{
75-
return true;
76-
}
77-
7871
@Override
7972
@NotNull
8073
protected Collection<WebPartFactory> createWebPartFactories()
@@ -86,7 +79,7 @@ protected Collection<WebPartFactory> createWebPartFactories()
8679
protected void init()
8780
{
8881
addController(WNPRC_BillingController.NAME, WNPRC_BillingController.class);
89-
ServiceRegistry.get().registerService(InvoicedItemsProcessingService.class, new InvoicedItemsProcessingServiceImpl());
82+
InvoicedItemsProcessingService.register(this, new InvoicedItemsProcessingServiceImpl());
9083
BillingNotificationService.get().registerBillingNotificationProvider(WNPRCBillingNotificationProvider.get());
9184

9285
registerRoles();
@@ -122,7 +115,7 @@ protected void registerSchemas()
122115
@Override
123116
public QuerySchema createSchema(final DefaultSchema schema, Module module)
124117
{
125-
return new WNPRC_BillingUserSchema(WNPRC_BillingSchema.NAME, null, schema.getUser(), schema.getContainer(), WNPRC_BillingSchema.getInstance().getSchema());
118+
return new WNPRC_BillingUserSchema(WNPRC_BillingSchema.NAME, null, schema.getUser(), schema.getContainer(), WNPRC_BillingSchema.getSchema());
126119
}
127120
});
128121
}

0 commit comments

Comments
 (0)