Skip to content

Allow registering multiple InvoicedItemsProcessingService impls #917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-adam wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Allow registering multiple InvoicedItemsProcessingService impls #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c511fab
Allow registering multiple InvoicedItemsProcessingService impls
labkey-adam Feb 14, 2026
70a9e8b
Fix module memory leaks caused by GoogleDriveModule
labkey-adam Feb 15, 2026
57e9aed
Avoid webpart conflict by deleting them both
labkey-adam Feb 15, 2026
c9669c7
Address some warnings
labkey-adam Feb 16, 2026
37222f3
Move back to init()
labkey-adam Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions GoogleDrive/src/org/labkey/googledrive/GoogleDriveModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
import java.util.Set;

public class GoogleDriveModule extends ExtendedSimpleModule {
@Override
public boolean hasScripts() {
return true;
}

@Override
@NotNull
protected Collection<WebPartFactory> createWebPartFactories() {
Expand All @@ -34,16 +29,15 @@ protected void init() {

GoogleDriveService.set(new GoogleDriveServiceImpl());

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

// Ensure that we're enabled in the home module, since we'll use that for our queries.
if (ModuleLoader.getInstance().shouldInsertData())
{
Set<Module> homeModules = new HashSet<>(home.getActiveModules());
if (!homeModules.contains(thisModule))
if (!homeModules.contains(this))
{
homeModules.add(thisModule);
homeModules.add(this);
home.setActiveModules(homeModules);
}
}
Expand All @@ -66,7 +60,7 @@ public void registerSchemas() {
DefaultSchema.registerProvider(GoogleDriveSchema.NAME, new DefaultSchema.SchemaProvider(this) {
@Override
public QuerySchema createSchema(final DefaultSchema schema, Module module) {
return (QuerySchema) new GoogleDriveSchema(schema.getUser(), schema.getContainer());
return new GoogleDriveSchema(schema.getUser(), schema.getContainer());
}
});
}
Expand Down
3 changes: 3 additions & 0 deletions WNPRC_Compliance/src/org/labkey/wnprc_compliance/WNPRC_ComplianceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@ public Object execute(CardExemptForm form, BindException errors) throws Exceptio
@RequiresPermission(ComplianceAdminPermission.class)
@Marshal(Marshaller.Jackson)
public class GetPersonFromCardAPI extends ReadOnlyApiAction<SearchPersonFromCardForm> {
@Override
public Object execute(SearchPersonFromCardForm form, BindException errors) throws Exception {
JSONObject json = new JSONObject();
Map<String, List<JSONObject>> results = new HashMap<>();
Expand Down Expand Up @@ -443,6 +444,7 @@ public Object execute(SearchPersonFromCardForm form, BindException errors) throw
@Marshal(Marshaller.Jackson)
@CSRF(CSRF.Method.NONE)
public class GetClearancesFromPerson extends ReadOnlyApiAction<SearchClearanceFromPersonForm> {
@Override
public Object execute(SearchClearanceFromPersonForm form, BindException errors)
{

Expand Down Expand Up @@ -526,6 +528,7 @@ public Object execute(Clearances form, BindException errors) throws Exception {
@Marshal(Marshaller.Jackson)
@CSRF(CSRF.Method.NONE)
public class GetMeaslesClearanceFromPerson extends ReadOnlyApiAction<SearchPersonFromCardForm> {
@Override
public Object execute(SearchPersonFromCardForm form, BindException errors)
{
JSONObject json = new JSONObject();
Expand Down
8 changes: 1 addition & 7 deletions WNPRC_Compliance/src/org/labkey/wnprc_compliance/WNPRC_ComplianceModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.labkey.api.data.Container;
import org.labkey.api.ldk.ExtendedSimpleModule;
import org.labkey.api.module.Module;
import org.labkey.api.module.ModuleContext;
import org.labkey.api.query.DefaultSchema;
import org.labkey.api.query.QuerySchema;
import org.labkey.api.security.roles.RoleManager;
Expand All @@ -17,11 +16,6 @@
import java.util.Set;

public class WNPRC_ComplianceModule extends ExtendedSimpleModule {
@Override
public boolean hasScripts() {
return true;
}

@Override
@NotNull
protected Collection<WebPartFactory> createWebPartFactories() {
Expand Down Expand Up @@ -52,7 +46,7 @@ public void registerSchemas() {
DefaultSchema.registerProvider(WNPRC_ComplianceSchema.NAME, new DefaultSchema.SchemaProvider(this) {
@Override
public QuerySchema createSchema(final DefaultSchema schema, Module module) {
return (QuerySchema) new WNPRC_ComplianceSchema(schema.getUser(), schema.getContainer());
return new WNPRC_ComplianceSchema(schema.getUser(), schema.getContainer());
}
});
}
Expand Down
24 changes: 10 additions & 14 deletions WNPRC_EHR/src/org/labkey/wnprc_ehr/WNPRC_EHRModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ public class WNPRC_EHRModule extends ExtendedSimpleModule
*/
private boolean loadOnStart = false;

@Override
public String getName()
{
return NAME;
Expand All @@ -185,11 +186,6 @@ public String getName()
return forceUpdate ? Double.POSITIVE_INFINITY : 22.010;
}

@Override
public boolean hasScripts() {
return true;
}

@Override
protected void init() {
addController(CONTROLLER_NAME, WNPRC_EHRController.class);
Expand All @@ -202,16 +198,16 @@ protected void init() {
registerPermissions();
}

@Override
@NotNull
protected Collection<WebPartFactory> createWebPartFactories()
{
return new ArrayList<>(Arrays.asList(waterCalendarWebPart));
}
@Override
@NotNull
protected Collection<WebPartFactory> createWebPartFactories()
{
return new ArrayList<>(Arrays.asList(waterCalendarWebPart));
}

@Override
protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
{
@Override
protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
{
ModuleUpdate.onStartup(moduleContext, this);

EHRService.get().registerModule(this);
Expand Down
1 change: 0 additions & 1 deletion WNPRC_r24/resources/views/welcome.html
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions WNPRC_r24/resources/views/welcome.view.xml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions WNPRC_r24/resources/views/welcome.webpart.xml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions WNPRC_r24/src/org/labkey/wnprc_r24/wnprc_r24Module.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public void doStartup(ModuleContext moduleContext)
final DbSchema dbSchema = DbSchema.get(schemaName, DbSchemaType.Module);
DefaultSchema.registerProvider(dbSchema.getQuerySchemaName(), new DefaultSchema.SchemaProvider(this)
{
@Override
public QuerySchema createSchema(final DefaultSchema schema, Module module)
{
DbSchema dbSchema = DbSchema.get(schemaName, DbSchemaType.Module);
Expand Down
1 change: 1 addition & 0 deletions WNPRC_u24/src/org/labkey/wnprc_u24/wnprc_u24Module.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public void doStartup(ModuleContext moduleContext)
final DbSchema dbSchema = DbSchema.get(schemaName, DbSchemaType.Module);
DefaultSchema.registerProvider(dbSchema.getQuerySchemaName(), new DefaultSchema.SchemaProvider(this)
{
@Override
public QuerySchema createSchema(final DefaultSchema schema, Module module)
{
DbSchema dbSchema = DbSchema.get(schemaName, DbSchemaType.Module);
Expand Down
13 changes: 3 additions & 10 deletions wnprc_billing/src/org/labkey/wnprc_billing/WNPRC_BillingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,16 @@
import org.labkey.api.query.DefaultSchema;
import org.labkey.api.query.QuerySchema;
import org.labkey.api.security.roles.RoleManager;
import org.labkey.api.services.ServiceRegistry;
import org.labkey.api.view.WebPartFactory;
import org.labkey.wnprc_billing.dataentry.ChargesFormType;
import org.labkey.wnprc_billing.dataentry.NonAnimalChargesFormType;
import org.labkey.wnprc_billing.notification.WNPRCBillingNotificationProvider;
import org.labkey.wnprc_billing.pipeline.BillingPipelineProvider;
import org.labkey.wnprc_billing.pipeline.InvoicedItemsProcessingServiceImpl;
import org.labkey.wnprc_billing.query.WNPRC_BillingUserSchema;
import org.labkey.wnprc_billing.table.WNPRC_BillingCustomizer;
import org.labkey.wnprc_billing.security.permissions.EHRFinanceAdminPermission;
import org.labkey.wnprc_billing.security.roles.EHRFinanceAdmin;
import org.labkey.wnprc_billing.table.WNPRC_BillingCustomizer;

import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -69,12 +68,6 @@ public String getName()
return 22.000;
}

@Override
public boolean hasScripts()
{
return true;
}

@Override
@NotNull
protected Collection<WebPartFactory> createWebPartFactories()
Expand All @@ -86,7 +79,7 @@ protected Collection<WebPartFactory> createWebPartFactories()
protected void init()
{
addController(WNPRC_BillingController.NAME, WNPRC_BillingController.class);
ServiceRegistry.get().registerService(InvoicedItemsProcessingService.class, new InvoicedItemsProcessingServiceImpl());
InvoicedItemsProcessingService.register(this, new InvoicedItemsProcessingServiceImpl());
BillingNotificationService.get().registerBillingNotificationProvider(WNPRCBillingNotificationProvider.get());

registerRoles();
Expand Down Expand Up @@ -122,7 +115,7 @@ protected void registerSchemas()
@Override
public QuerySchema createSchema(final DefaultSchema schema, Module module)
{
return new WNPRC_BillingUserSchema(WNPRC_BillingSchema.NAME, null, schema.getUser(), schema.getContainer(), WNPRC_BillingSchema.getInstance().getSchema());
return new WNPRC_BillingUserSchema(WNPRC_BillingSchema.NAME, null, schema.getUser(), schema.getContainer(), WNPRC_BillingSchema.getSchema());
}
});
}
Expand Down