Replace some deprecated code (#194)

Author: beckermarc

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

@@ -17,8 +17,8 @@
 import com.sap.cds.ql.Predicate;
 import com.sap.cds.ql.Select;
 import com.sap.cds.ql.Upsert;
-import com.sap.cds.ql.cqn.CqnModifier;
 import com.sap.cds.ql.cqn.CqnSelect;
+import com.sap.cds.ql.cqn.Modifier;
 import com.sap.cds.services.ErrorStatuses;
 import com.sap.cds.services.EventContext;
 import com.sap.cds.services.ServiceException;
@@ -71,7 +71,7 @@ public void readAddresses(CdsReadEventContext context) {
 		String businessPartner = context.getUserInfo().getAttributeValues("businessPartner").stream().findFirst()
 			.orElseThrow(() -> new ServiceException(ErrorStatuses.FORBIDDEN, MessageKeys.BUPA_MISSING));
 
-		CqnSelect select = CQL.copy(context.getCqn(), new CqnModifier() {
+		CqnSelect select = CQL.copy(context.getCqn(), new Modifier() {
 
 			public Predicate where(Predicate original) {
 				Predicate where = CQL.get(Addresses.BUSINESS_PARTNER).eq(businessPartner);

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

@@ -28,7 +28,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.CdsService;
 import com.sap.cds.services.cds.CdsUpdateEventContext;
 import com.sap.cds.services.cds.CqnService;
 import com.sap.cds.services.draft.DraftCancelEventContext;
@@ -269,7 +268,7 @@ public void addBookToOrder(AddToOrderContext context) {
 	/**
 	 * @return the static CSV singleton upload entity
 	 */
-	@On(entity = Upload_.CDS_NAME, event = CdsService.EVENT_READ)
+	@On(entity = Upload_.CDS_NAME, event = CqnService.EVENT_READ)
 	public Upload getUploadSingleton() {
 		return Upload.create();
 	}
@@ -279,7 +278,7 @@ public Upload getUploadSingleton() {
 	 * @param context
 	 * @param csv
 	 */
-	@On(event = CdsService.EVENT_UPDATE)
+	@On
 	public void addBooksViaCsv(CdsUpdateEventContext context, Upload upload) {
 		InputStream is = upload.getCsv();
 		if (is != null) {