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

Commit dff3029

Browse files
MartyBurnsMartyBurns
committed
Merge remote-tracking branch 'upstream/master'
2 parents ef95331 + 051d9da commit dff3029

26 files changed

+204
-32
lines changed

‎src/main/java/org/energyos/espi/common/domain/ApplicationInformation.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,11 @@
149149
"thirdPartyApplicationName"
150150
})
151151
@Entity
152-
@Table(name = "application_information", uniqueConstraints = {@UniqueConstraint(columnNames = {"dataCustodianId", "clientID"})})
152+
@Table(name = "application_information")
153153
@XmlJavaTypeAdapter(ApplicationInformationAdapter.class)
154154
@NamedQueries(value = {
155-
@NamedQuery(name = ApplicationInformation.QUERY_FIND_BY_ID, query = "SELECT info FROM ApplicationInformation info WHERE info.id = :id"),
155+
@NamedQuery(name = ApplicationInformation.QUERY_FIND_BY_ID, query = "SELECT appinfo FROM ApplicationInformation appinfo WHERE appinfo.id = :id"),
156+
@NamedQuery(name = ApplicationInformation.QUERY_FIND_BY_UUID, query = "SELECT appinfo FROM ApplicationInformation appinfo WHERE appinfo.uuid = :uuid"),
156157
@NamedQuery(name = ApplicationInformation.QUERY_FIND_BY_CLIENT_ID, query = "SELECT info FROM ApplicationInformation info WHERE info.clientId = :clientId"),
157158
@NamedQuery(name = ApplicationInformation.QUERY_FIND_BY_DATA_CUSTODIAN_CLIENT_ID, query = "SELECT info FROM ApplicationInformation info WHERE info.dataCustodianId = :dataCustodianId"),
158159
@NamedQuery(name = ApplicationInformation.QUERY_FIND_ALL, query = "SELECT info FROM ApplicationInformation info"),
@@ -167,6 +168,7 @@ public class ApplicationInformation
167168
*/
168169
private static final long serialVersionUID = 1L;
169170
public final static String QUERY_FIND_ALL = "ApplicationInformation.findAll";
171+
public final static String QUERY_FIND_BY_UUID = "ApplicationInformation.findByUUID";
170172
public static final String QUERY_FIND_BY_ID = "ApplicationInformation.findById";
171173
public static final String QUERY_FIND_BY_CLIENT_ID = "ApplicationInformation.findByClientId";
172174
public static final String QUERY_FIND_BY_DATA_CUSTODIAN_CLIENT_ID = "ApplicationInformation.findByDataCustodianClientId";
@@ -272,9 +274,12 @@ public class ApplicationInformation
272274

273275

274276
@Size(min = 2, max = 64)
277+
@XmlElement(name = "dataCustodianId")
275278
protected String dataCustodianId;
279+
276280
@NotEmpty
277281
@Size(min = 2, max = 64)
282+
@XmlElement(name = "thirdPartyApplicationName")
278283
protected String thirdPartyApplicationName;
279284

280285

‎src/main/java/org/energyos/espi/common/domain/Authorization.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@
105105
@Table(name = "authorizations")
106106
@XmlJavaTypeAdapter(AuthorizationAdapter.class)
107107
@NamedQueries(value = {
108+
@NamedQuery(name = Authorization.QUERY_FIND_BY_ID, query = "SELECT authorization FROM Authorization authorization WHERE authorization.id = :id"),
109+
@NamedQuery(name = Authorization.QUERY_FIND_BY_UUID, query = "SELECT authorization FROM Authorization authorization WHERE authorization.uuid = :uuid"),
108110
@NamedQuery(name = Authorization.QUERY_FIND_BY_RETAIL_CUSTOMER_ID,
109111
query = "SELECT authorization FROM Authorization authorization WHERE authorization.retailCustomer.id = :retailCustomerId AND authorization.subscriptionURI IS NOT NULL"),
110112
@NamedQuery(name = Authorization.QUERY_FIND_BY_STATE,
@@ -115,6 +117,8 @@
115117
public class Authorization
116118
extends IdentifiedObject {
117119

120+
public final static String QUERY_FIND_BY_UUID = "Authorization.findByUUID";
121+
public static final String QUERY_FIND_BY_ID = "Authorization.findById";
118122
public static final String QUERY_FIND_BY_RETAIL_CUSTOMER_ID = "Authorization.findAllByRetailCustomerId";
119123
public static final String QUERY_FIND_BY_STATE = "Authorization.findByState";
120124
public static final String QUERY_FIND_ALL_IDS = "Authorization.findAllIds";

‎src/main/java/org/energyos/espi/common/domain/ElectricPowerQualitySummary.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,5 +494,8 @@ public void merge(IdentifiedObject resource) {
494494
this.supplyVoltageVariations = ((ElectricPowerQualitySummary)resource).supplyVoltageVariations;
495495
this.supplyVoltageImbalance = ((ElectricPowerQualitySummary)resource).supplyVoltageImbalance;
496496
this.tempOvervoltage = ((ElectricPowerQualitySummary)resource).tempOvervoltage;
497+
if (((ElectricPowerQualitySummary)resource).usagePoint != null) {
498+
this.usagePoint = ((ElectricPowerQualitySummary)resource).usagePoint;
499+
}
497500
}
498501
}

‎src/main/java/org/energyos/espi/common/domain/ElectricPowerUsageSummary.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,6 @@ public void setUpResource(IdentifiedObject resource) {
728728
@Override
729729
public void merge(IdentifiedObject resource) {
730730
super.merge(resource);
731-
ElectricPowerUsageSummary newUsagePoint = (ElectricPowerUsageSummary)resource;
732731
this.billingPeriod = ((ElectricPowerUsageSummary)resource).billingPeriod;
733732
this.billLastPeriod = ((ElectricPowerUsageSummary)resource).billLastPeriod;
734733
this.billToDate = ((ElectricPowerUsageSummary)resource).billToDate;
@@ -748,6 +747,8 @@ public void merge(IdentifiedObject resource) {
748747
this.ratchetDemand = ((ElectricPowerUsageSummary)resource).ratchetDemand;
749748
this.ratchetDemandPeriod = ((ElectricPowerUsageSummary)resource).ratchetDemandPeriod;
750749
this.statusTimeStamp = ((ElectricPowerUsageSummary)resource).statusTimeStamp;
751-
this.usagePoint = ((ElectricPowerUsageSummary)resource).usagePoint;
750+
if (((ElectricPowerUsageSummary)resource).usagePoint != null) {
751+
this.usagePoint = ((ElectricPowerUsageSummary)resource).usagePoint;
752+
}
752753
}
753754
}

‎src/main/java/org/energyos/espi/common/domain/IntervalBlock.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ public void merge(IdentifiedObject resource) {
185185
super.merge(resource);
186186
this.interval = ((IntervalBlock)resource).interval;
187187
this.intervalReadings = ((IntervalBlock)resource).intervalReadings;
188-
this.meterReading = ((IntervalBlock)resource).meterReading;
188+
if (((IntervalBlock)resource).meterReading != null){
189+
this.meterReading = ((IntervalBlock)resource).meterReading;
190+
}
189191
}
190192
}

‎src/main/java/org/energyos/espi/common/domain/MeterReading.java‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@ public void addIntervalBlock(IntervalBlock intervalBlock) {
116116
intervalBlocks.add(intervalBlock);
117117
}
118118

119+
public void removeIntervalBlock(IntervalBlock intervalBlock) {
120+
intervalBlock.setMeterReading(null);
121+
intervalBlocks.remove(intervalBlock);
122+
}
123+
119124
public ReadingType getReadingType() {
120125
return readingType;
121126
}
@@ -124,6 +129,10 @@ public void setReadingType(ReadingType readingType) {
124129
this.readingType = readingType;
125130
}
126131

132+
public void removeReadingType(ReadingType readingType) {
133+
this.readingType = null;
134+
}
135+
127136
public List<IntervalBlock> getIntervalBlocks() {
128137
return intervalBlocks;
129138
}
@@ -159,8 +168,17 @@ public void setRelatedLinks(List<LinkType> relatedLinks) {
159168
@Override
160169
public void merge(IdentifiedObject resource) {
161170
super.merge(resource);
162-
this.intervalBlocks = ((MeterReading)resource).intervalBlocks;
163-
this.readingType = ((MeterReading)resource).readingType;
164-
this.usagePoint = ((MeterReading)resource).usagePoint;
171+
if (((MeterReading)resource).intervalBlocks != null) {
172+
this.intervalBlocks = ((MeterReading)resource).intervalBlocks;
173+
}
174+
if (((MeterReading)resource).intervalBlocks != null) {
175+
this.intervalBlocks = ((MeterReading)resource).intervalBlocks;
176+
}
177+
if (((MeterReading)resource).readingType != null) {
178+
this.readingType = ((MeterReading)resource).readingType;
179+
}
180+
if (((MeterReading)resource).usagePoint != null) {
181+
this.usagePoint = ((MeterReading)resource).usagePoint;
182+
}
165183
}
166184
}

‎src/main/java/org/energyos/espi/common/domain/Subscription.java‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@
6161
@Table(name = "subscriptions")
6262
@XmlJavaTypeAdapter(SubscriptionAdapter.class)
6363
@NamedQueries(value = {
64+
@NamedQuery(name = Subscription.QUERY_FIND_BY_ID, query = "SELECT subscription FROM Subscription subscription WHERE subscription.id = :id"),
65+
@NamedQuery(name = Subscription.QUERY_FIND_BY_UUID, query = "SELECT subscription FROM Subscription subscription WHERE subscription.uuid = :uuid"),
6466
@NamedQuery(name = Subscription.QUERY_FIND_ALL, query = "SELECT subscription FROM Subscription subscription"),
6567
@NamedQuery(name = Subscription.QUERY_FIND_BY_HASHED_ID, query = "SELECT subscription FROM Subscription subscription WHERE subscription.hashedId = :hashedId"),
6668
@NamedQuery(name = Subscription.QUERY_FIND_ALL_IDS, query = "SELECT subscription.id FROM Subscription subscription")
@@ -69,7 +71,9 @@
6971
public class Subscription
7072
extends IdentifiedObject {
7173

72-
public final static String QUERY_FIND_ALL = "Subscription.findAll";
74+
public final static String QUERY_FIND_BY_UUID = "Subscription.findByUUID";
75+
public static final String QUERY_FIND_BY_ID = "Subscription.findById";
76+
public final static String QUERY_FIND_ALL = "Subscription.findAll";
7377
public final static String QUERY_FIND_BY_HASHED_ID = "Subscription.findByHashedID";
7478
public static final String QUERY_FIND_ALL_IDS = "Subscription.findAllIds";
7579

@@ -130,11 +134,15 @@ public Calendar getLastUpdate() {
130134
public Set<UsagePoint> getUsagePoints() {
131135
return usagePoints;
132136
}
133-
137+
134138
public void setUsagePoints(Set<UsagePoint> usagePoints) {
135139
this.usagePoints = usagePoints;
136140
}
137141

142+
public void removeUsagePoint(UsagePoint up) {
143+
usagePoints.remove(up);
144+
}
145+
138146
public Authorization getAuthorization() {
139147
return authorization;
140148
}
@@ -146,10 +154,20 @@ public void setAuthorization(Authorization authorization) {
146154
@Override
147155
public void merge(IdentifiedObject resource) {
148156
super.merge(resource);
149-
this.applicationInformation = ((Subscription)resource).applicationInformation;
150-
this.authorization = ((Subscription)resource).authorization;
151-
this.lastUpdate = ((Subscription)resource).lastUpdate;
152-
this.retailCustomer = ((Subscription)resource).retailCustomer;
153-
this.usagePoints = ((Subscription)resource).usagePoints;
157+
if (((Subscription)resource).applicationInformation != null) {
158+
this.applicationInformation = ((Subscription)resource).applicationInformation;
159+
}
160+
if (((Subscription)resource).authorization != null){
161+
this.authorization = ((Subscription)resource).authorization;
162+
}
163+
if (((Subscription)resource).lastUpdate != null) {
164+
this.lastUpdate = ((Subscription)resource).lastUpdate;
165+
}
166+
if (((Subscription)resource).retailCustomer != null) {
167+
this.retailCustomer = ((Subscription)resource).retailCustomer;
168+
}
169+
if (((Subscription)resource).usagePoints != null) {
170+
this.usagePoints = ((Subscription)resource).usagePoints;
171+
}
154172
}
155173
}

‎src/main/java/org/energyos/espi/common/domain/UsagePoint.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,12 @@ public void addMeterReading(MeterReading meterReading)
163163
meterReadings.add(meterReading);
164164
}
165165

166+
public void removeMeterReading(MeterReading meterReading)
167+
{
168+
meterReading.setUsagePoint(null);
169+
meterReadings.remove(meterReading);
170+
}
171+
166172
@XmlTransient
167173
@ManyToOne
168174
@JoinColumn(name="retail_customer_id")
@@ -276,10 +282,20 @@ public void addElectricPowerUsageSummary(ElectricPowerUsageSummary electricPower
276282
electricPowerUsageSummaries.add(electricPowerUsageSummary);
277283
}
278284

285+
public void removeElectricPowerUsageSummary(ElectricPowerUsageSummary electricPowerUsageSummary) {
286+
electricPowerUsageSummary.setUsagePoint(null);
287+
electricPowerUsageSummaries.remove(electricPowerUsageSummary);
288+
}
289+
279290
public List<ElectricPowerQualitySummary> getElectricPowerQualitySummaries() {
280291
return electricPowerQualitySummaries;
281292
}
282293

294+
public void removeElectricPowerQualitySummary(ElectricPowerQualitySummary electricPowerQualitySummary) {
295+
electricPowerQualitySummary.setUsagePoint(null);
296+
electricPowerQualitySummaries.remove(electricPowerQualitySummary);
297+
}
298+
283299
public void setElectricPowerQualitySummaries(List<ElectricPowerQualitySummary> electricPowerQualitySummaries) {
284300
this.electricPowerQualitySummaries = electricPowerQualitySummaries;
285301
}
@@ -332,6 +348,15 @@ public void setSubscriptions(Set<Subscription> subscriptions) {
332348
this.subscriptions = subscriptions;
333349
}
334350

351+
public void addSubscription(Subscription subscription){
352+
this.subscriptions.add(subscription);
353+
}
354+
355+
public void removeSubscription(Subscription subscription) {
356+
this.subscriptions.remove(subscription);
357+
subscription.removeUsagePoint(this);
358+
}
359+
335360
public void setRelatedLinks(List<LinkType> relatedLinks) {
336361
this.relatedLinks = relatedLinks;
337362
}

‎src/main/java/org/energyos/espi/common/models/atom/ContentType.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,12 @@ public IdentifiedObject getResource() {
386386
return getElectricPowerQualitySummary();
387387
} else if (getReadingType() != null) {
388388
return getReadingType();
389+
} else if (getApplicationInformation() != null) {
390+
return getApplicationInformation();
391+
} else if (getAuthorization() != null) {
392+
return getAuthorization();
393+
} else if (getSubscription() != null) {
394+
return getSubscription();
389395
}
390396
return null;
391397
}

‎src/main/java/org/energyos/espi/common/repositories/ApplicationInformationRepository.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.energyos.espi.common.domain.ApplicationInformation;
2020

2121
import java.util.List;
22+
import java.util.UUID;
2223

2324
public interface ApplicationInformationRepository {
2425

@@ -35,4 +36,6 @@ public interface ApplicationInformationRepository {
3536
public ApplicationInformation findById(Long applicationInformationId);
3637

3738
public void persist(ApplicationInformation applicationInformation);
39+
40+
ApplicationInformation findByUUID(UUID uuid);
3841
}

0 commit comments

Comments
 (0)