mv com/google/domain/registry google/registry

This change renames directories in preparation for the great package
rename. The repository is now in a broken state because the code
itself hasn't been updated. However this should ensure that git
correctly preserves history for each file.

java/google/registry/model/mark/CommonMarkContactFields.java

@@ -0,0 +1,74 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.domain.registry.model.mark;
+
+import com.google.domain.registry.model.ImmutableObject;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+/**
+ * Common fields shared amongst all mark contact subclasses.
+ *
+ * @see MarkContact
+ * @see MarkHolder
+ */
+@XmlTransient
+public class CommonMarkContactFields extends ImmutableObject {
+
+  /** Name of the contact. */
+  String name;
+
+  /** Name of the contact's organization. */
+  @XmlElement(name = "org")
+  String organization;
+
+  /** Contact's address information. */
+  @XmlElement(name = "addr")
+  MarkAddress address;
+
+  /** Contact's voice telephone number. */
+  MarkPhoneNumber voice;
+
+  /** Contact's fax telephone number. */
+  MarkPhoneNumber fax;
+
+  /** Contact's email. */
+  String email;
+
+  public String getName() {
+    return name;
+  }
+
+  public String getOrganization() {
+    return organization;
+  }
+
+  public MarkAddress getAddress() {
+    return address;
+  }
+
+  public MarkPhoneNumber getVoice() {
+    return voice;
+  }
+
+  public MarkPhoneNumber getFax() {
+    return fax;
+  }
+
+  public String getEmail() {
+    return email;
+  }
+}

java/google/registry/model/mark/CommonMarkFields.java

@@ -0,0 +1,84 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.domain.registry.model.mark;
+
+import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
+
+import com.google.common.collect.ImmutableList;
+import com.google.domain.registry.model.ImmutableObject;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+/**
+ * Common fields shared amongst all mark instances.
+ *
+ * @see CourtMark
+ * @see Trademark
+ * @see TreatyOrStatuteMark
+ */
+@XmlTransient
+public abstract class CommonMarkFields extends ImmutableObject {
+
+  /**
+   * The id of the mark. The value is a concatenation of the local identifier, followed by a hyphen,
+   * followed by the issuer identifier.
+   */
+  String id;
+
+  /** The mark text string. */
+  String markName;
+
+  /** Information about the holder of the mark. */
+  @XmlElement(name = "holder")
+  List<MarkHolder> markHolders;
+
+  /** Contact information for the representative of the mark registration. */
+  @XmlElement(name = "contact")
+  List<MarkContact> contacts;
+
+  /** List of A-labels that correspond to the mark name. */
+  @XmlElement(name = "label")
+  List<String> labels;
+
+  /** The full description of goods and services mentioned in the mark registration document. */
+  String goodsAndServices;
+
+  public String getId() {
+    return id;
+  }
+
+  public String getMarkName() {
+    return markName;
+  }
+
+  public ImmutableList<MarkHolder> getMarkHolders() {
+    return nullToEmptyImmutableCopy(markHolders);
+  }
+
+  public ImmutableList<MarkContact> getContacts() {
+    return nullToEmptyImmutableCopy(contacts);
+  }
+
+  public ImmutableList<String> getLabels() {
+    return nullToEmptyImmutableCopy(labels);
+  }
+
+  public String getGoodsAndServices() {
+    return goodsAndServices;
+  }
+}

java/google/registry/model/mark/CourtMark.java

@@ -0,0 +1,66 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.domain.registry.model.mark;
+
+import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/** Holds information about a mark derived from a court opinion. */
+@XmlType(propOrder = {
+    "id",
+    "markName",
+    "markHolders",
+    "contacts",
+    "labels",
+    "goodsAndServices",
+    "referenceNumber",
+    "protectionDate",
+    "countryCode",
+    "regions",
+    "courtName"})
+public class CourtMark extends ProtectedMark {
+
+  /** The two-character code of the country where the court is located. */
+  @XmlElement(name = "cc")
+  String countryCode;
+
+  /**
+   * The name of a city, state, province, or other geographic region of the above country code in
+   * which the mark is protected.
+   */
+  @XmlElement(name = "region")
+  List<String> regions;
+
+  /** The name of the court. */
+  String courtName;
+
+  public String getCountryCode() {
+    return countryCode;
+  }
+
+  public ImmutableList<String> getRegions() {
+    return nullToEmptyImmutableCopy(regions);
+  }
+
+  public String getCourtName() {
+    return courtName;
+  }
+}

java/google/registry/model/mark/Mark.java

@@ -0,0 +1,60 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.domain.registry.model.mark;
+
+import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
+
+import com.google.common.collect.ImmutableList;
+import com.google.domain.registry.model.ImmutableObject;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Information about one or more marks.
+ * <p>
+ * A mark is a term for a label with some sort of legally protected status. The most well known
+ * version is a registered trademark, but marks can also be derived from court opinions, treaties,
+ * or statutes.
+ */
+@XmlRootElement(name = "mark")
+public class Mark extends ImmutableObject {
+
+  /** Marks derived from a registered trademark. */
+  @XmlElement(name = "trademark")
+  List<Trademark> trademarks;
+
+  /** Marks dervied from a treaty or statue. */
+  @XmlElement(name = "treatyOrStatute")
+  List<TreatyOrStatuteMark> treatyOrStatuteMarks;
+
+  /** Marks dervied from a court opinion. */
+  @XmlElement(name = "court")
+  List<CourtMark> courtMarks;
+
+  public ImmutableList<Trademark> getTrademarks() {
+    return nullToEmptyImmutableCopy(trademarks);
+  }
+
+  public ImmutableList<TreatyOrStatuteMark> getTreatyOrStatuteMarks() {
+    return nullToEmptyImmutableCopy(treatyOrStatuteMarks);
+  }
+
+  public ImmutableList<CourtMark> getCourtMarks() {
+    return nullToEmptyImmutableCopy(courtMarks);
+  }
+}

java/google/registry/model/mark/MarkAddress.java

@@ -0,0 +1,32 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.domain.registry.model.mark;
+
+import com.google.domain.registry.model.eppcommon.Address;
+
+/**
+ * Mark Holder/Owner Address
+ * <p>
+ * This class is embedded inside {@link CommonMarkContactFields} hold the address of a mark contact
+ * or holder. The fields are all defined in parent class {@link Address}, but the subclass is still
+ * necessary to pick up the mark namespace.
+ *
+ * @see CommonMarkContactFields
+ */
+public class MarkAddress extends Address {
+
+  /** Builder for {@link MarkAddress}. */
+  public static class Builder extends Address.Builder<MarkAddress> {}
+}

java/google/registry/model/mark/MarkContact.java

@@ -0,0 +1,43 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.domain.registry.model.mark;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/** Contact information for the representative of the mark. */
+public class MarkContact extends CommonMarkContactFields {
+
+  /** The type of the contact that represents the mark. */
+  @XmlEnum
+  enum ContactType {
+    @XmlEnumValue("owner")
+    OWNER,
+
+    @XmlEnumValue("agent")
+    AGENT,
+
+    @XmlEnumValue("thirdParty")
+    THIRD_PARTY;
+  }
+
+  @XmlAttribute
+  ContactType type;
+
+  public ContactType getType() {
+    return type;
+  }
+}

java/google/registry/model/mark/MarkHolder.java

@@ -0,0 +1,43 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.domain.registry.model.mark;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+/** Contact information for the holder of the mark. */
+public class MarkHolder extends CommonMarkContactFields {
+
+  /** The type of the entitlement for the holder of the mark. */
+  @XmlEnum
+  enum EntitlementType {
+    @XmlEnumValue("owner")
+    OWNER,
+
+    @XmlEnumValue("assignee")
+    ASSIGNEE,
+
+    @XmlEnumValue("licensee")
+    LICENSEE;
+  }
+
+  @XmlAttribute
+  EntitlementType entitlement;
+
+  public EntitlementType getEntitlementType() {
+    return entitlement;
+  }
+}

java/google/registry/model/mark/MarkPhoneNumber.java

@@ -0,0 +1,32 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.domain.registry.model.mark;
+
+import com.google.domain.registry.model.eppcommon.PhoneNumber;
+
+/**
+ * Mark Holder/Owner Phone Number
+ * <p>
+ * This class is embedded inside {@link CommonMarkContactFields} hold the phone number of a mark
+ * contact or holder. The fields are all defined in parent class {@link PhoneNumber}, but the
+ * subclass is still necessary to pick up the mark namespace.
+ *
+ * @see CommonMarkContactFields
+ */
+public class MarkPhoneNumber extends PhoneNumber {
+
+  /** Builder for {@link MarkPhoneNumber}. */
+  public static class Builder extends PhoneNumber.Builder<MarkPhoneNumber> {}
+}

java/google/registry/model/mark/MarkProtection.java

@@ -0,0 +1,54 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.domain.registry.model.mark;
+
+import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
+
+import com.google.common.collect.ImmutableList;
+import com.google.domain.registry.model.ImmutableObject;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+
+/** A country and region of a country where a mark is protected. */
+public class MarkProtection extends ImmutableObject {
+
+  /** The two-character code of the country where the mark is protected. */
+  @XmlElement(name = "cc")
+  String countryCode;
+
+  /**
+   * The name of a city, state, province, or other geographic region of the above country code in
+   * which the mark is protected.
+   */
+  String region;
+
+  /** The two-character codes of the countries of this ruling. */
+  @XmlElement(name = "ruling")
+  List<String> rulingCountryCodes;
+
+  public String getCountryCode() {
+    return countryCode;
+  }
+
+  public String getRegion() {
+    return region;
+  }
+
+  public ImmutableList<String> getRulingCountryCodes() {
+    return nullToEmptyImmutableCopy(rulingCountryCodes);
+  }
+}

java/google/registry/model/mark/ProtectedMark.java

@@ -0,0 +1,43 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.domain.registry.model.mark;
+
+import org.joda.time.DateTime;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+/** Common fields for {@link CourtMark} and {@link TreatyOrStatuteMark}. */
+@XmlTransient
+public abstract class ProtectedMark extends CommonMarkFields {
+  /** The date of protection of the mark. */
+  @XmlElement(name = "proDate")
+  DateTime protectionDate;
+
+  /**
+   * The reference number of the court's opinion for a court mark, or the number of the mark of the
+   * treaty or statute.
+   */
+  @XmlElement(name = "refNum")
+  String referenceNumber;
+
+  public DateTime getProtectionDate() {
+    return protectionDate;
+  }
+
+  public String getReferenceNumber() {
+    return referenceNumber;
+  }
+}

java/google/registry/model/mark/Trademark.java

@@ -0,0 +1,99 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.domain.registry.model.mark;
+
+import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
+
+import com.google.common.collect.ImmutableList;
+
+import org.joda.time.DateTime;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/** Holds information about a registered trademark. */
+@XmlType(propOrder = {
+    "id",
+    "markName",
+    "markHolders",
+    "contacts",
+    "jurisdiction",
+    "markClasses",
+    "labels",
+    "goodsAndServices",
+    "applicationId",
+    "applicationDate",
+    "registrationNumber",
+    "registrationDate",
+    "expirationDate"})
+public class Trademark extends CommonMarkFields {
+
+  /** Two character code of the jurisdiction where the mark was registered. */
+  String jurisdiction;
+
+  /** Nice Classification numbers of the mark. */
+  @XmlElement(name = "class")
+  List<Long> markClasses;
+
+  /** The trademark application id registered in the trademark office. */
+  @XmlElement(name = "apId")
+  String applicationId;
+
+  /** The date that the trademark was applied for. */
+  @XmlElement(name = "apDate")
+  DateTime applicationDate;
+
+  /** The trademark registration number registered in the trademark office. */
+  @XmlElement(name = "regNum")
+  String registrationNumber;
+
+  /** The date the trademark was registered. */
+  @XmlElement(name = "regDate")
+  DateTime registrationDate;
+
+  /** Expiration date of the trademark. */
+  @XmlElement(name = "exDate")
+  DateTime expirationDate;
+
+  public String getJurisdiction() {
+    return jurisdiction;
+  }
+
+  public ImmutableList<Long> getMarkClasses() {
+    return nullToEmptyImmutableCopy(markClasses);
+  }
+
+  public String getApplicationId() {
+    return applicationId;
+  }
+
+  public DateTime getApplicationDate() {
+    return applicationDate;
+  }
+
+  public String getRegistrationNumber() {
+    return registrationNumber;
+  }
+
+  public DateTime getRegistrationDate() {
+    return registrationDate;
+  }
+
+  public DateTime getExpirationDate() {
+    return expirationDate;
+  }
+}

java/google/registry/model/mark/TreatyOrStatuteMark.java

@@ -0,0 +1,65 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.domain.registry.model.mark;
+
+import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
+
+import com.google.common.collect.ImmutableList;
+
+import org.joda.time.DateTime;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/** Information about a mark derived from a treaty or statute. */
+@XmlType(propOrder = {
+    "id",
+    "markName",
+    "markHolders",
+    "contacts",
+    "markProtections",
+    "labels",
+    "goodsAndServices",
+    "referenceNumber",
+    "protectionDate",
+    "title",
+    "executionDate"})
+public class TreatyOrStatuteMark extends ProtectedMark {
+
+  /** A list of countries and region of the country where the mark is protected. */
+  @XmlElement(name = "protection")
+  List<MarkProtection> markProtections;
+
+  /** The title of the treaty or statute. */
+  String title;
+
+  /** Execution date of the treaty or statute. */
+  @XmlElement(name = "execDate")
+  DateTime executionDate;
+
+  public ImmutableList<MarkProtection> getMarkProtections() {
+    return nullToEmptyImmutableCopy(markProtections);
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public DateTime getExecutionDate() {
+    return executionDate;
+  }
+}

java/google/registry/model/mark/package-info.java

@@ -0,0 +1,31 @@
+// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+@XmlSchema(
+    namespace = "urn:ietf:params:xml:ns:mark-1.0",
+    xmlns = @XmlNs(prefix = "mark", namespaceURI = "urn:ietf:params:xml:ns:mark-1.0"),
+    elementFormDefault = XmlNsForm.QUALIFIED)
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlJavaTypeAdapter(UtcDateTimeAdapter.class)
+package com.google.domain.registry.model.mark;
+
+import com.google.domain.registry.xml.UtcDateTimeAdapter;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlSchema;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+