Skip to content
This repository was archived by the owner on Apr 1, 2026. It is now read-only.

PlatformResources Controller Refactor with Integration Testing for OpenTSDB #312

Merged
adamkorynta merged 8 commits into from
Feb 3, 2025
Merged

PlatformResources Controller Refactor with Integration Testing for OpenTSDB #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7666abd
Refactored PlatformResources Controller, added OpenTSDB integration t…
zack-rma Dec 19, 2024
b881f76
Fixed SiteResources assertion issue
zack-rma Jan 31, 2025
92eff60
Fixed OdcsApiResource bug related to PlatformResources
zack-rma Jan 31, 2025
3111837
Fixed netlist test data, was missing last modified date
zack-rma Jan 31, 2025
e8dd3a6
Updated response codes
zack-rma Jan 31, 2025
51173dd
Updated lastModifyTime handling
zack-rma Feb 1, 2025
126d95b
Updated unit testing for lastModifyTime
zack-rma Feb 1, 2025
102b30f
Updated unit testing for lastModifyTime
zack-rma Feb 3, 2025
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
8 changes: 4 additions & 4 deletions opendcs-rest-api/src/main/java/org/opendcs/odcsapi/opendcs_dep/TestDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import decodes.decoder.DecodedSample;
import decodes.sql.DbKey;
import decodes.tsdb.DbIoException;
import decodes.tsdb.TimeSeriesDb;
import ilex.util.Logger;
import ilex.var.TimedVariable;
import opendcs.dai.DataTypeDAI;
Expand Down Expand Up @@ -359,10 +360,9 @@ private static synchronized void initDecodes(OpenDcsDatabase db)
if (decodes.db.Database.getDb() == null)
decodes.db.Database.setDb(new decodes.db.Database());

try (DataTypeDAI dtDAO = db.getDao(DataTypeDAI.class)
.orElseThrow(() -> new UnsupportedOperationException("TestDecodes is not supported"));
EnumDAI enumDAO = db.getDao(EnumDAI.class)
.orElseThrow(() -> new UnsupportedOperationException("TestDecodes is not supported")))
try (DataTypeDAI dtDAO = db.getLegacyDatabase(TimeSeriesDb.class)
.orElseThrow(() -> new UnsupportedOperationException("TestDecodes is not supported")).makeDataTypeDAO();
EnumDAI enumDAO = db.getLegacyDatabase(TimeSeriesDb.class).orElseThrow(() -> new UnsupportedOperationException("TestDecodes is not supported")).makeEnumDAO())
{
enumDAO.readEnumList(decodes.db.Database.getDb().enumList);
dtDAO.readDataTypeSet(decodes.db.Database.getDb().dataTypeSet);
Expand Down
Loading