Fix Location inheritance architecture for ESPI compliance

Updated Location.java to @MappedSuperclass pattern removing IdentifiedObject extension.
ServiceLocationEntity now extends IdentifiedObject directly with Location fields via composition.
This ensures only actual ESPI resources extend IdentifiedObject while Location serves as field grouping utility.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: dfcoffin

.claude/settings.local.json

@@ -7,7 +7,10 @@
       "Bash(git -C /Users/donal/Git/GreenButtonAlliance/OpenESPI-GreenButton-Workspace/OpenESPI-AuthorizationServer-java add src/main/resources/db/migration/mysql/V6_0_0__add_certificate_authentication_support.sql)",
       "WebFetch(domain:www.naesb.org)",
       "Bash(./mvnw compile:*)",
-      "Bash(grep:*)"
+      "Bash(grep:*)",
+      "WebFetch(domain:github.com)",
+      "Bash(git remote get-url:*)",
+      "Bash(git fetch:*)"
     ],
     "deny": []
   }

src/main/java/org/greenbuttonalliance/espi/common/domain/customer/entity/Asset.java

@@ -24,9 +24,9 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.greenbuttonalliance.espi.common.domain.common.IdentifiedObject;
 
 import jakarta.persistence.*;
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -35,13 +35,18 @@
  * Tangible resource of the utility, including power system equipment, various end devices, 
  * cabinets, buildings, etc. Asset description places emphasis on the physical characteristics 
  * of the equipment fulfilling that role.
+ * 
+ * This is a @MappedSuperclass that provides asset-specific fields but does not extend IdentifiedObject.
+ * Actual ESPI resource entities that represent assets should extend IdentifiedObject directly.
  */
 @MappedSuperclass
 @Data
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode
 @NoArgsConstructor
-@ToString(callSuper = true)
-public abstract class Asset extends IdentifiedObject {
+@ToString
+public abstract class Asset implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * Utility-specific classification of Asset and its subtypes, according to their corporate standards, 

src/main/java/org/greenbuttonalliance/espi/common/domain/customer/entity/EndDeviceEntity.java

@@ -24,8 +24,10 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
+import org.greenbuttonalliance.espi.common.domain.common.IdentifiedObject;
 
 import jakarta.persistence.*;
+import java.math.BigDecimal;
 
 /**
  * Pure JPA/Hibernate entity for EndDevice without JAXB concerns.
@@ -39,16 +41,98 @@
  * There may be a related end device function that identifies a sensor or control point within a metering 
  * application or communications systems (e.g., water, gas, electricity).
  * Some devices may use an optical port that conforms to the ANSI C12.18 standard for communications.
+ * 
+ * This is an actual ESPI resource entity that extends IdentifiedObject directly.
  */
 @Entity
 @Table(name = "end_devices", uniqueConstraints = {
-    @UniqueConstraint(columnNames = {"uuid"})
+    @UniqueConstraint(columnNames = {"id"})
 })
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @ToString(callSuper = true)
-public class EndDeviceEntity extends AssetContainer {
+public class EndDeviceEntity extends IdentifiedObject {
+
+    // Asset fields (previously inherited from Asset superclass)
+    
+    /**
+     * Utility-specific classification of Asset and its subtypes, according to their corporate standards, 
+     * practices, and existing IT systems (e.g., for management of assets, maintenance, work, outage, customers, etc.).
+     */
+    @Column(name = "type", length = 256)
+    private String type;
+
+    /**
+     * Uniquely tracked commodity (UTC) number.
+     */
+    @Column(name = "utc_number", length = 256)
+    private String utcNumber;
+
+    /**
+     * Serial number of this asset.
+     */
+    @Column(name = "serial_number", length = 256)
+    private String serialNumber;
+
+    /**
+     * Lot number for this asset. Even for the same model and version number, many assets are manufactured in lots.
+     */
+    @Column(name = "lot_number", length = 256)
+    private String lotNumber;
+
+    /**
+     * Purchase price of asset.
+     */
+    @Column(name = "purchase_price")
+    private Long purchasePrice;
+
+    /**
+     * True if asset is considered critical for some reason (for example, a pole with critical attachments).
+     */
+    @Column(name = "critical")
+    private Boolean critical;
+
+    /**
+     * Electronic address.
+     */
+    @Embedded
+    private Organisation.ElectronicAddress electronicAddress;
+
+    /**
+     * Lifecycle dates for this asset.
+     */
+    @Embedded
+    private Asset.LifecycleDate lifecycle;
+
+    /**
+     * Information on acceptance test.
+     */
+    @Embedded
+    private Asset.AcceptanceTest acceptanceTest;
+
+    /**
+     * Condition of asset in inventory or at time of installation. Examples include new, rebuilt, 
+     * overhaul required, other. Refer to inspection data for information on the most current condition of the asset.
+     */
+    @Column(name = "initial_condition", length = 256)
+    private String initialCondition;
+
+    /**
+     * Whenever an asset is reconditioned, percentage of expected life for the asset when it was new; zero for new devices.
+     */
+    @Column(name = "initial_loss_of_life")
+    private BigDecimal initialLossOfLife;
+
+    /**
+     * Status of this asset.
+     */
+    @Embedded
+    private CustomerEntity.Status status;
+
+    // AssetContainer fields (AssetContainer is simply an Asset that can contain other assets - no additional fields)
+
+    // EndDevice specific fields
 
     /**
      * If true, there is no physical device. As an example, a virtual meter can be defined to aggregate 

src/main/java/org/greenbuttonalliance/espi/common/domain/customer/entity/Location.java

@@ -24,9 +24,9 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.greenbuttonalliance.espi.common.domain.common.IdentifiedObject;
 
 import jakarta.persistence.*;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -35,14 +35,18 @@
  * The place, scene, or point of something where someone or something has been, is, and/or will be 
  * at a given moment in time. It can be defined with one or more position points (coordinates) 
  * in a given coordinate system.
- * This is an abstract mapped superclass, not a concrete entity.
+ * 
+ * This is a @MappedSuperclass that provides location-specific fields but does not extend IdentifiedObject.
+ * Actual ESPI resource entities that represent locations should extend IdentifiedObject directly.
  */
 @MappedSuperclass
 @Data
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode
 @NoArgsConstructor
-@ToString(callSuper = true)
-public abstract class Location extends IdentifiedObject {
+@ToString
+public abstract class Location implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * Classification by utility's corporate standards and practices, relative to the location itself 

src/main/java/org/greenbuttonalliance/espi/common/domain/customer/entity/MeterEntity.java

@@ -35,7 +35,7 @@
  */
 @Entity
 @Table(name = "meters", uniqueConstraints = {
-    @UniqueConstraint(columnNames = {"uuid"})
+    @UniqueConstraint(columnNames = {"id"})
 })
 @Data
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/greenbuttonalliance/espi/common/domain/customer/entity/ServiceLocationEntity.java

@@ -24,6 +24,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
+import org.greenbuttonalliance.espi.common.domain.common.IdentifiedObject;
 
 import jakarta.persistence.*;
 import java.util.List;
@@ -32,16 +33,114 @@
  * Pure JPA/Hibernate entity for ServiceLocation without JAXB concerns.
  * 
  * A real estate location, commonly referred to as premises.
+ * 
+ * This is an actual ESPI resource entity that extends IdentifiedObject directly.
  */
 @Entity
 @Table(name = "service_locations", uniqueConstraints = {
-    @UniqueConstraint(columnNames = {"uuid"})
+    @UniqueConstraint(columnNames = {"id"})
 })
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @ToString(callSuper = true, exclude = {"usagePoints"})
-public class ServiceLocationEntity extends WorkLocation {
+public class ServiceLocationEntity extends IdentifiedObject {
+
+    // Location fields (previously inherited from Location superclass)
+    
+    /**
+     * Classification by utility's corporate standards and practices, relative to the location itself 
+     * (e.g., geographical, functional accounting, etc., not a given property that happens to exist at that location).
+     */
+    @Column(name = "type", length = 256)
+    private String type;
+
+    /**
+     * Main address of the location.
+     */
+    @Embedded
+    @AttributeOverrides({
+        @AttributeOverride(name = "poBox", column = @Column(name = "main_po_box")),
+        @AttributeOverride(name = "street", column = @Column(name = "main_street")),
+        @AttributeOverride(name = "streetSuffix", column = @Column(name = "main_street_suffix")),
+        @AttributeOverride(name = "suite", column = @Column(name = "main_suite"))
+    })
+    private Organisation.StreetAddress mainAddress;
+
+    /**
+     * Secondary address of the location. For example, PO Box address may have different ZIP code than that in the 'mainAddress'.
+     */
+    @Embedded
+    @AttributeOverrides({
+        @AttributeOverride(name = "poBox", column = @Column(name = "secondary_po_box")),
+        @AttributeOverride(name = "street", column = @Column(name = "secondary_street")),
+        @AttributeOverride(name = "streetSuffix", column = @Column(name = "secondary_street_suffix")),
+        @AttributeOverride(name = "suite", column = @Column(name = "secondary_suite"))
+    })
+    private Organisation.StreetAddress secondaryAddress;
+
+    /**
+     * Phone number.
+     */
+    @Embedded
+    @AttributeOverrides({
+        @AttributeOverride(name = "areaCode", column = @Column(name = "phone1_area_code")),
+        @AttributeOverride(name = "cityCode", column = @Column(name = "phone1_city_code")),
+        @AttributeOverride(name = "localNumber", column = @Column(name = "phone1_local_number")),
+        @AttributeOverride(name = "extension", column = @Column(name = "phone1_extension"))
+    })
+    private Organisation.PhoneNumber phone1;
+
+    /**
+     * Additional phone number.
+     */
+    @Embedded
+    @AttributeOverrides({
+        @AttributeOverride(name = "areaCode", column = @Column(name = "phone2_area_code")),
+        @AttributeOverride(name = "cityCode", column = @Column(name = "phone2_city_code")),
+        @AttributeOverride(name = "localNumber", column = @Column(name = "phone2_local_number")),
+        @AttributeOverride(name = "extension", column = @Column(name = "phone2_extension"))
+    })
+    private Organisation.PhoneNumber phone2;
+
+    /**
+     * Electronic address.
+     */
+    @Embedded
+    @AttributeOverrides({
+        @AttributeOverride(name = "email1", column = @Column(name = "electronic_email1")),
+        @AttributeOverride(name = "email2", column = @Column(name = "electronic_email2")),
+        @AttributeOverride(name = "web", column = @Column(name = "electronic_web")),
+        @AttributeOverride(name = "radio", column = @Column(name = "electronic_radio"))
+    })
+    private Organisation.ElectronicAddress electronicAddress;
+
+    /**
+     * (if applicable) Reference to geographical information source, often external to the utility.
+     */
+    @Column(name = "geo_info_reference", length = 256)
+    private String geoInfoReference;
+
+    /**
+     * (if applicable) Direction that allows field crews to quickly find a given asset.
+     */
+    @Column(name = "direction", length = 256)
+    private String direction;
+
+    /**
+     * Status of this location.
+     */
+    @Embedded
+    @AttributeOverrides({
+        @AttributeOverride(name = "value", column = @Column(name = "status_value")),
+        @AttributeOverride(name = "dateTime", column = @Column(name = "status_date_time")),
+        @AttributeOverride(name = "reason", column = @Column(name = "status_reason"))
+    })
+    private CustomerEntity.Status status;
+
+    // WorkLocation fields (WorkLocation is simply a Location specialized for work activities - no additional fields)
+
+    // ServiceLocation specific fields
 
     /**
      * Method for the service person to access this service location. For example, a description of where to obtain