From: Roland Haeder Date: Thu, 22 Oct 2015 08:25:28 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5ac805a242e4746cf2b279ad906384780f73a727;p=jphone-core.git Continued: - added timestamps for administrative purposes - added it to existing constructors - added constructor for cellphone provider + protected default - updated jar(s) Signed-off-by:Roland Häder --- diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 234d3fb..28024ee 100644 Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ diff --git a/src/org/mxchange/jphone/phonenumbers/DialableNumber.java b/src/org/mxchange/jphone/phonenumbers/DialableNumber.java index ca10dc7..9bbf1e1 100644 --- a/src/org/mxchange/jphone/phonenumbers/DialableNumber.java +++ b/src/org/mxchange/jphone/phonenumbers/DialableNumber.java @@ -17,6 +17,7 @@ package org.mxchange.jphone.phonenumbers; import java.io.Serializable; +import java.util.Calendar; import org.mxchange.jcountry.data.Country; /** @@ -81,4 +82,18 @@ public interface DialableNumber extends Serializable { * @param phoneAreaCode Area code without dial prefix */ void setPhoneAreaCode (final Integer phoneAreaCode); + + /** + * Getter for timestamp when this entry has been created + *

+ * @return Timestamp when this entry has been created + */ + Calendar getPhoneEntryCreated (); + + /** + * Setter for timestamp when this entry has been created + *

+ * @param phoneEntryCreated Timestamp when this entry has been created + */ + void setPhoneEntryCreated (final Calendar phoneEntryCreated); } diff --git a/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java b/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java index c3e10b5..681d0c7 100644 --- a/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java +++ b/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java @@ -16,6 +16,7 @@ */ package org.mxchange.jphone.phonenumbers.cellphone; +import java.util.Calendar; import java.util.Objects; import javax.persistence.Basic; import javax.persistence.CascadeType; @@ -28,6 +29,8 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; import org.mxchange.jcountry.data.Country; import org.mxchange.jphone.phonenumbers.smsprovider.CellphoneProvider; import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider; @@ -58,7 +61,7 @@ public class CellphoneNumber implements DialableCellphoneNumber, Comparable * @param cellphoneCarrier Cellphone carrier instance * @param cellphoneNumber Cellphone number + * @param phoneEntryCreated When this entry has been created */ - public CellphoneNumber (final SmsProvider cellphoneCarrier, final Long cellphoneNumber) { + public CellphoneNumber (final SmsProvider cellphoneCarrier, final Long cellphoneNumber, final Calendar phoneEntryCreated) { this.cellphoneProvider = cellphoneCarrier; this.phoneNumber = cellphoneNumber; + this.phoneEntryCreated = phoneEntryCreated; } /** @@ -116,6 +129,16 @@ public class CellphoneNumber implements DialableCellphoneNumber, Comparable { @OneToOne (targetEntity = CountryData.class, cascade = CascadeType.ALL, optional = false, fetch = FetchType.EAGER) private Country providerCountry; - @Override - public int compareTo (final SmsProvider provider) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - - @Override - public boolean equals (final Object object) { - if (object == null) { - return false; - } else if (getClass() != object.getClass()) { - return false; - } - - final SmsProvider other = (SmsProvider) object; + /** + * Timestamp when this entry has been created + */ + @Basic (optional = false) + @Temporal (TemporalType.TIMESTAMP) + @Column (name = "provider_entry_created", nullable = false, updatable = false) + private Calendar providerEntryCreated; - if (!Objects.equals(this.getProviderDialPrefix(), other.getProviderDialPrefix())) { - return false; - } else if (!Objects.equals(this.getProviderName(), other.getProviderName())) { - return false; - } else if (!Objects.equals(this.getProviderCountry(), other.getProviderCountry())) { - return false; - } + /** + * Protected constructor for JPA + */ + protected CellphoneProvider () { + } - return true; + /** + * Constructor with all required data + *

+ * @param providerDialPrefix Dial prefix + * @param providerName Name + * @param providerCountry Country + * @param providerEntryCreated When this entry has been created + */ + public CellphoneProvider (final Long providerDialPrefix, final String providerName, final Country providerCountry, final Calendar providerEntryCreated) { + this.providerDialPrefix = providerDialPrefix; + this.providerName = providerName; + this.providerCountry = providerCountry; + this.providerEntryCreated = providerEntryCreated; } @Override public Long getProviderId () { - return providerId; + return this.providerId; } @Override @@ -117,7 +123,7 @@ public class CellphoneProvider implements SmsProvider, Comparable { @Override public Long getProviderDialPrefix () { - return providerDialPrefix; + return this.providerDialPrefix; } @Override @@ -127,7 +133,7 @@ public class CellphoneProvider implements SmsProvider, Comparable { @Override public String getProviderName () { - return providerName; + return this.providerName; } @Override @@ -145,6 +151,42 @@ public class CellphoneProvider implements SmsProvider, Comparable { this.providerCountry = providerCountry; } + @Override + public Calendar getProviderEntryCreated () { + return this.providerEntryCreated; + } + + @Override + public void setProviderEntryCreated (final Calendar providerEntryCreated) { + this.providerEntryCreated = providerEntryCreated; + } + + @Override + public int compareTo (final SmsProvider provider) { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } + + @Override + public boolean equals (final Object object) { + if (object == null) { + return false; + } else if (getClass() != object.getClass()) { + return false; + } + + final SmsProvider other = (SmsProvider) object; + + if (!Objects.equals(this.getProviderDialPrefix(), other.getProviderDialPrefix())) { + return false; + } else if (!Objects.equals(this.getProviderName(), other.getProviderName())) { + return false; + } else if (!Objects.equals(this.getProviderCountry(), other.getProviderCountry())) { + return false; + } + + return true; + } + @Override public int hashCode () { int hash = 7; diff --git a/src/org/mxchange/jphone/phonenumbers/smsprovider/SmsProvider.java b/src/org/mxchange/jphone/phonenumbers/smsprovider/SmsProvider.java index 7d13a26..a9e1e04 100644 --- a/src/org/mxchange/jphone/phonenumbers/smsprovider/SmsProvider.java +++ b/src/org/mxchange/jphone/phonenumbers/smsprovider/SmsProvider.java @@ -17,6 +17,7 @@ package org.mxchange.jphone.phonenumbers.smsprovider; import java.io.Serializable; +import java.util.Calendar; import org.mxchange.jcountry.data.Country; /** @@ -82,6 +83,20 @@ public interface SmsProvider extends Serializable { */ void setProviderCountry (final Country country); + /** + * Getter for timestamp when this entry has been created + *

+ * @return Timestamp when this entry has been created + */ + Calendar getProviderEntryCreated (); + + /** + * Setter for timestamp when this entry has been created + *

+ * @param providerEntryCreated Timestamp when this entry has been created + */ + void setProviderEntryCreated (final Calendar providerEntryCreated); + @Override boolean equals (final Object object);