diff --git a/src/main/java/org/ecocean/Adoption.java b/src/main/java/org/ecocean/Adoption.java deleted file mode 100644 index 8f31d7ed2b..0000000000 --- a/src/main/java/org/ecocean/Adoption.java +++ /dev/null @@ -1,171 +0,0 @@ -package org.ecocean; - -import javax.servlet.http.HttpServletRequest; - -import org.datanucleus.api.rest.orgjson.JSONException; -import org.datanucleus.api.rest.orgjson.JSONObject; - -/** - * COmment - * - * @author jholmber - */ -public class Adoption implements java.io.Serializable { - static final long serialVersionUID = -1020952058521486782L; - - private String id; - private String stripeCustomerId; - private String adopterName; - private String adopterAddress; - private String adopterEmail; - private String adopterImage; - private String adoptionStartDate; - private String adoptionEndDate; - private String adopterQuote; - private String adoptionManager; - private String individual; - private String encounter; - private String notes; - private String adoptionType; - - public Adoption(String id, String adopterName, String adopterEmail, String adoptionStartDate, - String adoptionEndDate) { - this.adopterName = adopterName; - this.adopterEmail = adopterEmail; - this.adoptionStartDate = adoptionStartDate; - this.adoptionEndDate = adoptionEndDate; - this.id = id; - } - - public String getAdopterName() { - return adopterName; - } - - public String getAdopterAddress() { - return adopterAddress; - } - - public String getAdopterEmail() { - return adopterEmail; - } - - public String getAdopterImage() { - return adopterImage; - } - - public String getAdoptionStartDate() { - return adoptionStartDate; - } - - public String getAdoptionEndDate() { - return adoptionEndDate; - } - - public String getAdopterQuote() { - return adopterQuote; - } - - public String getAdoptionManager() { - return adoptionManager; - } - - public String getNotes() { - return notes; - } - - public String getMarkedIndividual() { - return individual; - } - - public String getEncounter() { - return encounter; - } - - public String getID() { - return id; - } - - public String getStripeCustomerId() { - return stripeCustomerId; - } - - public String getAdoptionType() { - return adoptionType; - } - - public void setAdopterName(String name) { - this.adopterName = name; - } - - public void setAdopterAddress(String addr) { - this.adopterAddress = addr; - } - - public void setAdopterEmail(String em) { - this.adopterEmail = em; - } - - public void setAdopterImage(String img) { - if (img == null) { img = null; } else { - this.adopterImage = img; - } - } - - public void setAdoptionStartDate(String date) { - this.adoptionStartDate = date; - } - - public void setAdoptionEndDate(String date) { - this.adoptionEndDate = date; - } - - public void setAdopterQuote(String quote) { - this.adopterQuote = quote; - } - - public void setAdoptionManager(String man) { - this.adoptionManager = man; - } - - public void setNotes(String nt) { - this.notes = nt; - } - - public void setIndividual(String sh) { - this.individual = sh; - } - - public void setEncounter(String sh) { - this.encounter = sh; - } - - public void setID(String i) { - this.id = i; - } - - public void setStripeCustomerId(String sci) { - this.stripeCustomerId = sci; - } - - public void setAdoptionType(String at) { - this.adoptionType = at; - } - - // Returns a somewhat rest-like JSON object containing the metadata - public JSONObject uiJson(HttpServletRequest request, boolean includeOrganizations) - throws JSONException { - JSONObject jobj = new JSONObject(); - - jobj.put("id", this.getID()); - jobj.put("stripeCustomerId", this.getStripeCustomerId()); - jobj.put("adopterEmail", this.getAdopterEmail()); - jobj.put("adopterName", this.getAdopterName()); - jobj.put("adopterImage", this.getAdopterImage()); - jobj.put("adoptionType", this.getAdoptionType()); - jobj.put("encounter", this.getEncounter()); - jobj.put("individual", this.getMarkedIndividual()); - jobj.put("adoptionStartDate", this.getAdoptionStartDate()); - jobj.put("adoptionEndDate", this.getAdoptionEndDate()); - return jobj; - } -} diff --git a/src/main/java/org/ecocean/CommonConfiguration.java b/src/main/java/org/ecocean/CommonConfiguration.java index d8541010da..4879cf0754 100644 --- a/src/main/java/org/ecocean/CommonConfiguration.java +++ b/src/main/java/org/ecocean/CommonConfiguration.java @@ -328,16 +328,6 @@ public static String getNumIaResultsUserCanInspect(String context) { } } - public static String getAdoptionCampaignUrl(String context) { - try { - return getProperty("adoptionCampaignUrl", context).trim(); - } catch (NullPointerException e) { - System.out.println( - "NPE in getAdoptionCampaignUrl. Returning blank string as a default."); - return ""; - } - } - public static String getAnimalSingular(String context) { try { return getProperty("animalSingular", context).trim(); @@ -587,22 +577,6 @@ public static boolean showProperty(String thisString, String context) { return true; } - /** - * This configuration option defines whether adoptions of MarkedIndividual or encounter objects are allowed. Generally adoptions are used as a - * fundraising or public awareness tool. - * - * @return true if adoption functionality should be displayed. False if adoptions are not supported in this catalog. - */ - public static boolean allowAdoptions(String context) { - initialize(context); - boolean canAdopt = true; - if ((getProperty("allowAdoptions", context) != null) && (getProperty("allowAdoptions", - context).equals("false"))) { - canAdopt = false; - } - return canAdopt; - } - public static Double getCenterLat(String context) { double returnVal = 10.8; diff --git a/src/main/java/org/ecocean/IndividualQueryProcessor.java b/src/main/java/org/ecocean/IndividualQueryProcessor.java index 1e63244f24..d8d2e143c0 100644 --- a/src/main/java/org/ecocean/IndividualQueryProcessor.java +++ b/src/main/java/org/ecocean/IndividualQueryProcessor.java @@ -1407,7 +1407,6 @@ public static MarkedIndividualQueryResult processQuery(Shepherd myShepherd, allSharks = myShepherd.getAllMarkedIndividuals(query, "dateTimeLatestSighting descending", paramMap); } - // Added to show adoptable sharks in gallery. else if (request.getParameter("sort").equals("dateTimeLatestSighting")) { allSharks = myShepherd.getAllMarkedIndividuals(query, "dateTimeLatestSighting descending", paramMap); diff --git a/src/main/java/org/ecocean/MarkedIndividual.java b/src/main/java/org/ecocean/MarkedIndividual.java index 6007e7aba6..37e750aec8 100644 --- a/src/main/java/org/ecocean/MarkedIndividual.java +++ b/src/main/java/org/ecocean/MarkedIndividual.java @@ -60,6 +60,7 @@ public class MarkedIndividual extends Base implements java.io.Serializable { private String seriesCode = "None"; // the default is what was previously returned by .getNickName(), not the actual val + // these values are left for "historical record" even though adoptions are being sunset in issue 283 public final String DEFAULT_NICKNAME = "Unassigned"; private String nickName = "", nickNamer = ""; @@ -893,6 +894,7 @@ public void setNickName(String newName) { this.addNameByKey(NAMES_KEY_NICKNAME, newName); } + // setter removed by issue 283 (adoption retirement) public String getNickNamer() { if (nickNamer != null) { return nickNamer; @@ -901,10 +903,6 @@ public String getNickNamer() { } } - public void setNickNamer(String newNamer) { - nickNamer = newNamer; - } - public void setName(String newName) { this.addName(newName); } diff --git a/src/main/java/org/ecocean/NotificationMailer.java b/src/main/java/org/ecocean/NotificationMailer.java index 98623feb1d..ec01fd194b 100644 --- a/src/main/java/org/ecocean/NotificationMailer.java +++ b/src/main/java/org/ecocean/NotificationMailer.java @@ -542,31 +542,6 @@ public void replaceRegexInHtmlText(String search, String replace) { } } - /** - * Creates a basic tag map for the specified adoption. This map can subsequently be enhanced with extra tags. Adoption tags included: - * - * - * @param req servlet request for data reference - * @param ind MarkedIndividual for which to add tag data - * @return map instance for tag replacement in email template - */ - public static Map createBasicTagMap(HttpServletRequest req, Adoption adp, - String scheme) { - Map map = new HashMap<>(); - - addTags(map, req, adp, scheme); - return map; - } - /** * Creates a basic tag map for the specified encounter. This map can subsequently be enhanced with extra tags. Individual tags included: *