Simplify notes mashup model

Author: beckermarc

srv/notes-mashup.cds

@@ -3,18 +3,16 @@ using { API_BUSINESS_PARTNER } from './external/API_BUSINESS_PARTNER';
 /**
  * Simplified view on external addresses, which is used as an association target in Notes.
  */
-entity my.bookshop.NoteableAddresses as select from API_BUSINESS_PARTNER.A_BusinessPartnerAddress mixin {
-  // bi-directional association
-  notes : Composition of many bookshop.Notes on notes.address.businessPartner = $projection.businessPartner and notes.address.ID = $projection.ID
-} into {
+entity my.bookshop.NoteableAddresses as projection on API_BUSINESS_PARTNER.A_BusinessPartnerAddress {
   key AddressID as ID,
   key BusinessPartner as businessPartner,
   @readonly Country as country,
   @readonly CityName as city,
   @readonly PostalCode as postalCode,
   @readonly StreetName as street,
   @readonly HouseNumber as houseNumber,
-  notes @(odata.contained: false)
+  @odata.contained: false notes : Composition of many bookshop.Notes
+      on notes.address.businessPartner = $self.businessPartner and notes.address.ID = $self.ID
 };
 
 /*

srv/src/main/java/my/bookshop/handlers/AdminServiceHandler.java

@@ -29,7 +29,6 @@
 import com.sap.cds.services.ErrorStatuses;
 import com.sap.cds.services.EventContext;
 import com.sap.cds.services.ServiceException;
-import com.sap.cds.services.cds.CdsReadEventContext;
 import com.sap.cds.services.cds.CdsUpdateEventContext;
 import com.sap.cds.services.cds.CqnService;
 import com.sap.cds.services.draft.DraftCancelEventContext;