From 5abb74bfd27a90b173d0e7bc7ede151b357789c3 Mon Sep 17 00:00:00 2001 From: Julian Horner <julianhorner@web.de> Date: Thu, 23 Jul 2020 16:47:02 +0200 Subject: [PATCH] Minor improvements --- .../myaktion/controller/DonateMoneyController.java | 5 ----- .../myaktion/controller/EditCampaignController.java | 5 ----- .../controller/EditDonationFormController.java | 5 ----- .../myaktion/controller/ListCampaignsController.java | 5 ----- .../myaktion/controller/ListDonationsController.java | 5 ----- .../java/de/dpunkt/myaktion/controller/Pages.java | 5 ----- .../dpunkt/myaktion/data/CampaignListProducer.java | 5 ----- .../de/dpunkt/myaktion/data/CampaignProducer.java | 5 ----- src/main/java/de/dpunkt/myaktion/model/Account.java | 5 ----- src/main/java/de/dpunkt/myaktion/model/Campaign.java | 5 ----- .../java/de/dpunkt/myaktion/model/DateEntity.java | 5 ----- src/main/java/de/dpunkt/myaktion/model/Donation.java | 5 ----- .../java/de/dpunkt/myaktion/model/Organizer.java | 5 ----- .../dpunkt/myaktion/resources/CampaignResource.java | 12 ++++++++++++ .../dpunkt/myaktion/resources/DonationResource.java | 10 ++++++++++ .../de/dpunkt/myaktion/scheduler/SchedulerBean.java | 5 ----- .../de/dpunkt/myaktion/services/CampaignService.java | 5 ----- .../myaktion/services/CampaignServiceBean.java | 5 ----- .../de/dpunkt/myaktion/services/DonationService.java | 5 ----- .../myaktion/services/DonationServiceBean.java | 5 ----- src/main/java/de/dpunkt/myaktion/util/Events.java | 5 ----- src/main/java/de/dpunkt/myaktion/util/Log.java | 5 ----- src/main/java/de/dpunkt/myaktion/util/Resources.java | 5 ----- .../dpunkt/myaktion/util/TransactionInterceptor.java | 5 ----- 24 files changed, 22 insertions(+), 110 deletions(-) diff --git a/src/main/java/de/dpunkt/myaktion/controller/DonateMoneyController.java b/src/main/java/de/dpunkt/myaktion/controller/DonateMoneyController.java index 987337a..6151b35 100644 --- a/src/main/java/de/dpunkt/myaktion/controller/DonateMoneyController.java +++ b/src/main/java/de/dpunkt/myaktion/controller/DonateMoneyController.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.controller; import java.io.Serializable; diff --git a/src/main/java/de/dpunkt/myaktion/controller/EditCampaignController.java b/src/main/java/de/dpunkt/myaktion/controller/EditCampaignController.java index e60ba84..84f0954 100644 --- a/src/main/java/de/dpunkt/myaktion/controller/EditCampaignController.java +++ b/src/main/java/de/dpunkt/myaktion/controller/EditCampaignController.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.controller; import java.io.Serializable; diff --git a/src/main/java/de/dpunkt/myaktion/controller/EditDonationFormController.java b/src/main/java/de/dpunkt/myaktion/controller/EditDonationFormController.java index f5029b2..ad49425 100644 --- a/src/main/java/de/dpunkt/myaktion/controller/EditDonationFormController.java +++ b/src/main/java/de/dpunkt/myaktion/controller/EditDonationFormController.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.controller; import java.io.Serializable; diff --git a/src/main/java/de/dpunkt/myaktion/controller/ListCampaignsController.java b/src/main/java/de/dpunkt/myaktion/controller/ListCampaignsController.java index 9f2ee3b..b8c390c 100644 --- a/src/main/java/de/dpunkt/myaktion/controller/ListCampaignsController.java +++ b/src/main/java/de/dpunkt/myaktion/controller/ListCampaignsController.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.controller; import java.io.Serializable; diff --git a/src/main/java/de/dpunkt/myaktion/controller/ListDonationsController.java b/src/main/java/de/dpunkt/myaktion/controller/ListDonationsController.java index b87559d..da4c0a1 100644 --- a/src/main/java/de/dpunkt/myaktion/controller/ListDonationsController.java +++ b/src/main/java/de/dpunkt/myaktion/controller/ListDonationsController.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.controller; import java.io.Serializable; diff --git a/src/main/java/de/dpunkt/myaktion/controller/Pages.java b/src/main/java/de/dpunkt/myaktion/controller/Pages.java index c1cefa6..4ee13f2 100644 --- a/src/main/java/de/dpunkt/myaktion/controller/Pages.java +++ b/src/main/java/de/dpunkt/myaktion/controller/Pages.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.controller; /** diff --git a/src/main/java/de/dpunkt/myaktion/data/CampaignListProducer.java b/src/main/java/de/dpunkt/myaktion/data/CampaignListProducer.java index 99d0f04..362c05b 100644 --- a/src/main/java/de/dpunkt/myaktion/data/CampaignListProducer.java +++ b/src/main/java/de/dpunkt/myaktion/data/CampaignListProducer.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.data; import java.util.List; diff --git a/src/main/java/de/dpunkt/myaktion/data/CampaignProducer.java b/src/main/java/de/dpunkt/myaktion/data/CampaignProducer.java index 9465cca..3e980ab 100644 --- a/src/main/java/de/dpunkt/myaktion/data/CampaignProducer.java +++ b/src/main/java/de/dpunkt/myaktion/data/CampaignProducer.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.data; import java.io.Serializable; diff --git a/src/main/java/de/dpunkt/myaktion/model/Account.java b/src/main/java/de/dpunkt/myaktion/model/Account.java index 176bd5d..7f41d80 100644 --- a/src/main/java/de/dpunkt/myaktion/model/Account.java +++ b/src/main/java/de/dpunkt/myaktion/model/Account.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.model; import javax.persistence.Embeddable; diff --git a/src/main/java/de/dpunkt/myaktion/model/Campaign.java b/src/main/java/de/dpunkt/myaktion/model/Campaign.java index 8778628..442777b 100644 --- a/src/main/java/de/dpunkt/myaktion/model/Campaign.java +++ b/src/main/java/de/dpunkt/myaktion/model/Campaign.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.model; import java.util.List; diff --git a/src/main/java/de/dpunkt/myaktion/model/DateEntity.java b/src/main/java/de/dpunkt/myaktion/model/DateEntity.java index b175316..ee669af 100644 --- a/src/main/java/de/dpunkt/myaktion/model/DateEntity.java +++ b/src/main/java/de/dpunkt/myaktion/model/DateEntity.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.model; import java.util.Date; diff --git a/src/main/java/de/dpunkt/myaktion/model/Donation.java b/src/main/java/de/dpunkt/myaktion/model/Donation.java index 5f5a9ef..7a71913 100644 --- a/src/main/java/de/dpunkt/myaktion/model/Donation.java +++ b/src/main/java/de/dpunkt/myaktion/model/Donation.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.model; import javax.persistence.Embedded; diff --git a/src/main/java/de/dpunkt/myaktion/model/Organizer.java b/src/main/java/de/dpunkt/myaktion/model/Organizer.java index 6cb9286..c0cbbc6 100644 --- a/src/main/java/de/dpunkt/myaktion/model/Organizer.java +++ b/src/main/java/de/dpunkt/myaktion/model/Organizer.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.model; import javax.persistence.Entity; diff --git a/src/main/java/de/dpunkt/myaktion/resources/CampaignResource.java b/src/main/java/de/dpunkt/myaktion/resources/CampaignResource.java index 25015bf..e549dcc 100644 --- a/src/main/java/de/dpunkt/myaktion/resources/CampaignResource.java +++ b/src/main/java/de/dpunkt/myaktion/resources/CampaignResource.java @@ -18,9 +18,13 @@ import de.dpunkt.myaktion.services.CampaignService; @Path("/organizer/campaign") public class CampaignResource { + //---------------------------------------------------------------------------------------------- + @Inject private CampaignService campaignService; + //---------------------------------------------------------------------------------------------- + @GET @Path("/list") @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @@ -35,12 +39,16 @@ public class CampaignResource { return allCampaigns; } + //---------------------------------------------------------------------------------------------- + @DELETE @Path("/{campaignId}") public void deleteAktion(@PathParam(value = "campaignId") Long campaignId) { campaignService.deleteCampaign(campaignId); } + //---------------------------------------------------------------------------------------------- + @POST @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) @@ -48,6 +56,8 @@ public class CampaignResource { return campaignService.addCampaign(campaign); } + //---------------------------------------------------------------------------------------------- + @PUT @Path("/{campaignId}") @Consumes(MediaType.APPLICATION_JSON) @@ -65,4 +75,6 @@ public class CampaignResource { return newCampaign; } + + //---------------------------------------------------------------------------------------------- } \ No newline at end of file diff --git a/src/main/java/de/dpunkt/myaktion/resources/DonationResource.java b/src/main/java/de/dpunkt/myaktion/resources/DonationResource.java index 900ee19..d54a3c7 100644 --- a/src/main/java/de/dpunkt/myaktion/resources/DonationResource.java +++ b/src/main/java/de/dpunkt/myaktion/resources/DonationResource.java @@ -21,9 +21,13 @@ import de.dpunkt.myaktion.services.exceptions.ObjectNotFoundException; @Path("/") public class DonationResource { + //---------------------------------------------------------------------------------------------- + @Inject private DonationService donationService; + //---------------------------------------------------------------------------------------------- + @GET @Path("/organizer/donation/list/{campaignId}") @Produces(MediaType.APPLICATION_JSON) @@ -34,6 +38,8 @@ public class DonationResource { return donations; } + //---------------------------------------------------------------------------------------------- + @POST @Path("/donation/{campaignId}") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) @@ -58,6 +64,8 @@ public class DonationResource { donationService.addDonation(campaignId, donation); } + //---------------------------------------------------------------------------------------------- + @GET @Path("/donation/list/{campaignId}") @Produces(MediaType.APPLICATION_JSON) @@ -71,4 +79,6 @@ public class DonationResource { return Response.status(javax.ws.rs.core.Response.Status.NOT_FOUND).build(); } } + + //---------------------------------------------------------------------------------------------- } diff --git a/src/main/java/de/dpunkt/myaktion/scheduler/SchedulerBean.java b/src/main/java/de/dpunkt/myaktion/scheduler/SchedulerBean.java index 85d5571..b6bc8df 100644 --- a/src/main/java/de/dpunkt/myaktion/scheduler/SchedulerBean.java +++ b/src/main/java/de/dpunkt/myaktion/scheduler/SchedulerBean.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.scheduler; import javax.ejb.Schedule; diff --git a/src/main/java/de/dpunkt/myaktion/services/CampaignService.java b/src/main/java/de/dpunkt/myaktion/services/CampaignService.java index 9d1f696..69b38e0 100644 --- a/src/main/java/de/dpunkt/myaktion/services/CampaignService.java +++ b/src/main/java/de/dpunkt/myaktion/services/CampaignService.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.services; import java.util.List; diff --git a/src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java b/src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java index 1cd029c..d6ff851 100644 --- a/src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java +++ b/src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.services; import java.util.List; diff --git a/src/main/java/de/dpunkt/myaktion/services/DonationService.java b/src/main/java/de/dpunkt/myaktion/services/DonationService.java index c1a1157..3bf7535 100644 --- a/src/main/java/de/dpunkt/myaktion/services/DonationService.java +++ b/src/main/java/de/dpunkt/myaktion/services/DonationService.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.services; import java.util.List; diff --git a/src/main/java/de/dpunkt/myaktion/services/DonationServiceBean.java b/src/main/java/de/dpunkt/myaktion/services/DonationServiceBean.java index 7804287..c86c0e0 100644 --- a/src/main/java/de/dpunkt/myaktion/services/DonationServiceBean.java +++ b/src/main/java/de/dpunkt/myaktion/services/DonationServiceBean.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.services; import java.util.List; diff --git a/src/main/java/de/dpunkt/myaktion/util/Events.java b/src/main/java/de/dpunkt/myaktion/util/Events.java index 2e200ec..3e3f2f4 100644 --- a/src/main/java/de/dpunkt/myaktion/util/Events.java +++ b/src/main/java/de/dpunkt/myaktion/util/Events.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.util; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/de/dpunkt/myaktion/util/Log.java b/src/main/java/de/dpunkt/myaktion/util/Log.java index 00814c6..4853c70 100644 --- a/src/main/java/de/dpunkt/myaktion/util/Log.java +++ b/src/main/java/de/dpunkt/myaktion/util/Log.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.util; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/de/dpunkt/myaktion/util/Resources.java b/src/main/java/de/dpunkt/myaktion/util/Resources.java index 5a21ca7..bdd90ef 100644 --- a/src/main/java/de/dpunkt/myaktion/util/Resources.java +++ b/src/main/java/de/dpunkt/myaktion/util/Resources.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.util; import java.util.logging.Logger; diff --git a/src/main/java/de/dpunkt/myaktion/util/TransactionInterceptor.java b/src/main/java/de/dpunkt/myaktion/util/TransactionInterceptor.java index a925068..eb79c7a 100644 --- a/src/main/java/de/dpunkt/myaktion/util/TransactionInterceptor.java +++ b/src/main/java/de/dpunkt/myaktion/util/TransactionInterceptor.java @@ -1,8 +1,3 @@ -/* - * Copyright 2019 (C) by Julian Horner. - * All Rights Reserved. - */ - package de.dpunkt.myaktion.util; import javax.annotation.Resource; -- GitLab