Skip to content

Hold GUID instead of Container #978

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

Merged
labkey-adam merged 1 commit into from
Jun 30, 2025
Merged

Hold GUID instead of Container #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 11 additions & 12 deletions ehr/src/org/labkey/ehr/demographics/AnimalRecordImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
import org.jetbrains.annotations.NotNull;
import org.labkey.api.collections.CaseInsensitiveHashMap;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerManager;
import org.labkey.api.ehr.demographics.AnimalRecord;
import org.labkey.api.ehr.demographics.DemographicsProvider;
import org.labkey.api.query.FieldKey;
import org.labkey.api.util.GUID;

import java.util.Collections;
import java.util.Date;
Expand All @@ -29,27 +31,24 @@

/**
* Immutable cached animal demographic record
*
* User: bimber
* Date: 7/14/13
*/
public class AnimalRecordImpl implements AnimalRecord
{
private Map<String, Object> _props = Collections.unmodifiableMap(new CaseInsensitiveHashMap<>());
private final Container _container;
private Map<String, Object> _props = Collections.emptyMap();
private final GUID _containerId;
private final String _id;
private final Date _created;

private AnimalRecordImpl(Container c, String id)
private AnimalRecordImpl(GUID containerId, String id)
{
_container = c;
_containerId = containerId;
_id = id;
_created = new Date();
}

private AnimalRecordImpl(Container c, String id, Map<String, Object> props)
private AnimalRecordImpl(GUID containerId, String id, Map<String, Object> props)
{
this(c, id);
this(containerId, id);
if (props != null)
{
_props = Collections.unmodifiableMap(new CaseInsensitiveHashMap<>(props));
Expand All @@ -58,13 +57,13 @@ private AnimalRecordImpl(Container c, String id, Map<String, Object> props)

public static AnimalRecordImpl create(Container c, String id, Map<String, Object> props)
{
return new AnimalRecordImpl(c, id, props);
return new AnimalRecordImpl(c.getEntityId(), id, props);
}

@Override
public AnimalRecord createCopy()
{
return new AnimalRecordImpl(getContainer(), getId(), _props);
return new AnimalRecordImpl(_containerId, getId(), _props);
}

public synchronized void update(DemographicsProvider p, Map<String, Object> props)
Expand All @@ -90,7 +89,7 @@ public String getId()
@Override
public Container getContainer()
{
return _container;
return ContainerManager.getForId(_containerId);
}

@Override
Expand Down
5 changes: 0 additions & 5 deletions ehr/src/org/labkey/ehr/demographics/EHRDemographicsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@
import java.util.TreeMap;
import java.util.TreeSet;

/**
* User: bimber
* Date: 9/17/12
* Time: 8:35 PM
*/
public class EHRDemographicsServiceImpl extends EHRDemographicsService
{
private static final Logger _log = LogHelper.getLogger(EHRDemographicsServiceImpl.class, "Demographics caching, refreshing, and consistency checking");
Expand Down