From c458c058017e3cf8a4ee72a2ef87ee321a3310e3 Mon Sep 17 00:00:00 2001 From: Michael Muller Date: Tue, 26 Apr 2016 11:05:00 -0400 Subject: [PATCH] Rename Java packages to use the .google TLD The dark lord Gosling designed the Java package naming system so that ownership flows from the DNS system. Since we own the domain name registry.google, it seems only appropriate that we should use google.registry as our package name. --- CONTRIBUTORS | 2 +- README.md | 8 +- WORKSPACE | 2 +- java/google/registry/BUILD | 8 +- java/google/registry/backup/BUILD | 14 +- java/google/registry/backup/BackupModule.java | 21 +- java/google/registry/backup/BackupUtils.java | 7 +- .../backup/CommitLogCheckpointAction.java | 26 +- .../backup/CommitLogCheckpointStrategy.java | 19 +- .../backup/DeleteOldCommitLogsAction.java | 27 +- .../backup/ExportCommitLogDiffAction.java | 39 +- .../registry/backup/GcsDiffFileLister.java | 19 +- .../backup/RestoreCommitLogsAction.java | 29 +- java/google/registry/backup/package-info.java | 2 +- java/google/registry/bigquery/BUILD | 10 +- .../registry/bigquery/BigqueryConnection.java | 25 +- .../registry/bigquery/BigqueryFactory.java | 7 +- .../bigquery/BigqueryJobFailureException.java | 2 +- .../registry/bigquery/BigqueryModule.java | 17 +- .../registry/bigquery/BigqueryUtils.java | 2 +- .../registry/bigquery/package-info.java | 2 +- java/google/registry/braintree/BUILD | 10 +- .../registry/braintree/BraintreeModule.java | 10 +- .../braintree/BraintreeRegistrarSyncer.java | 7 +- .../registry/braintree/package-info.java | 2 +- java/google/registry/config/BUILD | 4 +- java/google/registry/config/ConfigModule.java | 56 +- java/google/registry/config/ConfigUtils.java | 2 +- .../registry/config/RegistryConfig.java | 38 +- .../registry/config/RegistryEnvironment.java | 4 +- .../registry/config/TestRegistryConfig.java | 4 +- java/google/registry/config/package-info.java | 2 +- java/google/registry/cron/BUILD | 10 +- .../registry/cron/CommitLogFanoutAction.java | 11 +- java/google/registry/cron/CronModule.java | 13 +- .../google/registry/cron/TldFanoutAction.java | 19 +- java/google/registry/cron/package-info.java | 2 +- java/google/registry/dns/BUILD | 14 +- java/google/registry/dns/DnsConstants.java | 2 +- java/google/registry/dns/DnsModule.java | 29 +- java/google/registry/dns/DnsQueue.java | 23 +- .../registry/dns/PublishDnsUpdatesAction.java | 25 +- .../registry/dns/ReadDnsQueueAction.java | 27 +- .../google/registry/dns/RefreshDnsAction.java | 22 +- java/google/registry/dns/WriteDnsAction.java | 33 +- java/google/registry/dns/writer/api/BUILD | 4 +- .../registry/dns/writer/api/DnsWriter.java | 2 +- .../dns/writer/api/DnsWriterZone.java | 2 +- .../dns/writer/api/VoidDnsWriter.java | 2 +- .../dns/writer/api/VoidDnsWriterModule.java | 2 +- .../registry/dns/writer/dnsupdate/BUILD | 12 +- .../writer/dnsupdate/DnsMessageTransport.java | 5 +- .../dnsupdate/DnsUpdateConfigModule.java | 10 +- .../dns/writer/dnsupdate/DnsUpdateWriter.java | 19 +- .../dnsupdate/DnsUpdateWriterModule.java | 10 +- java/google/registry/eclipse/BUILD | 28 +- java/google/registry/env/BUILD | 4 +- java/google/registry/env/common/BUILD | 4 +- java/google/registry/env/common/backend/BUILD | 4 +- .../env/common/backend/WEB-INF/web.xml | 8 +- java/google/registry/env/common/default/BUILD | 4 +- .../env/common/default/WEB-INF/web.xml | 12 +- java/google/registry/env/common/tools/BUILD | 4 +- .../registry/env/common/tools/WEB-INF/web.xml | 12 +- java/google/registry/env/production/BUILD | 4 +- .../registry/env/production/backend/BUILD | 4 +- .../backend/WEB-INF/appengine-web.xml | 2 +- .../registry/env/production/default/BUILD | 4 +- .../default/WEB-INF/appengine-web.xml | 2 +- .../registry/env/production/tools/BUILD | 4 +- .../tools/WEB-INF/appengine-web.xml | 2 +- java/google/registry/export/BUILD | 24 +- .../export/BigqueryPollJobAction.java | 19 +- .../registry/export/CheckSnapshotServlet.java | 17 +- .../registry/export/DatastoreBackupInfo.java | 9 +- .../export/DatastoreBackupService.java | 5 +- java/google/registry/export/DriveModule.java | 17 +- .../registry/export/ExportConstants.java | 55 +- .../export/ExportDomainListsAction.java | 29 +- .../registry/export/ExportRequestModule.java | 30 +- .../export/ExportReservedTermsAction.java | 21 +- .../export/ExportSnapshotServlet.java | 13 +- java/google/registry/export/ExportUtils.java | 13 +- .../registry/export/LoadSnapshotAction.java | 31 +- .../export/PublishDetailReportAction.java | 23 +- .../export/SyncGroupMembersAction.java | 29 +- .../export/UpdateSnapshotViewAction.java | 19 +- java/google/registry/export/package-info.java | 2 +- java/google/registry/export/sheet/BUILD | 12 +- .../registry/export/sheet/SheetModule.java | 5 +- .../export/sheet/SheetSynchronizer.java | 2 +- .../sheet/SpreadsheetServiceModule.java | 2 +- .../export/sheet/SyncRegistrarsSheet.java | 27 +- .../sheet/SyncRegistrarsSheetAction.java | 19 +- .../registry/export/sheet/package-info.java | 2 +- java/google/registry/flows/BUILD | 28 +- .../registry/flows/EppConsoleServlet.java | 13 +- java/google/registry/flows/EppController.java | 33 +- java/google/registry/flows/EppException.java | 13 +- .../registry/flows/EppServletUtils.java | 7 +- java/google/registry/flows/EppTlsServlet.java | 6 +- .../google/registry/flows/EppToolServlet.java | 11 +- .../registry/flows/EppXmlTransformer.java | 37 +- java/google/registry/flows/Flow.java | 19 +- java/google/registry/flows/FlowRegistry.java | 127 ++-- java/google/registry/flows/FlowRunner.java | 25 +- .../registry/flows/HttpSessionMetadata.java | 2 +- java/google/registry/flows/LoggedInFlow.java | 23 +- .../flows/OwnedResourceMutateFlow.java | 8 +- ...wnedResourceMutatePendingTransferFlow.java | 10 +- .../flows/ResourceAsyncDeleteFlow.java | 24 +- .../registry/flows/ResourceCheckFlow.java | 19 +- .../registry/flows/ResourceCreateFlow.java | 27 +- .../flows/ResourceCreateOrMutateFlow.java | 24 +- .../registry/flows/ResourceDeleteFlow.java | 17 +- java/google/registry/flows/ResourceFlow.java | 19 +- .../registry/flows/ResourceFlowUtils.java | 51 +- .../registry/flows/ResourceInfoFlow.java | 17 +- .../registry/flows/ResourceMutateFlow.java | 12 +- .../ResourceMutatePendingTransferFlow.java | 24 +- .../registry/flows/ResourceQueryFlow.java | 12 +- .../flows/ResourceSyncDeleteFlow.java | 16 +- .../flows/ResourceTransferApproveFlow.java | 21 +- .../flows/ResourceTransferCancelFlow.java | 19 +- .../registry/flows/ResourceTransferFlow.java | 6 +- .../flows/ResourceTransferQueryFlow.java | 16 +- .../flows/ResourceTransferRejectFlow.java | 21 +- .../flows/ResourceTransferRequestFlow.java | 41 +- .../registry/flows/ResourceUpdateFlow.java | 23 +- .../registry/flows/SessionMetadata.java | 4 +- .../registry/flows/SingleResourceFlow.java | 15 +- .../StatelessRequestSessionMetadata.java | 2 +- .../google/registry/flows/TlsCredentials.java | 11 +- .../registry/flows/TransactionalFlow.java | 2 +- .../registry/flows/TransportCredentials.java | 8 +- .../registry/flows/async/AsyncFlowUtils.java | 11 +- .../flows/async/AsyncFlowsModule.java | 18 +- .../async/DeleteContactResourceAction.java | 16 +- .../flows/async/DeleteEppResourceAction.java | 55 +- .../flows/async/DeleteHostResourceAction.java | 18 +- .../async/DnsRefreshForHostRenameAction.java | 37 +- .../flows/contact/ContactCheckFlow.java | 19 +- .../flows/contact/ContactCreateFlow.java | 30 +- .../flows/contact/ContactDeleteFlow.java | 39 +- .../flows/contact/ContactFlowUtils.java | 17 +- .../flows/contact/ContactInfoFlow.java | 10 +- .../contact/ContactTransferApproveFlow.java | 20 +- .../contact/ContactTransferCancelFlow.java | 20 +- .../contact/ContactTransferQueryFlow.java | 16 +- .../contact/ContactTransferRejectFlow.java | 20 +- .../contact/ContactTransferRequestFlow.java | 22 +- .../flows/contact/ContactUpdateFlow.java | 28 +- .../flows/domain/BaseDomainCheckFlow.java | 17 +- .../flows/domain/BaseDomainCreateFlow.java | 89 +-- .../flows/domain/BaseDomainInfoFlow.java | 19 +- .../flows/domain/BaseDomainUpdateFlow.java | 45 +- .../flows/domain/ClaimsCheckFlow.java | 33 +- .../flows/domain/DomainAllocateFlow.java | 61 +- .../domain/DomainApplicationCreateFlow.java | 67 +- .../domain/DomainApplicationDeleteFlow.java | 45 +- .../domain/DomainApplicationInfoFlow.java | 35 +- .../domain/DomainApplicationUpdateFlow.java | 39 +- .../flows/domain/DomainCheckFlow.java | 45 +- .../flows/domain/DomainCreateFlow.java | 51 +- .../domain/DomainCreateOrAllocateFlow.java | 39 +- .../flows/domain/DomainDeleteFlow.java | 71 +-- .../flows/domain/DomainFlowUtils.java | 117 ++-- .../registry/flows/domain/DomainInfoFlow.java | 25 +- .../flows/domain/DomainRenewFlow.java | 73 +-- .../domain/DomainRestoreRequestFlow.java | 69 +- .../domain/DomainTransferApproveFlow.java | 51 +- .../domain/DomainTransferCancelFlow.java | 30 +- .../flows/domain/DomainTransferQueryFlow.java | 16 +- .../domain/DomainTransferRejectFlow.java | 30 +- .../domain/DomainTransferRequestFlow.java | 67 +- .../flows/domain/DomainUpdateFlow.java | 49 +- .../registry/flows/host/HostCheckFlow.java | 19 +- .../registry/flows/host/HostCreateFlow.java | 47 +- .../registry/flows/host/HostDeleteFlow.java | 39 +- .../registry/flows/host/HostFlowUtils.java | 23 +- .../registry/flows/host/HostInfoFlow.java | 10 +- .../registry/flows/host/HostUpdateFlow.java | 55 +- .../registry/flows/poll/PollAckFlow.java | 32 +- java/google/registry/flows/poll/PollFlow.java | 25 +- .../registry/flows/poll/PollRequestFlow.java | 22 +- .../registry/flows/session/HelloFlow.java | 8 +- .../registry/flows/session/LoginFlow.java | 63 +- .../registry/flows/session/LogoutFlow.java | 12 +- java/google/registry/gcs/BUILD | 8 +- .../google/registry/gcs/GcsServiceModule.java | 2 +- java/google/registry/gcs/GcsUtils.java | 7 +- java/google/registry/groups/BUILD | 10 +- .../groups/DirectoryGroupsConnection.java | 9 +- .../registry/groups/DirectoryModule.java | 17 +- .../registry/groups/GroupsConnection.java | 2 +- java/google/registry/groups/GroupsModule.java | 2 +- .../registry/groups/GroupssettingsModule.java | 17 +- java/google/registry/idn/BUILD | 4 +- java/google/registry/keyring/api/BUILD | 4 +- .../registry/keyring/api/KeyModule.java | 2 +- java/google/registry/keyring/api/Keyring.java | 26 +- .../registry/keyring/api/PgpHelper.java | 2 +- .../registry/keyring/api/VoidKeyring.java | 2 +- .../keyring/api/VoidKeyringModule.java | 2 +- .../registry/keyring/api/package-info.java | 2 +- java/google/registry/loadtest/BUILD | 14 +- java/google/registry/loadtest/LoadTask.java | 11 +- .../registry/loadtest/LoadTestAction.java | 13 +- .../registry/loadtest/LoadTestModule.java | 12 +- java/google/registry/mapreduce/BUILD | 12 +- .../registry/mapreduce/MapreduceAction.java | 4 +- .../registry/mapreduce/MapreduceModule.java | 15 +- .../registry/mapreduce/MapreduceRunner.java | 13 +- java/google/registry/mapreduce/inputs/BUILD | 8 +- .../mapreduce/inputs/ChildEntityInput.java | 11 +- .../mapreduce/inputs/ChildEntityReader.java | 17 +- .../mapreduce/inputs/ChunkingKeyInput.java | 2 +- .../mapreduce/inputs/ConcatenatingInput.java | 2 +- .../inputs/EppResourceBaseInput.java | 7 +- .../inputs/EppResourceBaseReader.java | 15 +- .../inputs/EppResourceEntityInput.java | 9 +- .../inputs/EppResourceEntityReader.java | 9 +- .../inputs/EppResourceIndexInput.java | 7 +- .../inputs/EppResourceIndexReader.java | 7 +- .../mapreduce/inputs/EppResourceInputs.java | 11 +- .../mapreduce/inputs/EppResourceKeyInput.java | 9 +- .../inputs/EppResourceKeyReader.java | 9 +- .../registry/mapreduce/inputs/NullInput.java | 2 +- .../registry/model/AbstractFieldExposer.java | 2 +- java/google/registry/model/BUILD | 10 +- .../registry/model/BackupGroupRoot.java | 2 +- java/google/registry/model/Buildable.java | 9 +- .../registry/model/CreateAutoTimestamp.java | 4 +- java/google/registry/model/EntityClasses.java | 77 +-- java/google/registry/model/EppResource.java | 19 +- .../registry/model/EppResourceUtils.java | 45 +- .../registry/model/ImmutableObject.java | 5 +- .../google/registry/model/JsonMapBuilder.java | 2 +- java/google/registry/model/Jsonifiable.java | 2 +- java/google/registry/model/ModelUtils.java | 2 +- java/google/registry/model/RoidSuffixes.java | 11 +- java/google/registry/model/SchemaVersion.java | 2 +- .../registry/model/UpdateAutoTimestamp.java | 7 +- .../annotations/ExternalMessagingName.java | 2 +- .../model/annotations/NotBackedUp.java | 2 +- .../model/annotations/VirtualEntity.java | 2 +- .../registry/model/billing/BillingEvent.java | 23 +- .../model/billing/RegistrarBillingEntry.java | 14 +- .../model/billing/RegistrarBillingUtils.java | 13 +- .../model/billing/RegistrarCredit.java | 15 +- .../model/billing/RegistrarCreditBalance.java | 9 +- .../model/common/CrossTldSingleton.java | 8 +- .../model/common/EntityGroupRoot.java | 6 +- .../model/common/GaeUserIdConverter.java | 13 +- .../model/common/PersistedRangeLong.java | 5 +- .../registry/model/common/TimeOfYear.java | 9 +- .../model/common/TimedTransitionProperty.java | 11 +- .../model/contact/ContactAddress.java | 6 +- .../model/contact/ContactAuthInfo.java | 8 +- .../model/contact/ContactCommand.java | 21 +- .../model/contact/ContactPhoneNumber.java | 6 +- .../model/contact/ContactResource.java | 17 +- .../registry/model/contact/Disclose.java | 11 +- .../registry/model/contact/PostalInfo.java | 9 +- .../registry/model/contact/package-info.java | 4 +- .../model/domain/DesignatedContact.java | 7 +- .../model/domain/DomainApplication.java | 17 +- .../registry/model/domain/DomainAuthInfo.java | 10 +- .../registry/model/domain/DomainBase.java | 29 +- .../registry/model/domain/DomainCommand.java | 31 +- .../model/domain/DomainRenewData.java | 4 +- .../registry/model/domain/DomainResource.java | 39 +- .../registry/model/domain/GracePeriod.java | 12 +- java/google/registry/model/domain/Period.java | 6 +- .../registry/model/domain/ReferenceUnion.java | 12 +- .../allocate/AllocateCreateExtension.java | 8 +- .../model/domain/allocate/package-info.java | 4 +- .../registry/model/domain/fee/BaseFee.java | 6 +- .../model/domain/fee/BaseFeeCommand.java | 4 +- .../domain/fee/BaseFeeCommandResponse.java | 7 +- .../model/domain/fee/BaseFeeRequest.java | 7 +- .../model/domain/fee/BaseFeeResponse.java | 11 +- .../registry/model/domain/fee/Credit.java | 2 +- .../google/registry/model/domain/fee/Fee.java | 2 +- .../model/domain/fee/FeeCheckExtension.java | 11 +- .../domain/fee/FeeCheckResponseExtension.java | 7 +- .../domain/fee/FeeCommandDescriptor.java | 5 +- .../model/domain/fee/FeeCreateExtension.java | 4 +- .../fee/FeeCreateResponseExtension.java | 4 +- .../fee/FeeDeleteResponseExtension.java | 9 +- .../model/domain/fee/FeeInfoExtension.java | 4 +- .../domain/fee/FeeInfoResponseExtension.java | 4 +- .../model/domain/fee/FeeRenewExtension.java | 4 +- .../domain/fee/FeeRenewResponseExtension.java | 4 +- .../domain/fee/FeeTransferExtension.java | 4 +- .../fee/FeeTransferResponseExtension.java | 4 +- .../model/domain/fee/FeeUpdateExtension.java | 4 +- .../fee/FeeUpdateResponseExtension.java | 4 +- .../model/domain/fee/package-info.java | 4 +- .../launch/ApplicationIdTargetExtension.java | 4 +- .../domain/launch/ApplicationStatus.java | 6 +- .../domain/launch/LaunchCheckExtension.java | 6 +- .../launch/LaunchCheckResponseExtension.java | 7 +- .../domain/launch/LaunchCreateExtension.java | 13 +- .../launch/LaunchCreateResponseExtension.java | 4 +- .../domain/launch/LaunchDeleteExtension.java | 2 +- .../model/domain/launch/LaunchExtension.java | 6 +- .../domain/launch/LaunchInfoExtension.java | 2 +- .../launch/LaunchInfoResponseExtension.java | 7 +- .../model/domain/launch/LaunchNotice.java | 5 +- .../model/domain/launch/LaunchPhase.java | 7 +- .../domain/launch/LaunchUpdateExtension.java | 2 +- .../model/domain/launch/package-info.java | 4 +- .../domain/metadata/MetadataExtension.java | 6 +- .../model/domain/metadata/package-info.java | 2 +- .../registry/model/domain/package-info.java | 10 +- .../model/domain/rgp/GracePeriodStatus.java | 6 +- .../model/domain/rgp/RestoreCommand.java | 2 +- .../model/domain/rgp/RgpInfoExtension.java | 7 +- .../model/domain/rgp/RgpUpdateExtension.java | 6 +- .../model/domain/rgp/package-info.java | 2 +- .../domain/secdns/DelegationSignerData.java | 5 +- .../domain/secdns/SecDnsCreateExtension.java | 9 +- .../domain/secdns/SecDnsInfoExtension.java | 7 +- .../domain/secdns/SecDnsUpdateExtension.java | 9 +- .../model/domain/secdns/package-info.java | 2 +- .../registry/model/eppcommon/Address.java | 19 +- .../registry/model/eppcommon/AuthInfo.java | 8 +- .../registry/model/eppcommon/PhoneNumber.java | 11 +- .../model/eppcommon/PresenceMarker.java | 6 +- .../model/eppcommon/ProtocolDefinition.java | 17 +- .../registry/model/eppcommon/StatusValue.java | 6 +- .../google/registry/model/eppcommon/Trid.java | 5 +- .../model/eppcommon/package-info.java | 2 +- .../registry/model/eppinput/EppInput.java | 51 +- .../model/eppinput/ResourceCommand.java | 19 +- .../registry/model/eppinput/package-info.java | 2 +- .../registry/model/eppoutput/CheckData.java | 7 +- .../registry/model/eppoutput/CreateData.java | 4 +- .../registry/model/eppoutput/EppOutput.java | 5 +- .../registry/model/eppoutput/Greeting.java | 10 +- .../registry/model/eppoutput/Response.java | 67 +- .../registry/model/eppoutput/Result.java | 7 +- .../model/eppoutput/package-info.java | 4 +- .../model/export/LogsExportCursor.java | 11 +- .../registry/model/generate_field_exposer.sh | 4 +- .../model/generate_field_exposer_registry.sh | 6 +- .../registry/model/host/HostCommand.java | 15 +- .../registry/model/host/HostResource.java | 25 +- .../model/host/InetAddressAdapter.java | 2 +- .../registry/model/host/package-info.java | 4 +- .../model/index/DomainApplicationIndex.java | 17 +- .../model/index/EppResourceIndex.java | 9 +- .../model/index/EppResourceIndexBucket.java | 11 +- .../registry/model/index/ForeignKeyIndex.java | 19 +- .../model/mark/CommonMarkContactFields.java | 4 +- .../registry/model/mark/CommonMarkFields.java | 7 +- .../google/registry/model/mark/CourtMark.java | 4 +- java/google/registry/model/mark/Mark.java | 7 +- .../registry/model/mark/MarkAddress.java | 4 +- .../registry/model/mark/MarkContact.java | 2 +- .../registry/model/mark/MarkHolder.java | 2 +- .../registry/model/mark/MarkPhoneNumber.java | 4 +- .../registry/model/mark/MarkProtection.java | 7 +- .../registry/model/mark/ProtectedMark.java | 2 +- .../google/registry/model/mark/Trademark.java | 4 +- .../model/mark/TreatyOrStatuteMark.java | 4 +- .../registry/model/mark/package-info.java | 4 +- .../registry/model/ofy/AugmentedDeleter.java | 4 +- .../registry/model/ofy/AugmentedSaver.java | 2 +- .../registry/model/ofy/CommitLogBucket.java | 19 +- .../model/ofy/CommitLogCheckpoint.java | 9 +- .../model/ofy/CommitLogCheckpointRoot.java | 12 +- .../registry/model/ofy/CommitLogManifest.java | 11 +- .../registry/model/ofy/CommitLogMutation.java | 11 +- .../registry/model/ofy/CommitLoggedWork.java | 13 +- .../registry/model/ofy/ObjectifyService.java | 27 +- java/google/registry/model/ofy/Ofy.java | 27 +- java/google/registry/model/ofy/OfyFilter.java | 2 +- .../registry/model/ofy/ReadOnlyWork.java | 6 +- .../ofy/SessionKeyExposingObjectify.java | 2 +- .../ofy/TimestampInversionException.java | 5 +- .../registry/model/ofy/TransactionInfo.java | 4 +- java/google/registry/model/package-info.java | 4 +- .../registry/model/poll/MessageQueueInfo.java | 4 +- .../PendingActionNotificationResponse.java | 9 +- .../registry/model/poll/PollMessage.java | 43 +- .../poll/PollMessageExternalKeyConverter.java | 15 +- .../registry/model/poll/package-info.java | 4 +- java/google/registry/model/rde/RdeMode.java | 2 +- .../registry/model/rde/RdeNamingUtils.java | 2 +- .../registry/model/rde/RdeRevision.java | 9 +- .../registry/model/registrar/Registrar.java | 39 +- .../model/registrar/RegistrarAddress.java | 8 +- .../model/registrar/RegistrarContact.java | 19 +- .../registry/model/registry/Registries.java | 13 +- .../registry/model/registry/Registry.java | 39 +- .../model/registry/RegistryCursor.java | 7 +- .../registry/label/BaseDomainLabelList.java | 17 +- .../registry/label/DomainLabelEntry.java | 10 +- .../model/registry/label/PremiumList.java | 25 +- .../model/registry/label/ReservationType.java | 2 +- .../model/registry/label/ReservedList.java | 21 +- .../model/registry/label/package-info.java | 2 +- .../model/reporting/HistoryEntry.java | 14 +- java/google/registry/model/server/Lock.java | 21 +- .../registry/model/server/ServerSecret.java | 14 +- .../model/smd/AbstractSignedMark.java | 2 +- .../registry/model/smd/EncodedSignedMark.java | 5 +- .../google/registry/model/smd/IssuerInfo.java | 6 +- .../smd/RemoveWhitespaceTextAdapter.java | 2 +- .../google/registry/model/smd/SignedMark.java | 6 +- .../model/smd/SignedMarkRevocationList.java | 27 +- .../registry/model/smd/package-info.java | 4 +- .../registry/model/tmch/ClaimsListShard.java | 27 +- java/google/registry/model/tmch/TmchCrl.java | 14 +- .../model/transfer/BaseTransferObject.java | 6 +- .../registry/model/transfer/TransferData.java | 15 +- .../model/transfer/TransferResponse.java | 8 +- .../model/transfer/TransferStatus.java | 2 +- .../registry/model/transfer/package-info.java | 4 +- .../AbstractSimpleTranslatorFactory.java | 6 +- .../CidrAddressBlockTranslatorFactory.java | 4 +- .../CommitLogRevisionsTranslatorFactory.java | 15 +- .../CreateAutoTimestampTranslatorFactory.java | 6 +- .../translators/CurrencyUnitAdapter.java | 2 +- .../CurrencyUnitTranslatorFactory.java | 2 +- .../DurationTranslatorFactory.java | 2 +- .../translators/EnumToAttributeAdapter.java | 2 +- .../ImmutableSortedMapTranslatorFactory.java | 4 +- .../InetAddressTranslatorFactory.java | 2 +- .../ReadableInstantUtcTranslatorFactory.java | 3 +- .../model/translators/StatusValueAdapter.java | 4 +- .../UpdateAutoTimestampTranslatorFactory.java | 6 +- java/google/registry/module/backend/BUILD | 48 +- .../module/backend/BackendComponent.java | 50 +- .../module/backend/BackendModule.java | 12 +- .../backend/BackendRequestComponent.java | 92 +-- .../module/backend/BackendServlet.java | 7 +- .../registry/module/backend/package-info.java | 2 +- java/google/registry/module/frontend/BUILD | 28 +- .../module/frontend/FrontendComponent.java | 20 +- .../frontend/FrontendRequestComponent.java | 42 +- .../module/frontend/FrontendServlet.java | 7 +- .../module/frontend/package-info.java | 2 +- java/google/registry/module/tools/BUILD | 28 +- .../registry/module/tools/ToolsComponent.java | 38 +- .../module/tools/ToolsRequestComponent.java | 56 +- .../registry/module/tools/ToolsServlet.java | 7 +- .../google/registry/monitoring/whitebox/BUILD | 20 +- .../whitebox/EntityIntegrityAlertsSchema.java | 6 +- .../monitoring/whitebox/EppMetrics.java | 7 +- .../registry/monitoring/whitebox/Metrics.java | 13 +- .../whitebox/MetricsExportAction.java | 19 +- .../whitebox/VerifyEntityIntegrityAction.java | 63 +- .../VerifyEntityIntegrityStreamer.java | 21 +- .../whitebox/WhiteboxComponent.java | 12 +- .../monitoring/whitebox/WhiteboxModule.java | 15 +- .../monitoring/whitebox/package-info.java | 2 +- java/google/registry/rdap/BUILD | 12 +- java/google/registry/rdap/RdapActionBase.java | 33 +- .../registry/rdap/RdapAutnumAction.java | 13 +- .../registry/rdap/RdapDomainAction.java | 19 +- .../registry/rdap/RdapDomainSearchAction.java | 35 +- .../registry/rdap/RdapEntityAction.java | 25 +- .../registry/rdap/RdapEntitySearchAction.java | 37 +- java/google/registry/rdap/RdapHelpAction.java | 21 +- .../rdap/RdapIcannStandardInformation.java | 2 +- java/google/registry/rdap/RdapIpAction.java | 13 +- .../registry/rdap/RdapJsonFormatter.java | 37 +- java/google/registry/rdap/RdapModule.java | 7 +- .../registry/rdap/RdapNameserverAction.java | 19 +- .../rdap/RdapNameserverSearchAction.java | 35 +- .../registry/rdap/RdapSearchPattern.java | 4 +- java/google/registry/rde/BUILD | 26 +- java/google/registry/rde/BrdaCopyAction.java | 23 +- .../rde/ContactResourceToXjcConverter.java | 44 +- java/google/registry/rde/DepositFragment.java | 2 +- .../rde/DomainResourceToXjcConverter.java | 53 +- .../google/registry/rde/EscrowTaskRunner.java | 26 +- java/google/registry/rde/Ghostryde.java | 11 +- .../rde/HostResourceToXjcConverter.java | 19 +- java/google/registry/rde/JSchModule.java | 5 +- java/google/registry/rde/JSchSftpChannel.java | 2 +- java/google/registry/rde/JSchSshSession.java | 7 +- java/google/registry/rde/PendingDeposit.java | 7 +- .../registry/rde/PendingDepositChecker.java | 23 +- java/google/registry/rde/RdeAdapter.java | 4 +- java/google/registry/rde/RdeCounter.java | 14 +- java/google/registry/rde/RdeMarshaller.java | 42 +- java/google/registry/rde/RdeModule.java | 9 +- java/google/registry/rde/RdeReportAction.java | 37 +- java/google/registry/rde/RdeReporter.java | 29 +- java/google/registry/rde/RdeResourceType.java | 9 +- .../google/registry/rde/RdeStagingAction.java | 37 +- .../google/registry/rde/RdeStagingMapper.java | 19 +- .../registry/rde/RdeStagingReducer.java | 39 +- java/google/registry/rde/RdeUploadAction.java | 49 +- java/google/registry/rde/RdeUploadUrl.java | 2 +- java/google/registry/rde/RdeUtil.java | 9 +- .../registry/rde/RegistrarToXjcConverter.java | 22 +- .../rde/RydePgpCompressionOutputStream.java | 7 +- .../rde/RydePgpEncryptionOutputStream.java | 7 +- .../registry/rde/RydePgpFileOutputStream.java | 7 +- .../rde/RydePgpSigningOutputStream.java | 5 +- .../registry/rde/RydeTarOutputStream.java | 7 +- java/google/registry/rde/package-info.java | 4 +- java/google/registry/request/Action.java | 2 +- java/google/registry/request/Actions.java | 2 +- java/google/registry/request/BUILD | 12 +- .../request/DelegatedOAuthScopes.java | 2 +- java/google/registry/request/Header.java | 2 +- .../registry/request/HttpException.java | 4 +- .../registry/request/JsonActionRunner.java | 2 +- java/google/registry/request/JsonPayload.java | 2 +- .../google/registry/request/JsonResponse.java | 2 +- java/google/registry/request/Modules.java | 9 +- java/google/registry/request/OAuthScopes.java | 2 +- java/google/registry/request/Parameter.java | 2 +- .../google/registry/request/ParameterMap.java | 2 +- java/google/registry/request/Payload.java | 2 +- .../registry/request/RequestHandler.java | 11 +- .../registry/request/RequestMethod.java | 2 +- .../registry/request/RequestModule.java | 7 +- .../registry/request/RequestParameters.java | 5 +- java/google/registry/request/RequestPath.java | 2 +- .../google/registry/request/RequestScope.java | 2 +- java/google/registry/request/Response.java | 2 +- .../google/registry/request/ResponseImpl.java | 2 +- java/google/registry/request/Route.java | 2 +- java/google/registry/request/Router.java | 2 +- .../registry/request/ServletDelegate.java | 2 +- .../google/registry/request/package-info.java | 2 +- java/google/registry/security/BUILD | 10 +- java/google/registry/security/JsonHttp.java | 5 +- .../registry/security/JsonResponseHelper.java | 2 +- .../security/JsonTransportServlet.java | 4 +- .../security/XsrfProtectedServlet.java | 6 +- .../registry/security/XsrfTokenManager.java | 13 +- .../registry/security/package-info.java | 2 +- java/google/registry/storage/drive/BUILD | 4 +- .../storage/drive/DriveConnection.java | 2 +- java/google/registry/tldconfig/idn/BUILD | 6 +- .../tldconfig/idn/IdnLabelValidator.java | 11 +- .../registry/tldconfig/idn/IdnTable.java | 2 +- .../registry/tldconfig/idn/IdnTableEnum.java | 2 +- .../idn/JapaneseLanguageValidator.java | 2 +- .../tldconfig/idn/LanguageValidator.java | 2 +- java/google/registry/tmch/BUILD | 18 +- .../registry/tmch/ClaimsListParser.java | 5 +- java/google/registry/tmch/LordnLog.java | 2 +- .../tmch/LordnRequestInitializer.java | 9 +- java/google/registry/tmch/LordnTask.java | 11 +- java/google/registry/tmch/Marksdb.java | 13 +- .../registry/tmch/NordnUploadAction.java | 27 +- .../registry/tmch/NordnVerifyAction.java | 21 +- java/google/registry/tmch/SmdrlCsvParser.java | 5 +- .../tmch/TmchCertificateAuthority.java | 23 +- java/google/registry/tmch/TmchCrlAction.java | 9 +- java/google/registry/tmch/TmchData.java | 5 +- java/google/registry/tmch/TmchDnlAction.java | 13 +- java/google/registry/tmch/TmchModule.java | 16 +- .../google/registry/tmch/TmchSmdrlAction.java | 13 +- .../registry/tmch/TmchXmlSignature.java | 4 +- java/google/registry/tmch/package-info.java | 2 +- .../registry/tools/AllocateDomainCommand.java | 39 +- .../registry/tools/AppEngineConnection.java | 13 +- .../registry/tools/AuctionStatusCommand.java | 19 +- java/google/registry/tools/BUILD | 50 +- .../registry/tools/BigqueryCommand.java | 6 +- .../tools/BigqueryCommandUtilities.java | 5 +- .../registry/tools/BigqueryParameters.java | 7 +- .../tools/CanonicalizeLabelsCommand.java | 13 +- .../registry/tools/CheckSnapshotCommand.java | 9 +- java/google/registry/tools/Command.java | 2 +- .../registry/tools/CommandUtilities.java | 13 +- .../registry/tools/ConfirmingCommand.java | 6 +- .../registry/tools/ConvertIdnCommand.java | 12 +- .../tools/CreateAnchorTenantCommand.java | 11 +- .../tools/CreateAuctionCreditsCommand.java | 15 +- .../registry/tools/CreateContactCommand.java | 9 +- .../tools/CreateCreditBalanceCommand.java | 16 +- .../registry/tools/CreateCreditCommand.java | 14 +- .../CreateOrUpdatePremiumListCommand.java | 15 +- .../tools/CreateOrUpdateRegistrarCommand.java | 25 +- .../CreateOrUpdateReservedListCommand.java | 6 +- .../tools/CreateOrUpdateTldCommand.java | 29 +- .../tools/CreatePremiumListCommand.java | 7 +- .../tools/CreateRegistrarCommand.java | 17 +- .../tools/CreateRegistrarGroupsCommand.java | 11 +- .../tools/CreateReservedListCommand.java | 9 +- .../tools/CreateSandboxTldCommand.java | 8 +- .../registry/tools/CreateTldCommand.java | 11 +- .../registry/tools/DeleteCreditCommand.java | 12 +- .../registry/tools/DeleteDomainCommand.java | 7 +- .../registry/tools/DeleteEntityCommand.java | 5 +- .../tools/DeleteEppResourceCommand.java | 15 +- .../tools/DeletePremiumListCommand.java | 8 +- .../tools/DeleteReservedListCommand.java | 5 +- .../tools/DomainApplicationInfoCommand.java | 11 +- .../tools/DomainCheckClaimsCommand.java | 7 +- .../registry/tools/DomainCheckCommand.java | 7 +- .../registry/tools/DomainCheckFeeCommand.java | 7 +- .../tools/EncryptEscrowDepositCommand.java | 8 +- .../google/registry/tools/EppToolCommand.java | 15 +- .../tools/EscrowDepositEncryptor.java | 33 +- .../registry/tools/ExecuteEppCommand.java | 5 +- .../GenerateApplicationsReportCommand.java | 37 +- .../tools/GenerateAuctionDataCommand.java | 37 +- .../tools/GenerateDnsReportCommand.java | 23 +- .../tools/GenerateEscrowDepositCommand.java | 53 +- .../registry/tools/GenerateLordnCommand.java | 13 +- .../tools/GenerateZoneFilesCommand.java | 9 +- .../registry/tools/GetApplicationCommand.java | 8 +- .../tools/GetApplicationIdsCommand.java | 15 +- .../tools/GetAppliedLabelsCommand.java | 24 +- .../registry/tools/GetClaimsListCommand.java | 9 +- .../registry/tools/GetContactCommand.java | 8 +- .../registry/tools/GetDomainCommand.java | 8 +- .../registry/tools/GetEppResourceCommand.java | 12 +- .../tools/GetHistoryEntriesCommand.java | 18 +- .../google/registry/tools/GetHostCommand.java | 8 +- .../registry/tools/GetRegistrarCommand.java | 10 +- .../tools/GetResourceByKeyCommand.java | 10 +- .../registry/tools/GetSchemaCommand.java | 8 +- .../registry/tools/GetSchemaTreeCommand.java | 13 +- java/google/registry/tools/GetTldCommand.java | 12 +- .../registry/tools/GhostrydeCommand.java | 9 +- java/google/registry/tools/GtechTool.java | 5 +- .../tools/HashCertificateCommand.java | 9 +- java/google/registry/tools/HelpCommand.java | 2 +- java/google/registry/tools/Injector.java | 2 +- .../registry/tools/ListCreditsCommand.java | 15 +- .../registry/tools/ListCursorsCommand.java | 15 +- .../registry/tools/ListDomainsCommand.java | 6 +- .../registry/tools/ListHostsCommand.java | 6 +- .../registry/tools/ListObjectsCommand.java | 13 +- .../tools/ListPremiumListsCommand.java | 6 +- .../registry/tools/ListRegistrarsCommand.java | 8 +- .../tools/ListReservedListsCommand.java | 6 +- .../registry/tools/ListTldsCommand.java | 8 +- .../registry/tools/LoadSnapshotCommand.java | 7 +- .../registry/tools/LoggingParameters.java | 7 +- .../tools/MakeBillingTablesCommand.java | 13 +- .../registry/tools/MutatingCommand.java | 13 +- .../tools/MutatingEppToolCommand.java | 2 +- .../registry/tools/PasswordGenerator.java | 2 +- .../registry/tools/PendingEscrowCommand.java | 9 +- .../tools/PublishDetailReportCommand.java | 9 +- .../tools/RandomPasswordGenerator.java | 2 +- .../tools/RegistrarActivityReportCommand.java | 11 +- .../tools/RegistrarContactCommand.java | 21 +- java/google/registry/tools/RegistryCli.java | 11 +- java/google/registry/tools/RegistryTool.java | 5 +- .../registry/tools/RegistryToolComponent.java | 18 +- .../tools/RegistryToolEnvironment.java | 7 +- .../registry/tools/RegistryToolModule.java | 2 +- .../ResaveEnvironmentEntitiesCommand.java | 18 +- .../tools/SendEscrowReportToIcannCommand.java | 10 +- .../registry/tools/ServerSideCommand.java | 5 +- .../registry/tools/SetupOteCommand.java | 19 +- .../tools/UpdateApplicationStatusCommand.java | 29 +- .../tools/UpdateClaimsNoticeCommand.java | 17 +- .../registry/tools/UpdateCreditsCommand.java | 15 +- .../registry/tools/UpdateCursorsCommand.java | 11 +- .../tools/UpdatePremiumListCommand.java | 8 +- .../tools/UpdateRegistrarCommand.java | 8 +- .../tools/UpdateReservedListCommand.java | 11 +- .../tools/UpdateSandboxTldCommand.java | 8 +- .../tools/UpdateServerLocksCommand.java | 9 +- .../registry/tools/UpdateSmdCommand.java | 23 +- .../registry/tools/UpdateTldCommand.java | 9 +- .../tools/UploadClaimsListCommand.java | 9 +- .../google/registry/tools/UserIdProvider.java | 2 +- .../tools/ValidateEscrowDepositCommand.java | 27 +- .../ValidateLoginCredentialsCommand.java | 37 +- .../registry/tools/VerifyOteCommand.java | 13 +- .../registry/tools/WhoisQueryCommand.java | 13 +- .../tools/javascrap/LoadAndResaveCommand.java | 19 +- java/google/registry/tools/package-info.java | 2 +- java/google/registry/tools/params/BUILD | 10 +- .../tools/params/DateTimeParameter.java | 2 +- .../tools/params/DurationParameter.java | 2 +- .../params/EppResourceTypeParameter.java | 10 +- .../tools/params/HostAndPortParameter.java | 2 +- .../params/InternetDomainNameParameter.java | 2 +- .../tools/params/LocalDateParameter.java | 2 +- .../tools/params/LoggingLevelParameter.java | 2 +- .../registry/tools/params/LongParameter.java | 2 +- .../registry/tools/params/MoneyParameter.java | 2 +- .../tools/params/OptionalLongParameter.java | 2 +- .../OptionalParameterConverterValidator.java | 5 +- .../params/OptionalPhoneNumberParameter.java | 2 +- .../tools/params/OptionalStringParameter.java | 2 +- .../params/ParameterConverterValidator.java | 2 +- .../tools/params/ParameterFactory.java | 2 +- .../registry/tools/params/PathParameter.java | 2 +- .../tools/params/PhoneNumberParameter.java | 2 +- .../tools/params/StringParameter.java | 2 +- .../tools/params/TransitionListParameter.java | 5 +- .../tools/params/YearMonthParameter.java | 2 +- .../registry/tools/params/package-info.java | 2 +- java/google/registry/tools/server/BUILD | 24 +- .../tools/server/CreateGroupsAction.java | 33 +- .../CreateOrUpdatePremiumListAction.java | 9 +- .../tools/server/CreatePremiumListAction.java | 13 +- .../tools/server/DeleteEntityAction.java | 15 +- .../tools/server/DeleteProberDataAction.java | 37 +- .../tools/server/GenerateZoneFilesAction.java | 39 +- .../tools/server/KillAllCommitLogsAction.java | 50 +- .../server/KillAllCrossTldEntitiesAction.java | 105 ---- .../tools/server/KillAllEntitiesReducer.java | 4 +- .../server/KillAllEppResourcesAction.java | 64 +- .../tools/server/ListDomainsAction.java | 19 +- .../tools/server/ListHostsAction.java | 17 +- .../tools/server/ListObjectsAction.java | 9 +- .../tools/server/ListPremiumListsAction.java | 15 +- .../tools/server/ListRegistrarsAction.java | 11 +- .../tools/server/ListReservedListsAction.java | 15 +- .../registry/tools/server/ListTldsAction.java | 16 +- .../server/ResaveAllEppResourcesAction.java | 19 +- .../tools/server/ToolsServerModule.java | 11 +- .../tools/server/UpdatePremiumListAction.java | 9 +- .../tools/server/VerifyOteAction.java | 85 +-- java/google/registry/tools/soy/BUILD | 6 +- java/google/registry/ui/BUILD | 44 +- .../registry/ui/ConsoleConfigModule.java | 5 +- java/google/registry/ui/ConsoleDebug.java | 2 +- java/google/registry/ui/css/BUILD | 4 +- java/google/registry/ui/externs/BUILD | 4 +- java/google/registry/ui/forms/BUILD | 4 +- .../registry/ui/forms/FormException.java | 2 +- java/google/registry/ui/forms/FormField.java | 2 +- .../registry/ui/forms/FormFieldException.java | 2 +- java/google/registry/ui/forms/FormFields.java | 2 +- .../registry/ui/forms/package-info.java | 2 +- java/google/registry/ui/globals.txt | 8 +- java/google/registry/ui/html/BUILD | 4 +- java/google/registry/ui/js/BUILD | 8 +- java/google/registry/ui/js/registrar/BUILD | 32 +- java/google/registry/ui/package-info.java | 2 +- java/google/registry/ui/server/BUILD | 20 +- .../ui/server/RegistrarFormFields.java | 21 +- .../registry/ui/server/SoyTemplateUtils.java | 7 +- java/google/registry/ui/server/StateCode.java | 2 +- java/google/registry/ui/server/api/BUILD | 16 +- .../ui/server/api/CheckApiServlet.java | 45 +- .../registry/ui/server/api/package-info.java | 2 +- .../registry/ui/server/package-info.java | 2 +- .../google/registry/ui/server/registrar/BUILD | 34 +- .../ui/server/registrar/ConsoleUiAction.java | 27 +- .../registrar/RegistrarPaymentAction.java | 25 +- .../RegistrarPaymentSetupAction.java | 21 +- .../ui/server/registrar/RegistrarServlet.java | 31 +- .../server/registrar/RegistrarUserModule.java | 8 +- .../ui/server/registrar/ResourceServlet.java | 19 +- .../ui/server/registrar/SessionUtils.java | 11 +- .../ui/server/registrar/package-info.java | 2 +- java/google/registry/ui/soy/BUILD | 10 +- java/google/registry/ui/soy/Console.soy | 10 +- java/google/registry/ui/soy/api/BUILD | 8 +- java/google/registry/ui/soy/registrar/BUILD | 44 +- .../registry/ui/soy/registrar/Console.soy | 6 +- .../registry/util/AppEngineTimeLimiter.java | 3 +- java/google/registry/util/BUILD | 6 +- .../registry/util/BasicHttpSession.java | 2 +- java/google/registry/util/CacheUtils.java | 5 +- .../registry/util/CapturingLogHandler.java | 2 +- .../registry/util/CidrAddressBlock.java | 2 +- java/google/registry/util/Clock.java | 2 +- .../google/registry/util/CollectionUtils.java | 2 +- java/google/registry/util/Concurrent.java | 2 +- .../registry/util/DatastoreServiceUtils.java | 2 +- java/google/registry/util/DateTimeUtils.java | 2 +- java/google/registry/util/DiffUtils.java | 2 +- .../google/registry/util/DomainNameUtils.java | 4 +- java/google/registry/util/FixedClock.java | 2 +- .../registry/util/FormattingLogger.java | 2 +- java/google/registry/util/HexDumper.java | 2 +- java/google/registry/util/Idn.java | 2 +- .../registry/util/ImprovedInputStream.java | 2 +- .../registry/util/ImprovedOutputStream.java | 2 +- .../google/registry/util/ListNamingUtils.java | 2 +- java/google/registry/util/NetworkUtils.java | 4 +- .../registry/util/NonFinalForTesting.java | 4 +- java/google/registry/util/ObjectifyUtils.java | 2 +- java/google/registry/util/PathargMatcher.java | 2 +- java/google/registry/util/PipelineUtils.java | 2 +- java/google/registry/util/PosixTarHeader.java | 2 +- .../registry/util/PreconditionsUtils.java | 2 +- java/google/registry/util/PredicateUtils.java | 2 +- java/google/registry/util/RegistrarUtils.java | 2 +- java/google/registry/util/ResourceUtils.java | 2 +- java/google/registry/util/Retrier.java | 7 +- .../registry/util/SendEmailService.java | 2 +- java/google/registry/util/SendEmailUtils.java | 7 +- java/google/registry/util/SerializeUtils.java | 2 +- java/google/registry/util/Sleeper.java | 4 +- java/google/registry/util/SqlTemplate.java | 4 +- java/google/registry/util/SystemClock.java | 2 +- java/google/registry/util/SystemSleeper.java | 2 +- java/google/registry/util/TaskEnqueuer.java | 2 +- .../google/registry/util/TeeOutputStream.java | 2 +- java/google/registry/util/TypeUtils.java | 4 +- .../registry/util/UrlFetchException.java | 2 +- java/google/registry/util/UrlFetchUtils.java | 2 +- java/google/registry/util/X509Utils.java | 2 +- java/google/registry/util/XmlEnumUtils.java | 2 +- java/google/registry/util/package-info.java | 2 +- java/google/registry/whois/BUILD | 14 +- .../registry/whois/DomainLookupCommand.java | 5 +- .../whois/DomainOrHostLookupCommand.java | 13 +- .../registry/whois/DomainWhoisResponse.java | 33 +- .../whois/NameserverLookupByHostCommand.java | 5 +- .../whois/NameserverLookupByIpCommand.java | 9 +- .../whois/NameserverWhoisResponse.java | 7 +- .../whois/RegistrarLookupCommand.java | 11 +- .../whois/RegistrarWhoisResponse.java | 6 +- java/google/registry/whois/Whois.java | 4 +- java/google/registry/whois/WhoisCommand.java | 2 +- .../google/registry/whois/WhoisException.java | 2 +- .../registry/whois/WhoisHttpServer.java | 15 +- java/google/registry/whois/WhoisModule.java | 6 +- java/google/registry/whois/WhoisReader.java | 6 +- java/google/registry/whois/WhoisResponse.java | 2 +- .../registry/whois/WhoisResponseImpl.java | 12 +- java/google/registry/whois/WhoisServer.java | 13 +- java/google/registry/whois/package-info.java | 2 +- java/google/registry/xjc/BUILD | 19 +- java/google/registry/xjc/README.missing-code | 2 +- java/google/registry/xjc/XjcObject.java | 4 +- .../registry/xjc/XjcXmlTransformer.java | 11 +- java/google/registry/xjc/bindings.xjb | 54 +- java/google/registry/xjc/generated_files.bzl | 6 +- .../registry/xjc/list_generated_files.sh | 10 +- java/google/registry/xjc/package-info.java | 2 +- java/google/registry/xjc/package-info.java.in | 2 +- java/google/registry/xml/BUILD | 4 +- java/google/registry/xml/DateAdapter.java | 2 +- java/google/registry/xml/PeriodAdapter.java | 2 +- .../registry/xml/UtcDateTimeAdapter.java | 2 +- java/google/registry/xml/ValidationMode.java | 2 +- java/google/registry/xml/XmlException.java | 2 +- .../registry/xml/XmlFragmentMarshaller.java | 2 +- java/google/registry/xml/XmlTransformer.java | 4 +- java/google/registry/xml/package-info.java | 2 +- javatests/google/registry/backup/BUILD | 15 +- .../backup/CommitLogCheckpointActionTest.java | 27 +- .../CommitLogCheckpointStrategyTest.java | 33 +- .../backup/DeleteOldCommitLogsActionTest.java | 22 +- .../backup/ExportCommitLogDiffActionTest.java | 35 +- .../backup/GcsDiffFileListerTest.java | 11 +- .../backup/RestoreCommitLogsActionTest.java | 41 +- javatests/google/registry/bigquery/BUILD | 11 +- .../bigquery/BigqueryConnectionTest.java | 2 +- .../bigquery/BigqueryFactoryTest.java | 4 +- .../registry/bigquery/BigqueryUtilsTest.java | 17 +- javatests/google/registry/config/BUILD | 9 +- .../config/RegistryEnvironmentTest.java | 2 +- javatests/google/registry/cron/BUILD | 13 +- .../cron/CommitLogFanoutActionTest.java | 19 +- .../registry/cron/TldFanoutActionTest.java | 25 +- javatests/google/registry/dns/BUILD | 23 +- .../google/registry/dns/DnsInjectionTest.java | 26 +- .../google/registry/dns/DnsQueueTest.java | 14 +- .../google/registry/dns/DnsTestComponent.java | 14 +- .../dns/PublishDnsUpdatesActionTest.java | 21 +- .../registry/dns/ReadDnsQueueActionTest.java | 37 +- .../registry/dns/RefreshDnsActionTest.java | 24 +- .../registry/dns/WriteDnsActionTest.java | 29 +- .../google/registry/dns/writer/api/BUILD | 5 +- .../dnsupdate/DnsMessageTransportTest.java | 2 +- .../writer/dnsupdate/DnsUpdateWriterTest.java | 39 +- javatests/google/registry/export/BUILD | 29 +- .../export/BigqueryPollJobActionTest.java | 29 +- .../export/CheckSnapshotServletTest.java | 19 +- .../export/DatastoreBackupInfoTest.java | 13 +- .../export/DatastoreBackupServiceTest.java | 13 +- .../registry/export/ExportConstantsTest.java | 5 +- .../export/ExportDomainListsActionTest.java | 27 +- .../export/ExportReservedTermsActionTest.java | 29 +- .../export/ExportSnapshotServletTest.java | 10 +- .../registry/export/ExportUtilsTest.java | 14 +- .../export/LoadSnapshotActionTest.java | 33 +- .../export/PublishDetailReportActionTest.java | 27 +- .../export/SyncGroupMembersActionTest.java | 31 +- .../export/UpdateSnapshotViewActionTest.java | 21 +- javatests/google/registry/export/sheet/BUILD | 15 +- .../export/sheet/SheetSynchronizerTest.java | 2 +- .../sheet/SyncRegistrarsSheetActionTest.java | 9 +- .../export/sheet/SyncRegistrarsSheetTest.java | 27 +- javatests/google/registry/flows/BUILD | 37 +- .../flows/EppConsoleAsAdminServletTest.java | 10 +- .../registry/flows/EppConsoleServletTest.java | 13 +- .../registry/flows/EppControllerTest.java | 16 +- .../registry/flows/EppServletTestCase.java | 37 +- .../flows/EppServletXmlLoginTestCase.java | 15 +- .../registry/flows/EppTlsServletTest.java | 13 +- .../registry/flows/EppToolServletTest.java | 19 +- .../google/registry/flows/FlowTestCase.java | 57 +- .../flows/ResourceCheckFlowTestCase.java | 8 +- .../registry/flows/ResourceFlowTestCase.java | 31 +- .../DeleteContactResourceActionTest.java | 55 +- .../DeleteEppResourceActionTestCase.java | 53 +- .../async/DeleteHostResourceActionTest.java | 37 +- .../DnsRefreshForHostRenameActionTest.java | 35 +- .../flows/contact/ContactCheckFlowTest.java | 14 +- .../flows/contact/ContactCreateFlowTest.java | 20 +- .../flows/contact/ContactDeleteFlowTest.java | 51 +- .../flows/contact/ContactInfoFlowTest.java | 37 +- .../ContactTransferApproveFlowTest.java | 43 +- .../ContactTransferCancelFlowTest.java | 37 +- .../contact/ContactTransferFlowTestCase.java | 22 +- .../contact/ContactTransferQueryFlowTest.java | 28 +- .../ContactTransferRejectFlowTest.java | 41 +- .../ContactTransferRequestFlowTest.java | 36 +- .../flows/contact/ContactUpdateFlowTest.java | 45 +- .../flows/domain/ClaimsCheckFlowTest.java | 29 +- .../flows/domain/DomainAllocateFlowTest.java | 107 ++-- .../DomainApplicationCreateFlowTest.java | 185 +++--- .../DomainApplicationDeleteFlowTest.java | 61 +- .../domain/DomainApplicationInfoFlowTest.java | 61 +- .../DomainApplicationUpdateFlowTest.java | 101 +-- .../flows/domain/DomainCheckFlowTest.java | 67 +- .../flows/domain/DomainCreateFlowTest.java | 181 +++--- .../flows/domain/DomainDeleteFlowTest.java | 99 +-- .../flows/domain/DomainInfoFlowTest.java | 61 +- .../flows/domain/DomainRenewFlowTest.java | 81 +-- .../domain/DomainRestoreRequestFlowTest.java | 81 +-- .../domain/DomainTransferApproveFlowTest.java | 77 +-- .../domain/DomainTransferCancelFlowTest.java | 49 +- .../domain/DomainTransferFlowTestCase.java | 67 +- .../domain/DomainTransferQueryFlowTest.java | 32 +- .../domain/DomainTransferRejectFlowTest.java | 51 +- .../domain/DomainTransferRequestFlowTest.java | 97 +-- .../flows/domain/DomainUpdateFlowTest.java | 117 ++-- .../flows/host/HostCheckFlowTest.java | 14 +- .../flows/host/HostCreateFlowTest.java | 43 +- .../flows/host/HostDeleteFlowTest.java | 57 +- .../registry/flows/host/HostInfoFlowTest.java | 25 +- .../flows/host/HostUpdateFlowTest.java | 87 +-- .../registry/flows/poll/PollAckFlowTest.java | 32 +- .../flows/poll/PollRequestFlowTest.java | 41 +- .../registry/flows/session/HelloFlowTest.java | 10 +- .../flows/session/LoginFlowTestCase.java | 34 +- .../session/LoginFlowViaConsoleTest.java | 15 +- .../flows/session/LoginFlowViaTlsTest.java | 21 +- .../flows/session/LogoutFlowTest.java | 10 +- javatests/google/registry/groups/BUILD | 13 +- .../groups/DirectoryGroupsConnectionTest.java | 9 +- .../google/registry/mapreduce/inputs/BUILD | 15 +- .../inputs/ChildEntityInputTest.java | 45 +- .../inputs/EppResourceInputsTest.java | 49 +- javatests/google/registry/model/BUILD | 19 +- .../model/CreateAutoTimestampTest.java | 10 +- .../registry/model/EntityClassesTest.java | 8 +- .../google/registry/model/EntityTestCase.java | 15 +- .../registry/model/EppResourceUtilsTest.java | 52 +- .../registry/model/ImmutableObjectTest.java | 9 +- .../google/registry/model/ModelUtilsTest.java | 7 +- .../model/ResourceCommandTestCase.java | 10 +- .../registry/model/RoidSuffixesTest.java | 10 +- .../registry/model/SchemaVersionTest.java | 11 +- .../model/UpdateAutoTimestampTest.java | 10 +- .../model/billing/BillingEventTest.java | 29 +- .../billing/RegistrarBillingEntryTest.java | 11 +- .../billing/RegistrarBillingUtilsTest.java | 23 +- .../billing/RegistrarCreditBalanceTest.java | 23 +- .../model/billing/RegistrarCreditTest.java | 20 +- .../model/common/GaeUserIdConverterTest.java | 8 +- .../model/common/PersistedRangeLongTest.java | 2 +- .../registry/model/common/TimeOfYearTest.java | 2 +- .../common/TimedTransitionPropertyTest.java | 9 +- .../model/contact/ContactCommandTest.java | 21 +- .../model/contact/ContactResourceTest.java | 37 +- .../model/domain/DomainApplicationTest.java | 49 +- .../model/domain/DomainCommandTest.java | 4 +- .../model/domain/DomainResourceTest.java | 53 +- .../model/domain/GracePeriodTest.java | 18 +- .../registry/model/eppoutput/ResultTest.java | 2 +- .../model/export/LogsExportCursorTest.java | 11 +- .../registry/model/host/HostCommandTest.java | 4 +- .../registry/model/host/HostResourceTest.java | 35 +- .../index/DomainApplicationIndexTest.java | 23 +- .../model/index/EppResourceIndexTest.java | 17 +- .../model/index/ForeignKeyIndexTest.java | 19 +- .../registry/model/mark/MarkContactTest.java | 2 +- .../registry/model/mark/MarkHolderTest.java | 2 +- .../model/mark/MarkProtectionTest.java | 2 +- .../model/ofy/CommitLogBucketTest.java | 23 +- .../model/ofy/CommitLogCheckpointTest.java | 13 +- .../model/ofy/CommitLogMutationTest.java | 13 +- .../model/ofy/ObjectifyServiceTest.java | 4 +- .../registry/model/ofy/OfyCommitLogTest.java | 23 +- .../registry/model/ofy/OfyFilterTest.java | 13 +- .../google/registry/model/ofy/OfyTest.java | 41 +- .../model/poll/MessageQueueInfoTest.java | 2 +- .../PollMessageExternalKeyConverterTest.java | 32 +- .../registry/model/poll/PollMessageTest.java | 18 +- .../model/rde/RdeNamingUtilsTest.java | 12 +- .../registry/model/rde/RdeRevisionTest.java | 15 +- .../model/registrar/RegistrarTest.java | 35 +- .../model/registry/RegistriesTest.java | 7 +- .../model/registry/RegistryCursorTest.java | 14 +- .../registry/model/registry/RegistryTest.java | 31 +- .../model/registry/label/PremiumListTest.java | 25 +- .../registry/label/ReservedListTest.java | 35 +- .../model/reporting/HistoryEntryTest.java | 16 +- javatests/google/registry/model/schema.txt | 592 +++++++++--------- .../registry/model/server/LockTest.java | 12 +- .../registry/model/smd/IssuerInfoTest.java | 2 +- .../smd/SignedMarkRevocationListTest.java | 15 +- .../model/tmch/ClaimsListShardTest.java | 15 +- .../registry/model/tmch/TmchCrlTest.java | 4 +- .../model/transfer/TransferDataTest.java | 27 +- ...mmitLogRevisionsTranslatorFactoryTest.java | 23 +- .../translators/StatusValueAdapterTest.java | 25 +- .../google/registry/module/backend/BUILD | 7 +- .../module/backend/BackendServletTest.java | 2 +- .../google/registry/module/frontend/BUILD | 7 +- .../module/frontend/FrontendServletTest.java | 2 +- javatests/google/registry/module/tools/BUILD | 7 +- .../module/tools/ToolsServletTest.java | 2 +- .../google/registry/monitoring/whitebox/BUILD | 21 +- .../whitebox/MetricsExportActionTest.java | 7 +- .../monitoring/whitebox/MetricsTest.java | 13 +- .../VerifyEntityIntegrityActionTest.java | 55 +- javatests/google/registry/rdap/BUILD | 13 +- .../registry/rdap/RdapActionBaseTest.java | 25 +- .../registry/rdap/RdapDomainActionTest.java | 47 +- .../rdap/RdapDomainSearchActionTest.java | 47 +- .../registry/rdap/RdapEntityActionTest.java | 39 +- .../rdap/RdapEntitySearchActionTest.java | 33 +- .../registry/rdap/RdapHelpActionTest.java | 13 +- .../registry/rdap/RdapJsonFormatterTest.java | 49 +- .../rdap/RdapNameserverActionTest.java | 19 +- .../rdap/RdapNameserverSearchActionTest.java | 37 +- .../registry/rdap/RdapSearchPatternTest.java | 6 +- .../google/registry/rdap/RdapTestHelper.java | 2 +- javatests/google/registry/rde/BUILD | 35 +- .../google/registry/rde/BouncyCastleTest.java | 9 +- .../registry/rde/BrdaCopyActionTest.java | 21 +- .../ContactResourceToXjcConverterTest.java | 53 +- .../rde/DomainResourceToXjcConverterTest.java | 97 +-- .../registry/rde/EscrowTaskRunnerTest.java | 28 +- .../rde/GhostrydeGpgIntegrationTest.java | 11 +- .../google/registry/rde/GhostrydeTest.java | 13 +- .../rde/HostResourceToXjcConverterTest.java | 21 +- .../rde/PendingDepositCheckerTest.java | 31 +- .../google/registry/rde/RdeFixtures.java | 67 +- .../google/registry/rde/RdeKeyringModule.java | 13 +- .../registry/rde/RdeMarshallerTest.java | 8 +- .../registry/rde/RdeReportActionTest.java | 37 +- .../registry/rde/RdeStagingActionTest.java | 93 +-- .../google/registry/rde/RdeTestData.java | 2 +- .../google/registry/rde/RdeTestSuite.java | 2 +- .../registry/rde/RdeUploadActionTest.java | 65 +- .../rde/RegistrarToXjcConverterTest.java | 29 +- .../registry/rde/RydeGpgIntegrationTest.java | 15 +- .../testdata/pgp-private-keyring-escrow.asc | 2 +- .../testdata/pgp-private-keyring-registry.asc | 2 +- .../rde/testdata/pgp-public-keyring.asc | 2 +- javatests/google/registry/request/BUILD | 15 +- .../registry/request/JsonResponseTest.java | 9 +- .../registry/request/RequestHandlerTest.java | 17 +- .../registry/request/RequestModuleTest.java | 11 +- .../request/RequestParametersTest.java | 19 +- .../registry/request/ResponseImplTest.java | 4 +- .../google/registry/request/RouterTest.java | 5 +- javatests/google/registry/security/BUILD | 19 +- .../registry/security/JsonHttpTest.java | 2 +- .../registry/security/JsonHttpTestUtils.java | 4 +- .../security/JsonTransportServletTest.java | 9 +- .../security/XsrfProtectedServletTest.java | 10 +- .../security/XsrfTokenManagerTest.java | 17 +- javatests/google/registry/server/BUILD | 35 +- javatests/google/registry/server/Fixture.java | 37 +- .../registry/server/HealthzServlet.java | 2 +- .../registry/server/RegistryTestServer.java | 58 +- .../server/RegistryTestServerMain.java | 11 +- javatests/google/registry/server/Route.java | 2 +- .../ServletWrapperDelegatorServlet.java | 2 +- .../server/StaticResourceServlet.java | 5 +- .../google/registry/server/TestServer.java | 4 +- .../google/registry/server/UrlChecker.java | 2 +- javatests/google/registry/storage/drive/BUILD | 11 +- .../storage/drive/DriveConnectionTest.java | 5 +- .../testing/AbstractDomainBaseSubject.java | 15 +- .../testing/AbstractEppResourceSubject.java | 23 +- .../registry/testing/AppEngineRule.java | 21 +- javatests/google/registry/testing/BUILD | 25 +- .../testing/BouncyCastleProviderRule.java | 2 +- .../registry/testing/CertificateSamples.java | 2 +- .../testing/ContactResourceSubject.java | 11 +- .../registry/testing/DatastoreHelper.java | 103 +-- .../testing/DomainApplicationSubject.java | 11 +- .../testing/DomainResourceSubject.java | 7 +- .../google/registry/testing/EppLoader.java | 9 +- .../registry/testing/ExceptionRule.java | 18 +- .../google/registry/testing/FailAnswer.java | 2 +- .../google/registry/testing/FakeClock.java | 6 +- .../registry/testing/FakeJsonResponse.java | 4 +- .../google/registry/testing/FakeResponse.java | 5 +- .../testing/FakeServletInputStream.java | 2 +- .../testing/FakeServletOutputStream.java | 2 +- .../google/registry/testing/FakeSleeper.java | 4 +- .../registry/testing/FakeURLFetchService.java | 2 +- .../testing/ForwardingURLFetchService.java | 2 +- .../testing/FullFieldsTestEntityHelper.java | 47 +- .../registry/testing/GcsTestingUtils.java | 2 +- .../testing/GenericEppResourceSubject.java | 5 +- .../testing/GpgSystemCommandRule.java | 2 +- .../registry/testing/HistoryEntrySubject.java | 9 +- .../registry/testing/HostResourceSubject.java | 5 +- .../google/registry/testing/InjectRule.java | 6 +- .../google/registry/testing/IoSpyRule.java | 2 +- .../google/registry/testing/LogsSubject.java | 5 +- .../google/registry/testing/Providers.java | 2 +- .../testing/ReflectiveFieldExtractor.java | 2 +- .../testing/ReflectiveSubjectFactory.java | 5 +- .../registry/testing/RegistryConfigRule.java | 9 +- .../google/registry/testing/SlurpAnswer.java | 2 +- .../google/registry/testing/SystemInfo.java | 5 +- .../registry/testing/SystemPropertyRule.java | 2 +- .../registry/testing/TaskQueueHelper.java | 7 +- .../registry/testing/TestDataHelper.java | 6 +- .../google/registry/testing/TestObject.java | 10 +- .../registry/testing/TestSessionMetadata.java | 4 +- .../google/registry/testing/TruthChainer.java | 2 +- .../registry/testing/UriParameters.java | 2 +- .../google/registry/testing/UserInfo.java | 2 +- .../registry/testing/logging.properties | 2 +- .../google/registry/testing/mapreduce/BUILD | 11 +- .../testing/mapreduce/MapreduceTestCase.java | 11 +- .../google/registry/testing/package-info.java | 2 +- javatests/google/registry/testing/sftp/BUILD | 7 +- .../registry/testing/sftp/SftpServerRule.java | 4 +- .../registry/testing/sftp/TestSftpServer.java | 2 +- javatests/google/registry/tldconfig/idn/BUILD | 9 +- .../tldconfig/idn/IdnLabelValidatorTest.java | 7 +- .../registry/tldconfig/idn/IdnTableTest.java | 5 +- javatests/google/registry/tmch/BUILD | 15 +- .../google/registry/tmch/LordnLogTest.java | 7 +- .../google/registry/tmch/LordnTaskTest.java | 33 +- .../registry/tmch/NordnUploadActionTest.java | 37 +- .../registry/tmch/NordnVerifyActionTest.java | 19 +- .../registry/tmch/SmdrlCsvParserTest.java | 11 +- .../registry/tmch/TmchActionTestCase.java | 15 +- .../tmch/TmchCertificateAuthorityTest.java | 20 +- .../registry/tmch/TmchCrlActionTest.java | 4 +- .../registry/tmch/TmchDnlActionTest.java | 5 +- .../registry/tmch/TmchSmdrlActionTest.java | 7 +- .../google/registry/tmch/TmchTestData.java | 6 +- .../google/registry/tmch/TmchTestSuite.java | 2 +- .../registry/tmch/TmchXmlSignatureTest.java | 14 +- .../google/registry/tmch/testdata/pubkey | 60 +- .../tmch_test_smd_revocation_list.csv | 33 +- .../tools/AllocateDomainCommandTest.java | 55 +- javatests/google/registry/tools/BUILD | 39 +- .../registry/tools/CommandTestCase.java | 15 +- .../tools/CreateAnchorTenantCommandTest.java | 12 +- .../tools/CreateContactCommandTest.java | 2 +- .../tools/CreateCreditBalanceCommandTest.java | 19 +- .../tools/CreateCreditCommandTest.java | 17 +- ...ateOrUpdatePremiumListCommandTestCase.java | 7 +- ...teOrUpdateReservedListCommandTestCase.java | 4 +- .../tools/CreatePremiumListCommandTest.java | 11 +- .../tools/CreateRegistrarCommandTest.java | 19 +- .../CreateRegistrarGroupsCommandTest.java | 6 +- .../tools/CreateReservedListCommandTest.java | 16 +- .../registry/tools/CreateTldCommandTest.java | 17 +- .../tools/DeleteCreditCommandTest.java | 22 +- .../tools/DeleteDomainCommandTest.java | 2 +- .../tools/DeleteEntityCommandTest.java | 5 +- .../tools/DeletePremiumListCommandTest.java | 16 +- .../tools/DeleteReservedListCommandTest.java | 12 +- .../DomainApplicationInfoCommandTest.java | 2 +- .../tools/DomainCheckClaimsCommandTest.java | 2 +- .../tools/DomainCheckCommandTest.java | 2 +- .../tools/DomainCheckFeeCommandTest.java | 2 +- .../EncryptEscrowDepositCommandTest.java | 23 +- .../registry/tools/EppToolCommandTest.java | 4 +- .../tools/EppToolCommandTestCase.java | 15 +- .../registry/tools/ExecuteEppCommandTest.java | 4 +- .../registry/tools/FakePasswordGenerator.java | 2 +- .../tools/GenerateAuctionDataCommandTest.java | 29 +- .../tools/GenerateDnsReportCommandTest.java | 27 +- .../GenerateEscrowDepositCommandTest.java | 55 +- .../tools/GetApplicationCommandTest.java | 12 +- .../tools/GetApplicationIdsCommandTest.java | 14 +- .../tools/GetClaimsListCommandTest.java | 5 +- .../registry/tools/GetContactCommandTest.java | 12 +- .../registry/tools/GetDomainCommandTest.java | 12 +- .../registry/tools/GetHostCommandTest.java | 12 +- .../tools/GetRegistrarCommandTest.java | 2 +- .../tools/GetResourceByKeyCommandTest.java | 16 +- .../registry/tools/GetTldCommandTest.java | 6 +- .../registry/tools/GhostrydeCommandTest.java | 14 +- .../google/registry/tools/GtechToolTest.java | 5 +- .../tools/ListCursorsCommandTest.java | 14 +- .../tools/ListDomainsCommandTest.java | 4 +- .../registry/tools/ListHostsCommandTest.java | 4 +- .../tools/ListObjectsCommandTestCase.java | 15 +- .../tools/ListPremiumListsCommandTest.java | 4 +- .../tools/ListRegistrarsCommandTest.java | 4 +- .../tools/ListReservedListsCommandTest.java | 4 +- .../registry/tools/ListTldsCommandTest.java | 4 +- .../registry/tools/MutatingCommandTest.java | 20 +- .../tools/PublishDetailReportCommandTest.java | 5 +- .../tools/RegistrarContactCommandTest.java | 15 +- .../tools/RegistryToolEnvironmentTest.java | 2 +- .../registry/tools/RegistryToolTest.java | 2 +- .../ResaveEnvironmentEntitiesCommandTest.java | 19 +- .../registry/tools/SetupOteCommandTest.java | 23 +- .../UpdateApplicationStatusCommandTest.java | 37 +- .../tools/UpdateClaimsNoticeCommandTest.java | 27 +- .../tools/UpdateCursorsCommandTest.java | 12 +- .../tools/UpdatePremiumListCommandTest.java | 11 +- .../tools/UpdateRegistrarCommandTest.java | 25 +- .../tools/UpdateReservedListCommandTest.java | 11 +- .../tools/UpdateServerLocksCommandTest.java | 2 +- .../registry/tools/UpdateSmdCommandTest.java | 31 +- .../registry/tools/UpdateTldCommandTest.java | 23 +- .../tools/UploadClaimsListCommandTest.java | 4 +- .../ValidateEscrowDepositCommandTest.java | 6 +- .../ValidateLoginCredentialsCommandTest.java | 17 +- javatests/google/registry/tools/params/BUILD | 9 +- .../tools/params/DateTimeParameterTest.java | 6 +- .../tools/params/DurationParameterTest.java | 6 +- .../params/HostAndPortParameterTest.java | 2 +- .../tools/params/MoneyParameterTest.java | 6 +- .../tools/params/PathParameterTest.java | 6 +- .../params/PhoneNumberParameterTest.java | 4 +- .../tools/params/YearMonthParameterTest.java | 6 +- javatests/google/registry/tools/server/BUILD | 23 +- .../tools/server/CreateGroupsActionTest.java | 19 +- .../server/CreatePremiumListActionTest.java | 12 +- .../tools/server/DeleteEntityActionTest.java | 15 +- .../server/DeleteProberDataActionTest.java | 45 +- .../server/GenerateZoneFilesActionTest.java | 35 +- .../tools/server/KillAllActionTestCase.java | 240 ------- .../server/KillAllCommitLogsActionTest.java | 96 ++- .../KillAllCrossTldEntitiesActionTest.java | 82 --- .../server/KillAllEppResourcesActionTest.java | 170 +++-- .../tools/server/ListActionTestCase.java | 9 +- .../tools/server/ListDomainsActionTest.java | 11 +- .../tools/server/ListHostsActionTest.java | 9 +- .../server/ListPremiumListsActionTest.java | 7 +- .../server/ListRegistrarsActionTest.java | 9 +- .../server/ListReservedListsActionTest.java | 13 +- .../tools/server/ListTldsActionTest.java | 7 +- .../ResaveAllEppResourcesActionTest.java | 15 +- .../server/UpdatePremiumListActionTest.java | 12 +- javatests/google/registry/ui/forms/BUILD | 9 +- .../ui/forms/FormFieldExceptionTest.java | 2 +- .../registry/ui/forms/FormFieldTest.java | 2 +- .../registry/ui/forms/FormFieldsTest.java | 2 +- javatests/google/registry/ui/js/BUILD | 9 +- .../google/registry/ui/js/registrar/BUILD | 19 +- javatests/google/registry/ui/server/BUILD | 13 +- .../ui/server/RegistrarFormFieldsTest.java | 6 +- javatests/google/registry/ui/server/api/BUILD | 13 +- .../ui/server/api/CheckApiServletTest.java | 17 +- .../google/registry/ui/server/registrar/BUILD | 27 +- .../server/registrar/ConsoleUiActionTest.java | 9 +- .../server/registrar/ContactSettingsTest.java | 13 +- .../registrar/RegistrarPaymentActionTest.java | 9 +- .../RegistrarPaymentSetupActionTest.java | 9 +- .../registrar/RegistrarServletTest.java | 17 +- .../registrar/RegistrarServletTestCase.java | 25 +- .../registrar/SecuritySettingsTest.java | 21 +- .../ui/server/registrar/SessionUtilsTest.java | 15 +- .../server/registrar/WhoisSettingsTest.java | 9 +- javatests/google/registry/util/BUILD | 9 +- .../registry/util/CidrAddressBlockTest.java | 2 +- .../registry/util/CollectionUtilsTest.java | 9 +- .../google/registry/util/ConcurrentTest.java | 5 +- .../registry/util/DateTimeUtilsTest.java | 19 +- .../google/registry/util/DiffUtilsTest.java | 4 +- .../registry/util/DomainNameUtilsTest.java | 6 +- .../google/registry/util/HexDumperTest.java | 4 +- .../registry/util/PathargMatcherTest.java | 2 +- .../util/PosixTarHeaderSystemTest.java | 4 +- .../registry/util/PosixTarHeaderTest.java | 5 +- .../google/registry/util/RetrierTest.java | 8 +- .../registry/util/SendEmailUtilsTest.java | 9 +- .../registry/util/SerializeUtilsTest.java | 8 +- .../google/registry/util/SqlTemplateTest.java | 4 +- .../registry/util/TaskEnqueuerTest.java | 11 +- .../registry/util/TeeOutputStreamTest.java | 5 +- .../registry/util/UrlFetchUtilsTest.java | 9 +- javatests/google/registry/whois/BUILD | 17 +- .../whois/DomainWhoisResponseTest.java | 41 +- .../whois/NameserverWhoisResponseTest.java | 17 +- .../whois/RegistrarWhoisResponseTest.java | 19 +- .../google/registry/whois/WhoisHelper.java | 4 +- .../registry/whois/WhoisHttpServerTest.java | 36 +- .../registry/whois/WhoisInjectionTest.java | 12 +- .../registry/whois/WhoisReaderTest.java | 10 +- .../registry/whois/WhoisServerTest.java | 42 +- .../registry/whois/WhoisTestComponent.java | 10 +- javatests/google/registry/xjc/BUILD | 11 +- .../google/registry/xjc/XjcObjectTest.java | 14 +- .../google/registry/xjc/XmlTestdataTest.java | 10 +- javatests/google/registry/xml/BUILD | 9 +- .../google/registry/xml/DateAdapterTest.java | 2 +- .../registry/xml/UtcDateTimeAdapterTest.java | 2 +- .../google/registry/xml/XmlTestUtils.java | 4 +- scripts/setup_eclipse.py | 14 +- 1309 files changed, 10981 insertions(+), 10378 deletions(-) delete mode 100644 java/google/registry/tools/server/KillAllCrossTldEntitiesAction.java delete mode 100644 javatests/google/registry/tools/server/KillAllActionTestCase.java delete mode 100644 javatests/google/registry/tools/server/KillAllCrossTldEntitiesActionTest.java diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c8a329f2c..0a60890b8 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -21,5 +21,5 @@ Jared Brothers Pablo Mayrgundter Daisuke Yabuki Tim Boring -Hans Ridder Wolfgang Meyers +Hans Ridder diff --git a/README.md b/README.md index 2ff8ab413..4323e2e86 100644 --- a/README.md +++ b/README.md @@ -83,14 +83,14 @@ locally. Once that's done, here are some example commands to get you started: ```sh # Run all tests -bazel test //java{,tests}/com/google/domain/registry/... +bazel test //java{,tests}/google/registry/... # Run the registry_tool command -bazel run //java/com/google/domain/registry/tool:registry_tool -- --help +bazel run //java/google/registry/tool:registry_tool -- --help # Run the Registrar Console on a local development server -bazel run //javatests/com/google/domain/registry/server -- --help -bazel run //javatests/com/google/domain/registry/server +bazel run //javatests/google/registry/server -- --help +bazel run //javatests/google/registry/server google-chrome http://localhost:8080/registrar ``` diff --git a/WORKSPACE b/WORKSPACE index a8a93baf4..eb0da9a65 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,5 +1,5 @@ workspace(name = "domain_registry") -load("//java/com/google/domain/registry:repositories.bzl", "domain_registry_repositories") +load("//java/google/registry:repositories.bzl", "domain_registry_repositories") domain_registry_repositories() diff --git a/java/google/registry/BUILD b/java/google/registry/BUILD index 5bb3dd2e5..ac0254574 100644 --- a/java/google/registry/BUILD +++ b/java/google/registry/BUILD @@ -1,11 +1,13 @@ -package(default_visibility = ["//visibility:public"]) +package(default_visibility = ["//third_party/java_src/gtld:__subpackages__"]) + +licenses(["notice"]) # Apache 2.0 package_group( name = "registry_project", packages = [ - "//java/com/google/domain/registry/...", - "//javatests/com/google/domain/registry/...", + "//java/google/registry/...", + "//javatests/google/registry/...", ], ) diff --git a/java/google/registry/backup/BUILD b/java/google/registry/backup/BUILD index 38b9955a5..0240f1ec8 100644 --- a/java/google/registry/backup/BUILD +++ b/java/google/registry/backup/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "backup", @@ -13,11 +15,6 @@ java_library( "//java/com/google/common/net", "//java/com/google/common/primitives", "//java/com/google/common/util/concurrent", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/cron", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/appengine_gcs_client", "//third_party/java/dagger", @@ -27,5 +24,10 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/cron", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/backup/BackupModule.java b/java/google/registry/backup/BackupModule.java index 2289cc708..16a983c0e 100644 --- a/java/google/registry/backup/BackupModule.java +++ b/java/google/registry/backup/BackupModule.java @@ -12,26 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.backup; +package google.registry.backup; import static com.google.appengine.api.ThreadManager.currentRequestThreadFactory; import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator; -import static com.google.domain.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM; -import static com.google.domain.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM; -import static com.google.domain.registry.backup.RestoreCommitLogsAction.FROM_TIME_PARAM; -import static com.google.domain.registry.request.RequestParameters.extractRequiredDatetimeParameter; -import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter; +import static google.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM; +import static google.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM; +import static google.registry.backup.RestoreCommitLogsAction.FROM_TIME_PARAM; +import static google.registry.request.RequestParameters.extractRequiredDatetimeParameter; +import static google.registry.request.RequestParameters.extractRequiredParameter; import static java.util.concurrent.Executors.newFixedThreadPool; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.domain.registry.cron.CommitLogFanoutAction; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.Parameter; import dagger.Module; import dagger.Provides; +import google.registry.cron.CommitLogFanoutAction; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.Parameter; + import org.joda.time.DateTime; import java.lang.annotation.Documented; @@ -42,7 +43,7 @@ import javax.servlet.http.HttpServletRequest; /** * Dagger module for backup package. * - * @see "com.google.domain.registry.module.backend.BackendComponent" + * @see "google.registry.module.backend.BackendComponent" */ @Module public final class BackupModule { diff --git a/java/google/registry/backup/BackupUtils.java b/java/google/registry/backup/BackupUtils.java index 8eafa8e55..e81ad47d3 100644 --- a/java/google/registry/backup/BackupUtils.java +++ b/java/google/registry/backup/BackupUtils.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.backup; +package google.registry.backup; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.api.datastore.EntityTranslator; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.ImmutableObject; import com.google.storage.onestore.v3.OnestoreEntity.EntityProto; +import google.registry.model.ImmutableObject; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/java/google/registry/backup/CommitLogCheckpointAction.java b/java/google/registry/backup/CommitLogCheckpointAction.java index bcde9f7db..97bbc39ff 100644 --- a/java/google/registry/backup/CommitLogCheckpointAction.java +++ b/java/google/registry/backup/CommitLogCheckpointAction.java @@ -12,25 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.backup; +package google.registry.backup; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; -import static com.google.domain.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM; -import static com.google.domain.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; -import static com.google.domain.registry.util.FormattingLogger.getLoggerForCallerClass; - -import com.google.domain.registry.model.ofy.CommitLogCheckpoint; -import com.google.domain.registry.model.ofy.CommitLogCheckpointRoot; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.TaskEnqueuer; +import static google.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM; +import static google.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; +import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import com.googlecode.objectify.VoidWork; +import google.registry.model.ofy.CommitLogCheckpoint; +import google.registry.model.ofy.CommitLogCheckpointRoot; +import google.registry.request.Action; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; +import google.registry.util.TaskEnqueuer; + import org.joda.time.DateTime; import javax.inject.Inject; diff --git a/java/google/registry/backup/CommitLogCheckpointStrategy.java b/java/google/registry/backup/CommitLogCheckpointStrategy.java index 5e3b85ccc..bfe765c82 100644 --- a/java/google/registry/backup/CommitLogCheckpointStrategy.java +++ b/java/google/registry/backup/CommitLogCheckpointStrategy.java @@ -12,26 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.backup; +package google.registry.backup; import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.collect.Maps.transformValues; -import static com.google.domain.registry.model.ofy.CommitLogBucket.getBucketKey; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.earliestOf; +import static google.registry.model.ofy.CommitLogBucket.getBucketKey; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.earliestOf; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.ofy.CommitLogBucket; -import com.google.domain.registry.model.ofy.CommitLogCheckpoint; -import com.google.domain.registry.model.ofy.CommitLogManifest; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.util.Clock; import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; +import google.registry.model.ofy.CommitLogBucket; +import google.registry.model.ofy.CommitLogCheckpoint; +import google.registry.model.ofy.CommitLogManifest; +import google.registry.model.ofy.Ofy; +import google.registry.util.Clock; + import org.joda.time.DateTime; import java.util.List; diff --git a/java/google/registry/backup/DeleteOldCommitLogsAction.java b/java/google/registry/backup/DeleteOldCommitLogsAction.java index 3b21d5991..bb587c3b3 100644 --- a/java/google/registry/backup/DeleteOldCommitLogsAction.java +++ b/java/google/registry/backup/DeleteOldCommitLogsAction.java @@ -12,30 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.backup; +package google.registry.backup; import static com.google.common.collect.ImmutableList.copyOf; import static com.google.common.collect.Iterables.concat; import static com.google.common.collect.Iterables.transform; -import static com.google.domain.registry.model.ofy.CommitLogBucket.getBucketKey; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.model.ofy.CommitLogBucket.getBucketKey; +import static google.registry.request.Action.Method.POST; import com.google.common.base.Function; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.model.ofy.CommitLogBucket; -import com.google.domain.registry.model.ofy.CommitLogManifest; -import com.google.domain.registry.model.ofy.CommitLogMutation; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; import com.googlecode.objectify.cmd.Loader; import com.googlecode.objectify.cmd.Query; +import google.registry.config.ConfigModule.Config; +import google.registry.model.ofy.CommitLogBucket; +import google.registry.model.ofy.CommitLogManifest; +import google.registry.model.ofy.CommitLogMutation; +import google.registry.model.ofy.Ofy; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; + import org.joda.time.DateTime; import org.joda.time.Duration; @@ -72,7 +73,7 @@ import javax.inject.Inject; * there's a 10mB upper bound on transaction size and a four minute time limit, we can only delete * so many commit logs at once. So given the above constraints, five hundred would make a safe * default value for {@code maxDeletes}. See {@linkplain - * com.google.domain.registry.config.ConfigModule#provideCommitLogMaxDeletes() commitLogMaxDeletes} + * google.registry.config.ConfigModule#provideCommitLogMaxDeletes() commitLogMaxDeletes} * for further documentation on this matter. * *

Finally, we need to pick an appropriate cron interval time for this task. Since a bucket diff --git a/java/google/registry/backup/ExportCommitLogDiffAction.java b/java/google/registry/backup/ExportCommitLogDiffAction.java index 6bd3be207..426b2000a 100644 --- a/java/google/registry/backup/ExportCommitLogDiffAction.java +++ b/java/google/registry/backup/ExportCommitLogDiffAction.java @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.backup; +package google.registry.backup; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Verify.verifyNotNull; import static com.google.common.collect.Iterables.concat; import static com.google.common.collect.Lists.partition; -import static com.google.domain.registry.backup.BackupUtils.GcsMetadataKeys.LOWER_BOUND_CHECKPOINT; -import static com.google.domain.registry.backup.BackupUtils.GcsMetadataKeys.NUM_TRANSACTIONS; -import static com.google.domain.registry.backup.BackupUtils.GcsMetadataKeys.UPPER_BOUND_CHECKPOINT; -import static com.google.domain.registry.backup.BackupUtils.serializeEntity; -import static com.google.domain.registry.model.ofy.CommitLogBucket.getBucketKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.isAtOrAfter; -import static com.google.domain.registry.util.FormattingLogger.getLoggerForCallerClass; +import static google.registry.backup.BackupUtils.GcsMetadataKeys.LOWER_BOUND_CHECKPOINT; +import static google.registry.backup.BackupUtils.GcsMetadataKeys.NUM_TRANSACTIONS; +import static google.registry.backup.BackupUtils.GcsMetadataKeys.UPPER_BOUND_CHECKPOINT; +import static google.registry.backup.BackupUtils.serializeEntity; +import static google.registry.model.ofy.CommitLogBucket.getBucketKey; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.DateTimeUtils.isAtOrAfter; +import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import static java.nio.channels.Channels.newOutputStream; import static java.util.Arrays.asList; @@ -38,18 +38,19 @@ import com.google.common.collect.ComparisonChain; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.ofy.CommitLogBucket; -import com.google.domain.registry.model.ofy.CommitLogCheckpoint; -import com.google.domain.registry.model.ofy.CommitLogManifest; -import com.google.domain.registry.model.ofy.CommitLogMutation; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.FormattingLogger; import com.googlecode.objectify.Key; +import google.registry.config.ConfigModule.Config; +import google.registry.model.ImmutableObject; +import google.registry.model.ofy.CommitLogBucket; +import google.registry.model.ofy.CommitLogCheckpoint; +import google.registry.model.ofy.CommitLogManifest; +import google.registry.model.ofy.CommitLogMutation; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.util.FormattingLogger; + import org.joda.time.DateTime; import java.io.IOException; diff --git a/java/google/registry/backup/GcsDiffFileLister.java b/java/google/registry/backup/GcsDiffFileLister.java index 9882f9e98..ba713dc54 100644 --- a/java/google/registry/backup/GcsDiffFileLister.java +++ b/java/google/registry/backup/GcsDiffFileLister.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.backup; +package google.registry.backup; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.backup.BackupUtils.GcsMetadataKeys.LOWER_BOUND_CHECKPOINT; -import static com.google.domain.registry.backup.ExportCommitLogDiffAction.DIFF_FILE_PREFIX; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; -import static com.google.domain.registry.util.DateTimeUtils.latestOf; +import static google.registry.backup.BackupUtils.GcsMetadataKeys.LOWER_BOUND_CHECKPOINT; +import static google.registry.backup.ExportCommitLogDiffAction.DIFF_FILE_PREFIX; +import static google.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; +import static google.registry.util.DateTimeUtils.latestOf; import com.google.appengine.tools.cloudstorage.GcsFileMetadata; import com.google.appengine.tools.cloudstorage.GcsFilename; @@ -30,9 +30,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.domain.registry.backup.BackupModule.Backups; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.backup.BackupModule.Backups; +import google.registry.config.ConfigModule.Config; +import google.registry.util.FormattingLogger; import org.joda.time.DateTime; diff --git a/java/google/registry/backup/RestoreCommitLogsAction.java b/java/google/registry/backup/RestoreCommitLogsAction.java index 29a3d6844..dcd0185fe 100644 --- a/java/google/registry/backup/RestoreCommitLogsAction.java +++ b/java/google/registry/backup/RestoreCommitLogsAction.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.backup; +package google.registry.backup; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Iterators.peekingIterator; -import static com.google.domain.registry.backup.BackupUtils.createDeserializingIterator; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.backup.BackupUtils.createDeserializingIterator; +import static google.registry.model.ofy.ObjectifyService.ofy; import static java.util.Arrays.asList; import com.google.appengine.api.datastore.DatastoreService; @@ -29,22 +29,23 @@ import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.Lists; import com.google.common.collect.PeekingIterator; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.ofy.CommitLogBucket; -import com.google.domain.registry.model.ofy.CommitLogCheckpoint; -import com.google.domain.registry.model.ofy.CommitLogCheckpointRoot; -import com.google.domain.registry.model.ofy.CommitLogManifest; -import com.google.domain.registry.model.ofy.CommitLogMutation; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.Retrier; import com.googlecode.objectify.Key; import com.googlecode.objectify.Result; import com.googlecode.objectify.util.ResultNow; +import google.registry.config.RegistryEnvironment; +import google.registry.model.ImmutableObject; +import google.registry.model.ofy.CommitLogBucket; +import google.registry.model.ofy.CommitLogCheckpoint; +import google.registry.model.ofy.CommitLogCheckpointRoot; +import google.registry.model.ofy.CommitLogManifest; +import google.registry.model.ofy.CommitLogMutation; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.util.FormattingLogger; +import google.registry.util.Retrier; + import org.joda.time.DateTime; import java.io.IOException; diff --git a/java/google/registry/backup/package-info.java b/java/google/registry/backup/package-info.java index e28e26ecd..09b365723 100644 --- a/java/google/registry/backup/package-info.java +++ b/java/google/registry/backup/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.backup; +package google.registry.backup; diff --git a/java/google/registry/bigquery/BUILD b/java/google/registry/bigquery/BUILD index ec4dfdc08..7838a343c 100644 --- a/java/google/registry/bigquery/BUILD +++ b/java/google/registry/bigquery/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "bigquery", @@ -21,12 +23,12 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/util/concurrent", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", "//third_party/java/dagger", "//third_party/java/joda_time", "//third_party/java/jsr305_annotations", "//third_party/java/jsr330_inject", + "//java/google/registry/config", + "//java/google/registry/request", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/bigquery/BigqueryConnection.java b/java/google/registry/bigquery/BigqueryConnection.java index db0ff5e6c..6d834498f 100644 --- a/java/google/registry/bigquery/BigqueryConnection.java +++ b/java/google/registry/bigquery/BigqueryConnection.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.bigquery; +package google.registry.bigquery; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.base.Verify.verify; -import static com.google.domain.registry.bigquery.BigqueryUtils.toJobReferenceString; +import static google.registry.bigquery.BigqueryUtils.toJobReferenceString; import static org.joda.time.DateTimeZone.UTC; import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; @@ -56,16 +56,17 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import com.google.domain.registry.bigquery.BigqueryUtils.DestinationFormat; -import com.google.domain.registry.bigquery.BigqueryUtils.SourceFormat; -import com.google.domain.registry.bigquery.BigqueryUtils.TableType; -import com.google.domain.registry.bigquery.BigqueryUtils.WriteDisposition; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.NonFinalForTesting; -import com.google.domain.registry.util.Sleeper; -import com.google.domain.registry.util.SqlTemplate; -import com.google.domain.registry.util.SystemSleeper; + +import google.registry.bigquery.BigqueryUtils.DestinationFormat; +import google.registry.bigquery.BigqueryUtils.SourceFormat; +import google.registry.bigquery.BigqueryUtils.TableType; +import google.registry.bigquery.BigqueryUtils.WriteDisposition; +import google.registry.config.RegistryEnvironment; +import google.registry.util.FormattingLogger; +import google.registry.util.NonFinalForTesting; +import google.registry.util.Sleeper; +import google.registry.util.SqlTemplate; +import google.registry.util.SystemSleeper; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/bigquery/BigqueryFactory.java b/java/google/registry/bigquery/BigqueryFactory.java index cef9bc93e..f9ed0a5ba 100644 --- a/java/google/registry/bigquery/BigqueryFactory.java +++ b/java/google/registry/bigquery/BigqueryFactory.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.bigquery; +package google.registry.bigquery; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Sets.newConcurrentHashSet; -import static com.google.domain.registry.util.FormattingLogger.getLoggerForCallerClass; +import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import com.google.api.client.extensions.appengine.http.UrlFetchTransport; import com.google.api.client.googleapis.extensions.appengine.auth.oauth2.AppIdentityCredential; @@ -34,7 +34,8 @@ import com.google.api.services.bigquery.model.TableFieldSchema; import com.google.api.services.bigquery.model.TableReference; import com.google.api.services.bigquery.model.TableSchema; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.util.FormattingLogger; import java.io.IOException; import java.util.List; diff --git a/java/google/registry/bigquery/BigqueryJobFailureException.java b/java/google/registry/bigquery/BigqueryJobFailureException.java index 7b7ce5a26..0984b36a6 100644 --- a/java/google/registry/bigquery/BigqueryJobFailureException.java +++ b/java/google/registry/bigquery/BigqueryJobFailureException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.bigquery; +package google.registry.bigquery; import static com.google.common.base.Preconditions.checkArgument; diff --git a/java/google/registry/bigquery/BigqueryModule.java b/java/google/registry/bigquery/BigqueryModule.java index aa33e3e98..33137691c 100644 --- a/java/google/registry/bigquery/BigqueryModule.java +++ b/java/google/registry/bigquery/BigqueryModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.bigquery; +package google.registry.bigquery; import static dagger.Provides.Type.SET_VALUES; @@ -23,24 +23,25 @@ import com.google.api.services.bigquery.Bigquery; import com.google.api.services.bigquery.BigqueryScopes; import com.google.api.services.bigquery.model.TableFieldSchema; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.request.OAuthScopes; import dagger.Module; import dagger.Multibindings; import dagger.Provides; +import google.registry.config.ConfigModule.Config; +import google.registry.request.OAuthScopes; + import java.util.Map; import java.util.Set; /** * Dagger module for Google {@link Bigquery} connection objects. * - * @see com.google.domain.registry.config.ConfigModule - * @see com.google.domain.registry.request.Modules.UrlFetchTransportModule - * @see com.google.domain.registry.request.Modules.Jackson2Module - * @see com.google.domain.registry.request.Modules.AppIdentityCredentialModule - * @see com.google.domain.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule + * @see google.registry.config.ConfigModule + * @see google.registry.request.Modules.UrlFetchTransportModule + * @see google.registry.request.Modules.Jackson2Module + * @see google.registry.request.Modules.AppIdentityCredentialModule + * @see google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule */ @Module public final class BigqueryModule { diff --git a/java/google/registry/bigquery/BigqueryUtils.java b/java/google/registry/bigquery/BigqueryUtils.java index f1c08b09c..6cc871fcc 100644 --- a/java/google/registry/bigquery/BigqueryUtils.java +++ b/java/google/registry/bigquery/BigqueryUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.bigquery; +package google.registry.bigquery; import com.google.api.services.bigquery.model.JobReference; diff --git a/java/google/registry/bigquery/package-info.java b/java/google/registry/bigquery/package-info.java index d04b35492..14910d2df 100644 --- a/java/google/registry/bigquery/package-info.java +++ b/java/google/registry/bigquery/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.bigquery; +package google.registry.bigquery; diff --git a/java/google/registry/braintree/BUILD b/java/google/registry/braintree/BUILD index eab1e9fa0..247776cf5 100644 --- a/java/google/registry/braintree/BUILD +++ b/java/google/registry/braintree/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 java_library( @@ -7,12 +9,12 @@ java_library( visibility = ["//visibility:public"], deps = [ "//java/com/google/common/base", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/keyring/api", - "//java/com/google/domain/registry/model", "//third_party/java/braintree", "//third_party/java/dagger", "//third_party/java/jsr305_annotations", "//third_party/java/jsr330_inject", + "//java/google/registry/config", + "//java/google/registry/keyring/api", + "//java/google/registry/model", ], ) diff --git a/java/google/registry/braintree/BraintreeModule.java b/java/google/registry/braintree/BraintreeModule.java index a017f85d5..d0bd47061 100644 --- a/java/google/registry/braintree/BraintreeModule.java +++ b/java/google/registry/braintree/BraintreeModule.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.braintree; - -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.keyring.api.KeyModule.Key; +package google.registry.braintree; import com.braintreegateway.BraintreeGateway; import dagger.Module; import dagger.Provides; +import google.registry.config.ConfigModule.Config; +import google.registry.config.RegistryEnvironment; +import google.registry.keyring.api.KeyModule.Key; + import javax.inject.Singleton; /** Dagger module for Braintree Payments API. */ diff --git a/java/google/registry/braintree/BraintreeRegistrarSyncer.java b/java/google/registry/braintree/BraintreeRegistrarSyncer.java index 59159c277..fe1fa5f90 100644 --- a/java/google/registry/braintree/BraintreeRegistrarSyncer.java +++ b/java/google/registry/braintree/BraintreeRegistrarSyncer.java @@ -12,15 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.braintree; +package google.registry.braintree; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Verify.verify; import com.google.common.base.Optional; import com.google.common.base.VerifyException; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; import com.braintreegateway.BraintreeGateway; import com.braintreegateway.Customer; @@ -28,6 +26,9 @@ import com.braintreegateway.CustomerRequest; import com.braintreegateway.Result; import com.braintreegateway.exceptions.NotFoundException; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; + import javax.inject.Inject; /** Helper for creating Braintree customer entries for registrars. */ diff --git a/java/google/registry/braintree/package-info.java b/java/google/registry/braintree/package-info.java index b3f4d3835..7ff324b5e 100644 --- a/java/google/registry/braintree/package-info.java +++ b/java/google/registry/braintree/package-info.java @@ -14,4 +14,4 @@ /** Braintree payment gateway utilities. */ @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.braintree; +package google.registry.braintree; diff --git a/java/google/registry/config/BUILD b/java/google/registry/config/BUILD index f49ce5134..17a80e0b1 100644 --- a/java/google/registry/config/BUILD +++ b/java/google/registry/config/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 java_library( diff --git a/java/google/registry/config/ConfigModule.java b/java/google/registry/config/ConfigModule.java index abb0079bd..d92c99aad 100644 --- a/java/google/registry/config/ConfigModule.java +++ b/java/google/registry/config/ConfigModule.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.config; +package google.registry.config; -import static com.google.domain.registry.config.ConfigUtils.makeUrl; +import static google.registry.config.ConfigUtils.makeUrl; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; @@ -101,7 +101,7 @@ public final class ConfigModule { * since each query would have about 500ms to complete, which is an order a magnitude more time * than we need. However this does not apply, since the subqueries are performed asynchronously. * - * @see com.google.domain.registry.backup.DeleteOldCommitLogsAction + * @see google.registry.backup.DeleteOldCommitLogsAction */ @Provides @Config("commitLogMaxDeletes") @@ -113,7 +113,7 @@ public final class ConfigModule { * Batch size for the number of transactions' worth of commit log data to process at once when * exporting a commit log diff. * - * @see com.google.domain.registry.backup.ExportCommitLogDiffAction + * @see google.registry.backup.ExportCommitLogDiffAction */ @Provides @Config("commitLogDiffExportBatchSize") @@ -124,7 +124,7 @@ public final class ConfigModule { /** * Returns the Google Cloud Storage bucket for staging BRDA escrow deposits. * - * @see com.google.domain.registry.rde.PendingDepositChecker + * @see google.registry.rde.PendingDepositChecker */ @Provides @Config("brdaBucket") @@ -132,7 +132,7 @@ public final class ConfigModule { return projectId + "-icann-brda"; } - /** @see com.google.domain.registry.rde.BrdaCopyAction */ + /** @see google.registry.rde.BrdaCopyAction */ @Provides @Config("brdaDayOfWeek") public static int provideBrdaDayOfWeek() { @@ -200,7 +200,7 @@ public final class ConfigModule { * *

Warning: This number may increase but never decrease. * - * @see com.google.domain.registry.model.index.EppResourceIndex + * @see google.registry.model.index.EppResourceIndex */ @Provides @Config("eppResourceIndexBucketCount") @@ -211,7 +211,7 @@ public final class ConfigModule { /** * Returns size of Google Cloud Storage client connection buffer in bytes. * - * @see com.google.domain.registry.gcs.GcsUtils + * @see google.registry.gcs.GcsUtils */ @Provides @Config("gcsBufferSize") @@ -222,7 +222,7 @@ public final class ConfigModule { /** * Gets the email address of the admin account for the Google App. * - * @see com.google.domain.registry.groups.DirectoryGroupsConnection + * @see google.registry.groups.DirectoryGroupsConnection */ @Provides @Config("googleAppsAdminEmailAddress") @@ -238,8 +238,8 @@ public final class ConfigModule { /** * Returns the publicly accessible domain name for the running Google Apps instance. * - * @see com.google.domain.registry.export.SyncGroupMembersAction - * @see com.google.domain.registry.tools.server.CreateGroupsAction + * @see google.registry.export.SyncGroupMembersAction + * @see google.registry.tools.server.CreateGroupsAction */ @Provides @Config("publicDomainName") @@ -264,7 +264,7 @@ public final class ConfigModule { *

This file needs to be downloaded at least once a day and verified to make sure it was * signed by {@code icann-tmch.crt}. * - * @see com.google.domain.registry.tmch.TmchCrlAction + * @see google.registry.tmch.TmchCrlAction * @see "http://tools.ietf.org/html/draft-lozano-tmch-func-spec-08#section-5.2.3.2" */ @Provides @@ -287,7 +287,7 @@ public final class ConfigModule { /** * Returns the Google Cloud Storage bucket for staging escrow deposits pending upload. * - * @see com.google.domain.registry.rde.RdeStagingAction + * @see google.registry.rde.RdeStagingAction */ @Provides @Config("rdeBucket") @@ -298,7 +298,7 @@ public final class ConfigModule { /** * Size of Ghostryde buffer in bytes for each layer in the pipeline. * - * @see com.google.domain.registry.rde.Ghostryde + * @see google.registry.rde.Ghostryde */ @Provides @Config("rdeGhostrydeBufferSize") @@ -325,7 +325,7 @@ public final class ConfigModule { * *

You must append {@code "/TLD/ID"} to this URL. * - * @see com.google.domain.registry.rde.RdeReportAction + * @see google.registry.rde.RdeReportAction */ @Provides @Config("rdeReportUrlPrefix") @@ -341,10 +341,10 @@ public final class ConfigModule { /** * Size of RYDE generator buffer in bytes for each of the five layers. * - * @see com.google.domain.registry.rde.RydePgpCompressionOutputStream - * @see com.google.domain.registry.rde.RydePgpFileOutputStream - * @see com.google.domain.registry.rde.RydePgpSigningOutputStream - * @see com.google.domain.registry.rde.RydeTarOutputStream + * @see google.registry.rde.RydePgpCompressionOutputStream + * @see google.registry.rde.RydePgpFileOutputStream + * @see google.registry.rde.RydePgpSigningOutputStream + * @see google.registry.rde.RydeTarOutputStream */ @Provides @Config("rdeRydeBufferSize") @@ -382,7 +382,7 @@ public final class ConfigModule { * which cloud storage files are uploaded. The password should not be included, as it's better to * use public key authentication. * - * @see com.google.domain.registry.rde.RdeUploadAction + * @see google.registry.rde.RdeUploadAction */ @Provides @Config("rdeUploadUrl") @@ -413,7 +413,7 @@ public final class ConfigModule { * *

This ID, as you'd expect, comes from the URL of the spreadsheet. * - * @see com.google.domain.registry.export.sheet.SyncRegistrarsSheetAction + * @see google.registry.export.sheet.SyncRegistrarsSheetAction */ @Provides @Config("sheetRegistrarId") @@ -443,7 +443,7 @@ public final class ConfigModule { /** * Returns SSH client connection and read timeout. * - * @see com.google.domain.registry.rde.RdeUploadAction + * @see google.registry.rde.RdeUploadAction */ @Provides @Config("sshTimeout") @@ -463,7 +463,7 @@ public final class ConfigModule { * *

The number of milliseconds it'll sleep before giving up is {@code 2^n - 2}. * - * @see com.google.domain.registry.util.TaskEnqueuer + * @see google.registry.util.TaskEnqueuer */ @Provides @Config("transientFailureRetries") @@ -474,7 +474,7 @@ public final class ConfigModule { /** * Amount of time public HTTP proxies are permitted to cache our WHOIS responses. * - * @see com.google.domain.registry.whois.WhoisHttpServer + * @see google.registry.whois.WhoisHttpServer */ @Provides @Config("whoisHttpExpires") @@ -485,7 +485,7 @@ public final class ConfigModule { /** * Maximum number of results to return for an RDAP search query * - * @see com.google.domain.registry.rdap.RdapActionBase + * @see google.registry.rdap.RdapActionBase */ @Provides @Config("rdapResultSetMaxSize") @@ -496,7 +496,7 @@ public final class ConfigModule { /** * Base for RDAP link paths. * - * @see com.google.domain.registry.rdap.RdapActionBase + * @see google.registry.rdap.RdapActionBase */ @Provides @Config("rdapLinkBase") @@ -507,7 +507,7 @@ public final class ConfigModule { /** * WHOIS server displayed in RDAP query responses. * - * @see com.google.domain.registry.rdap.RdapActionBase + * @see google.registry.rdap.RdapActionBase */ @Provides @Config("rdapWhoisServer") @@ -554,7 +554,7 @@ public final class ConfigModule { * *

This is a base32 value copied from the Braintree website. * - * @see com.google.domain.registry.keyring.api.Keyring#getBraintreePrivateKey() + * @see google.registry.keyring.api.Keyring#getBraintreePrivateKey() */ @Provides @Config("braintreePublicKey") diff --git a/java/google/registry/config/ConfigUtils.java b/java/google/registry/config/ConfigUtils.java index 5a395e6e6..ebb667fa7 100644 --- a/java/google/registry/config/ConfigUtils.java +++ b/java/google/registry/config/ConfigUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.config; +package google.registry.config; import java.net.MalformedURLException; import java.net.URL; diff --git a/java/google/registry/config/RegistryConfig.java b/java/google/registry/config/RegistryConfig.java index d30f0ff36..b28aaff3f 100644 --- a/java/google/registry/config/RegistryConfig.java +++ b/java/google/registry/config/RegistryConfig.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.config; +package google.registry.config; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -40,14 +40,14 @@ public interface RegistryConfig { /** * Returns the Google Cloud Storage bucket for storing backup snapshots. * - * @see com.google.domain.registry.export.ExportSnapshotServlet + * @see google.registry.export.ExportSnapshotServlet */ public String getSnapshotsBucket(); /** * Returns the Google Cloud Storage bucket for storing exported domain lists. * - * @see com.google.domain.registry.export.ExportDomainListsAction + * @see google.registry.export.ExportDomainListsAction */ public String getDomainListsBucket(); @@ -62,7 +62,7 @@ public interface RegistryConfig { * *

Warning: This can be raised but never lowered. * - * @see com.google.domain.registry.model.ofy.CommitLogBucket + * @see google.registry.model.ofy.CommitLogBucket */ public int getCommitLogBucketCount(); @@ -72,29 +72,29 @@ public interface RegistryConfig { *

The only reason you'll want to retain this commit logs in datastore is for performing * point-in-time restoration queries for subsystems like RDE. * - * @see com.google.domain.registry.backup.DeleteOldCommitLogsAction - * @see com.google.domain.registry.model.translators.CommitLogRevisionsTranslatorFactory + * @see google.registry.backup.DeleteOldCommitLogsAction + * @see google.registry.model.translators.CommitLogRevisionsTranslatorFactory */ public Duration getCommitLogDatastoreRetention(); /** * Returns the Google Cloud Storage bucket for storing commit logs. * - * @see com.google.domain.registry.backup.ExportCommitLogDiffAction + * @see google.registry.backup.ExportCommitLogDiffAction */ public String getCommitsBucket(); /** * Returns the Google Cloud Storage bucket for storing zone files. * - * @see com.google.domain.registry.backup.ExportCommitLogDiffAction + * @see google.registry.backup.ExportCommitLogDiffAction */ public String getZoneFilesBucket(); /** * Returns {@code true} if TMCH certificate authority should be in testing mode. * - * @see com.google.domain.registry.tmch.TmchCertificateAuthority + * @see google.registry.tmch.TmchCertificateAuthority */ public boolean getTmchCaTestingMode(); @@ -103,8 +103,8 @@ public interface RegistryConfig { * *

This URL is used for DNL, SMDRL, and LORDN. * - * @see com.google.domain.registry.tmch.Marksdb - * @see com.google.domain.registry.tmch.NordnUploadAction + * @see google.registry.tmch.Marksdb + * @see google.registry.tmch.NordnUploadAction */ public String getTmchMarksdbUrl(); @@ -123,8 +123,8 @@ public interface RegistryConfig { /** * Returns the amount of time a domain label list should be cached in memory before expiring. * - * @see com.google.domain.registry.model.registry.label.ReservedList - * @see com.google.domain.registry.model.registry.label.PremiumList + * @see google.registry.model.registry.label.ReservedList + * @see google.registry.model.registry.label.PremiumList */ public Duration getDomainLabelListCacheDuration(); @@ -134,21 +134,21 @@ public interface RegistryConfig { /** * Returns the header text at the top of the reserved terms exported list. * - * @see com.google.domain.registry.export.ExportUtils#exportReservedTerms + * @see google.registry.export.ExportUtils#exportReservedTerms */ public String getReservedTermsExportDisclaimer(); /** * Returns a display name that is used on outgoing emails sent by Domain Registry. * - * @see com.google.domain.registry.util.SendEmailUtils + * @see google.registry.util.SendEmailUtils */ public String getGoogleAppsAdminEmailDisplayName(); /** * Returns the email address that outgoing emails from the app are sent from. * - * @see com.google.domain.registry.util.SendEmailUtils + * @see google.registry.util.SendEmailUtils */ public String getGoogleAppsSendFromEmailAddress(); @@ -165,15 +165,15 @@ public interface RegistryConfig { * Returns the email address(es) that notifications of registrar and/or registrar contact updates * should be sent to, or the empty list if updates should not be sent. * - * @see com.google.domain.registry.ui.server.registrar.RegistrarServlet + * @see google.registry.ui.server.registrar.RegistrarServlet */ public ImmutableList getRegistrarChangesNotificationEmailAddresses(); /** * Returns default WHOIS server to use when {@code Registrar#getWhoisServer()} is {@code null}. * - * @see "com.google.domain.registry.whois.DomainWhoisResponse" - * @see "com.google.domain.registry.whois.RegistrarWhoisResponse" + * @see "google.registry.whois.DomainWhoisResponse" + * @see "google.registry.whois.RegistrarWhoisResponse" */ public String getRegistrarDefaultWhoisServer(); diff --git a/java/google/registry/config/RegistryEnvironment.java b/java/google/registry/config/RegistryEnvironment.java index cafbfd903..ad58b7aa1 100644 --- a/java/google/registry/config/RegistryEnvironment.java +++ b/java/google/registry/config/RegistryEnvironment.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.config; +package google.registry.config; import com.google.common.annotations.VisibleForTesting; @@ -86,5 +86,5 @@ public enum RegistryEnvironment { private final RegistryConfig config = new TestRegistryConfig(); /** System property for configuring which environment we should use. */ - public static final String PROPERTY = "com.google.domain.registry.environment"; + public static final String PROPERTY = "google.registry.environment"; } diff --git a/java/google/registry/config/TestRegistryConfig.java b/java/google/registry/config/TestRegistryConfig.java index 8371f4c1f..afbf77039 100644 --- a/java/google/registry/config/TestRegistryConfig.java +++ b/java/google/registry/config/TestRegistryConfig.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.config; +package google.registry.config; -import static com.google.domain.registry.config.ConfigUtils.makeUrl; +import static google.registry.config.ConfigUtils.makeUrl; import static org.joda.time.Duration.standardDays; import com.google.common.base.Optional; diff --git a/java/google/registry/config/package-info.java b/java/google/registry/config/package-info.java index fd1697cab..5527ec89d 100644 --- a/java/google/registry/config/package-info.java +++ b/java/google/registry/config/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.config; +package google.registry.config; diff --git a/java/google/registry/cron/BUILD b/java/google/registry/cron/BUILD index ffb388d06..1c3110777 100644 --- a/java/google/registry/cron/BUILD +++ b/java/google/registry/cron/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "cron", @@ -11,9 +13,6 @@ java_library( "//java/com/google/common/base", "//java/com/google/common/collect", "//java/com/google/common/net", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/dagger", "//third_party/java/joda_time", @@ -21,5 +20,8 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/cron/CommitLogFanoutAction.java b/java/google/registry/cron/CommitLogFanoutAction.java index f7ea15a9d..e9742f214 100644 --- a/java/google/registry/cron/CommitLogFanoutAction.java +++ b/java/google/registry/cron/CommitLogFanoutAction.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.cron; +package google.registry.cron; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static java.util.concurrent.TimeUnit.SECONDS; @@ -20,10 +20,11 @@ import static java.util.concurrent.TimeUnit.SECONDS; import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.common.base.Optional; -import com.google.domain.registry.model.ofy.CommitLogBucket; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.TaskEnqueuer; + +import google.registry.model.ofy.CommitLogBucket; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.util.TaskEnqueuer; import java.util.Random; diff --git a/java/google/registry/cron/CronModule.java b/java/google/registry/cron/CronModule.java index f1d1f9a3e..1ee7d4440 100644 --- a/java/google/registry/cron/CronModule.java +++ b/java/google/registry/cron/CronModule.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.cron; +package google.registry.cron; -import static com.google.domain.registry.request.RequestParameters.extractBooleanParameter; -import static com.google.domain.registry.request.RequestParameters.extractOptionalIntParameter; -import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter; -import static com.google.domain.registry.request.RequestParameters.extractSetOfParameters; +import static google.registry.request.RequestParameters.extractBooleanParameter; +import static google.registry.request.RequestParameters.extractOptionalIntParameter; +import static google.registry.request.RequestParameters.extractRequiredParameter; +import static google.registry.request.RequestParameters.extractSetOfParameters; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.request.Parameter; import dagger.Module; import dagger.Provides; +import google.registry.request.Parameter; + import javax.servlet.http.HttpServletRequest; /** Dagger module for the cron package. */ diff --git a/java/google/registry/cron/TldFanoutAction.java b/java/google/registry/cron/TldFanoutAction.java index 31ce026c6..b95076fad 100644 --- a/java/google/registry/cron/TldFanoutAction.java +++ b/java/google/registry/cron/TldFanoutAction.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.cron; +package google.registry.cron; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; @@ -23,9 +23,9 @@ import static com.google.common.collect.Iterables.concat; import static com.google.common.collect.Iterables.getFirst; import static com.google.common.collect.Multimaps.filterKeys; import static com.google.common.collect.Sets.difference; -import static com.google.domain.registry.model.registry.Registries.getTldsOfType; -import static com.google.domain.registry.model.registry.Registry.TldType.REAL; -import static com.google.domain.registry.model.registry.Registry.TldType.TEST; +import static google.registry.model.registry.Registries.getTldsOfType; +import static google.registry.model.registry.Registry.TldType.REAL; +import static google.registry.model.registry.Registry.TldType.TEST; import static java.util.concurrent.TimeUnit.SECONDS; import com.google.appengine.api.taskqueue.Queue; @@ -34,11 +34,12 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.ParameterMap; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.util.TaskEnqueuer; + +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.request.ParameterMap; +import google.registry.request.RequestParameters; +import google.registry.util.TaskEnqueuer; import java.util.Random; import java.util.Set; diff --git a/java/google/registry/cron/package-info.java b/java/google/registry/cron/package-info.java index 692678e07..cb20ae3d6 100644 --- a/java/google/registry/cron/package-info.java +++ b/java/google/registry/cron/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.cron; +package google.registry.cron; diff --git a/java/google/registry/dns/BUILD b/java/google/registry/dns/BUILD index 629362ffe..15828f81b 100644 --- a/java/google/registry/dns/BUILD +++ b/java/google/registry/dns/BUILD @@ -2,9 +2,11 @@ # Routines to publish authoritative DNS. package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "constants", @@ -25,11 +27,6 @@ java_library( "//java/com/google/common/html", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/dns/writer/api", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/dagger", "//third_party/java/joda_time", @@ -37,5 +34,10 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/dns/writer/api", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/dns/DnsConstants.java b/java/google/registry/dns/DnsConstants.java index 4f384d49d..26f3a69a3 100644 --- a/java/google/registry/dns/DnsConstants.java +++ b/java/google/registry/dns/DnsConstants.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns; +package google.registry.dns; /** Static class for DNS-related constants. */ public class DnsConstants { diff --git a/java/google/registry/dns/DnsModule.java b/java/google/registry/dns/DnsModule.java index c2ad12723..bfce0670a 100644 --- a/java/google/registry/dns/DnsModule.java +++ b/java/google/registry/dns/DnsModule.java @@ -12,28 +12,29 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns; +package google.registry.dns; -import static com.google.domain.registry.dns.DnsConstants.DNS_PUBLISH_PUSH_QUEUE_NAME; -import static com.google.domain.registry.dns.DnsConstants.DNS_PULL_QUEUE_NAME; -import static com.google.domain.registry.dns.PublishDnsUpdatesAction.DOMAINS_PARAM; -import static com.google.domain.registry.dns.PublishDnsUpdatesAction.HOSTS_PARAM; -import static com.google.domain.registry.dns.ReadDnsQueueAction.KEEP_TASKS_PARAM; -import static com.google.domain.registry.request.RequestParameters.extractBooleanParameter; -import static com.google.domain.registry.request.RequestParameters.extractEnumParameter; -import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter; -import static com.google.domain.registry.request.RequestParameters.extractSetOfParameters; +import static google.registry.dns.DnsConstants.DNS_PUBLISH_PUSH_QUEUE_NAME; +import static google.registry.dns.DnsConstants.DNS_PULL_QUEUE_NAME; +import static google.registry.dns.PublishDnsUpdatesAction.DOMAINS_PARAM; +import static google.registry.dns.PublishDnsUpdatesAction.HOSTS_PARAM; +import static google.registry.dns.ReadDnsQueueAction.KEEP_TASKS_PARAM; +import static google.registry.request.RequestParameters.extractBooleanParameter; +import static google.registry.request.RequestParameters.extractEnumParameter; +import static google.registry.request.RequestParameters.extractRequiredParameter; +import static google.registry.request.RequestParameters.extractSetOfParameters; import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.api.taskqueue.QueueFactory; -import com.google.domain.registry.dns.DnsConstants.TargetType; -import com.google.domain.registry.dns.writer.api.DnsWriterZone; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; import dagger.Module; import dagger.Provides; +import google.registry.dns.DnsConstants.TargetType; +import google.registry.dns.writer.api.DnsWriterZone; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; + import java.util.Set; import javax.inject.Named; diff --git a/java/google/registry/dns/DnsQueue.java b/java/google/registry/dns/DnsQueue.java index ce9fe8c36..20131bfe6 100644 --- a/java/google/registry/dns/DnsQueue.java +++ b/java/google/registry/dns/DnsQueue.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns; +package google.registry.dns; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; -import static com.google.domain.registry.dns.DnsConstants.DNS_PULL_QUEUE_NAME; -import static com.google.domain.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM; -import static com.google.domain.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; -import static com.google.domain.registry.request.RequestParameters.PARAM_TLD; -import static com.google.domain.registry.util.DomainNameUtils.getTldFromDomainName; +import static google.registry.dns.DnsConstants.DNS_PULL_QUEUE_NAME; +import static google.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM; +import static google.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM; +import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.request.RequestParameters.PARAM_TLD; +import static google.registry.util.DomainNameUtils.getTldFromDomainName; import static java.util.concurrent.TimeUnit.MILLISECONDS; import com.google.appengine.api.taskqueue.Queue; @@ -35,10 +35,11 @@ import com.google.apphosting.api.DeadlineExceededException; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.dns.DnsConstants.TargetType; -import com.google.domain.registry.model.registry.Registries; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.config.ConfigModule.Config; +import google.registry.dns.DnsConstants.TargetType; +import google.registry.model.registry.Registries; +import google.registry.util.FormattingLogger; import org.joda.time.Duration; diff --git a/java/google/registry/dns/PublishDnsUpdatesAction.java b/java/google/registry/dns/PublishDnsUpdatesAction.java index 1a27cb61f..a58179e1b 100644 --- a/java/google/registry/dns/PublishDnsUpdatesAction.java +++ b/java/google/registry/dns/PublishDnsUpdatesAction.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns; +package google.registry.dns; -import static com.google.domain.registry.model.server.Lock.executeWithLocks; -import static com.google.domain.registry.request.Action.Method.POST; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.model.server.Lock.executeWithLocks; +import static google.registry.request.Action.Method.POST; +import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.dns.writer.api.DnsWriter; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException.ServiceUnavailableException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.util.DomainNameUtils; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.config.ConfigModule.Config; +import google.registry.dns.writer.api.DnsWriter; +import google.registry.request.Action; +import google.registry.request.HttpException.ServiceUnavailableException; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; +import google.registry.util.DomainNameUtils; +import google.registry.util.FormattingLogger; import org.joda.time.Duration; diff --git a/java/google/registry/dns/ReadDnsQueueAction.java b/java/google/registry/dns/ReadDnsQueueAction.java index ebcb54e36..4f225755d 100644 --- a/java/google/registry/dns/ReadDnsQueueAction.java +++ b/java/google/registry/dns/ReadDnsQueueAction.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns; +package google.registry.dns; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; import static com.google.common.collect.Sets.difference; -import static com.google.domain.registry.dns.DnsConstants.DNS_PUBLISH_PUSH_QUEUE_NAME; -import static com.google.domain.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM; -import static com.google.domain.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM; -import static com.google.domain.registry.model.registry.Registries.getTlds; +import static google.registry.dns.DnsConstants.DNS_PUBLISH_PUSH_QUEUE_NAME; +import static google.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM; +import static google.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM; +import static google.registry.model.registry.Registries.getTlds; import static java.util.concurrent.TimeUnit.SECONDS; import com.google.appengine.api.taskqueue.Queue; @@ -32,14 +32,15 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.TreeMultimap; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.dns.DnsConstants.TargetType; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.TaskEnqueuer; + +import google.registry.config.ConfigModule.Config; +import google.registry.dns.DnsConstants.TargetType; +import google.registry.model.registry.Registry; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; +import google.registry.util.FormattingLogger; +import google.registry.util.TaskEnqueuer; import java.io.UnsupportedEncodingException; import java.util.Collection; diff --git a/java/google/registry/dns/RefreshDnsAction.java b/java/google/registry/dns/RefreshDnsAction.java index 03d219abb..e7f767e78 100644 --- a/java/google/registry/dns/RefreshDnsAction.java +++ b/java/google/registry/dns/RefreshDnsAction.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns; +package google.registry.dns; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.EppResourceUtils.loadByUniqueId; -import com.google.domain.registry.dns.DnsConstants.TargetType; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.NotFoundException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.Clock; +import google.registry.dns.DnsConstants.TargetType; +import google.registry.model.EppResource; +import google.registry.model.domain.DomainResource; +import google.registry.model.host.HostResource; +import google.registry.request.Action; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.NotFoundException; +import google.registry.request.Parameter; +import google.registry.util.Clock; import javax.inject.Inject; diff --git a/java/google/registry/dns/WriteDnsAction.java b/java/google/registry/dns/WriteDnsAction.java index 2511fd9af..d908fa79a 100644 --- a/java/google/registry/dns/WriteDnsAction.java +++ b/java/google/registry/dns/WriteDnsAction.java @@ -12,29 +12,30 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns; +package google.registry.dns; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM; -import static com.google.domain.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM; -import static com.google.domain.registry.model.server.Lock.executeWithLocks; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM; +import static google.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM; +import static google.registry.model.server.Lock.executeWithLocks; +import static google.registry.request.Action.Method.POST; import com.google.appengine.api.LifecycleManager; import com.google.appengine.api.taskqueue.TaskHandle; import com.google.common.base.Throwables; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.dns.DnsConstants.TargetType; -import com.google.domain.registry.dns.writer.api.DnsWriter; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.util.DomainNameUtils; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.config.ConfigModule.Config; +import google.registry.dns.DnsConstants.TargetType; +import google.registry.dns.writer.api.DnsWriter; +import google.registry.model.registry.Registry; +import google.registry.request.Action; +import google.registry.request.HttpException; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; +import google.registry.util.DomainNameUtils; +import google.registry.util.FormattingLogger; import org.joda.time.Duration; diff --git a/java/google/registry/dns/writer/api/BUILD b/java/google/registry/dns/writer/api/BUILD index cf8e2df78..e6cacec57 100644 --- a/java/google/registry/dns/writer/api/BUILD +++ b/java/google/registry/dns/writer/api/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "api", diff --git a/java/google/registry/dns/writer/api/DnsWriter.java b/java/google/registry/dns/writer/api/DnsWriter.java index e37b25c45..72c60617f 100644 --- a/java/google/registry/dns/writer/api/DnsWriter.java +++ b/java/google/registry/dns/writer/api/DnsWriter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns.writer.api; +package google.registry.dns.writer.api; /** * Transaction object for sending an atomic batch of updates for a single zone to the DNS server. diff --git a/java/google/registry/dns/writer/api/DnsWriterZone.java b/java/google/registry/dns/writer/api/DnsWriterZone.java index 4187da0a9..4df0cfb02 100644 --- a/java/google/registry/dns/writer/api/DnsWriterZone.java +++ b/java/google/registry/dns/writer/api/DnsWriterZone.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns.writer.api; +package google.registry.dns.writer.api; import java.lang.annotation.Documented; diff --git a/java/google/registry/dns/writer/api/VoidDnsWriter.java b/java/google/registry/dns/writer/api/VoidDnsWriter.java index b5a18a712..a362098b5 100644 --- a/java/google/registry/dns/writer/api/VoidDnsWriter.java +++ b/java/google/registry/dns/writer/api/VoidDnsWriter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns.writer.api; +package google.registry.dns.writer.api; import com.google.common.base.Joiner; diff --git a/java/google/registry/dns/writer/api/VoidDnsWriterModule.java b/java/google/registry/dns/writer/api/VoidDnsWriterModule.java index 15374d462..dd29f1935 100644 --- a/java/google/registry/dns/writer/api/VoidDnsWriterModule.java +++ b/java/google/registry/dns/writer/api/VoidDnsWriterModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns.writer.api; +package google.registry.dns.writer.api; import dagger.Module; import dagger.Provides; diff --git a/java/google/registry/dns/writer/dnsupdate/BUILD b/java/google/registry/dns/writer/dnsupdate/BUILD index 491713da9..870304c8f 100644 --- a/java/google/registry/dns/writer/dnsupdate/BUILD +++ b/java/google/registry/dns/writer/dnsupdate/BUILD @@ -1,5 +1,5 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) @@ -13,13 +13,13 @@ java_library( "//java/com/google/common/io", "//java/com/google/common/net", "//java/com/google/common/primitives", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/dns/writer/api", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/util", - "//third_party/java/joda_time", + "//java/google/registry/config", + "//java/google/registry/dns/writer/api", + "//java/google/registry/model", + "//java/google/registry/util", "//third_party/java/dagger", "//third_party/java/dnsjava", + "//third_party/java/joda_time", "//third_party/java/jsr305_annotations", "//third_party/java/jsr330_inject", ], diff --git a/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java b/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java index f206402bc..5f8f094a2 100644 --- a/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java +++ b/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns.writer.dnsupdate; +package google.registry.dns.writer.dnsupdate; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Verify.verify; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Ints; -import com.google.domain.registry.config.ConfigModule.Config; + +import google.registry.config.ConfigModule.Config; import org.joda.time.Duration; import org.xbill.DNS.Message; diff --git a/java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java b/java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java index 156861d00..91e30bb52 100644 --- a/java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java +++ b/java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns.writer.dnsupdate; - -import com.google.domain.registry.config.ConfigModule.Config; - -import org.joda.time.Duration; +package google.registry.dns.writer.dnsupdate; import dagger.Module; import dagger.Provides; +import google.registry.config.ConfigModule.Config; + +import org.joda.time.Duration; + @Module public class DnsUpdateConfigModule { diff --git a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java index 8a2878eaf..b6d00a4df 100644 --- a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java +++ b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns.writer.dnsupdate; +package google.registry.dns.writer.dnsupdate; import static com.google.common.base.Verify.verify; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.EppResourceUtils.loadByUniqueId; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.dns.writer.api.DnsWriter; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.registry.Registries; -import com.google.domain.registry.util.Clock; + +import google.registry.config.ConfigModule.Config; +import google.registry.dns.writer.api.DnsWriter; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.host.HostResource; +import google.registry.model.registry.Registries; +import google.registry.util.Clock; import org.joda.time.Duration; import org.xbill.DNS.AAAARecord; diff --git a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java index 034f7a580..23b7445ab 100644 --- a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java +++ b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.dns.writer.dnsupdate; - -import com.google.domain.registry.dns.writer.api.DnsWriter; - -import javax.net.SocketFactory; +package google.registry.dns.writer.dnsupdate; import dagger.Module; import dagger.Provides; +import google.registry.dns.writer.api.DnsWriter; + +import javax.net.SocketFactory; + /** Dagger module that provides a DnsUpdateWriter. */ @Module public final class DnsUpdateWriterModule { diff --git a/java/google/registry/eclipse/BUILD b/java/google/registry/eclipse/BUILD index 821231ba7..e11c2d629 100644 --- a/java/google/registry/eclipse/BUILD +++ b/java/google/registry/eclipse/BUILD @@ -1,5 +1,5 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) java_binary( @@ -19,16 +19,16 @@ java_binary( create_executable = 0, runtime_deps = [ "//java/com/google/common/testing", - "//java/com/google/domain/registry/module/frontend", - "//java/com/google/domain/registry/module/backend", - "//java/com/google/domain/registry/module/tools", - "//java/com/google/domain/registry/tools", + "//java/google/registry/module/backend", + "//java/google/registry/module/frontend", + "//java/google/registry/module/tools", + "//java/google/registry/tools", + "//third_party/java/apache_sshd", "//third_party/java/appengine:appengine-api-link", + "//third_party/java/appengine:appengine-integration-testing", "//third_party/java/appengine:appengine-remote-api-link", "//third_party/java/appengine:appengine-stubs", - "//third_party/java/appengine:appengine-integration-testing", "//third_party/java/appengine:appengine-testing", - "//third_party/java/apache_sshd", "//third_party/java/ftpserver", "//third_party/java/hamcrest", "//third_party/java/jetty/v6_1_22", @@ -43,13 +43,8 @@ java_binary( # of domain-registry classes on the eclipse build path. genrule( name = "eclipse_deps", - srcs = ["//java/com/google/domain/registry/eclipse:registry_deps_deploy.jar"], + srcs = ["//java/google/registry/eclipse:registry_deps_deploy.jar"], outs = ["eclipse_deps.jar"], - tools = [ - "@local_jdk//:bin/jar", - "@local_jdk//:jdk-lib", - "@local_jdk//:jre-default", - ], cmd = " && ".join([ "JAR=$$(pwd)/$(location @local_jdk//:bin/jar)", "IN=$$(pwd)/$(SRCS)", @@ -57,9 +52,14 @@ genrule( "TMP=$$(mktemp -d $${TMPDIR:-/tmp}/eclipse_deps.XXXXXXXX)", "cd $$TMP", "$$JAR -xf $$IN", - "rm -rf com/google/domain/registry", + "rm -rf google/registry", "$$JAR -cmf META-INF/MANIFEST.MF eclipse_deps.jar .", "mv eclipse_deps.jar $$OUT", "rm -rf $$TMP", ]), + tools = [ + "@local_jdk//:bin/jar", + "@local_jdk//:jdk-lib", + "@local_jdk//:jre-default", + ], ) diff --git a/java/google/registry/env/BUILD b/java/google/registry/env/BUILD index 17f9f5013..17ccbda7c 100644 --- a/java/google/registry/env/BUILD +++ b/java/google/registry/env/BUILD @@ -1,4 +1,6 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + diff --git a/java/google/registry/env/common/BUILD b/java/google/registry/env/common/BUILD index 304557a76..737f8ac34 100644 --- a/java/google/registry/env/common/BUILD +++ b/java/google/registry/env/common/BUILD @@ -1,5 +1,7 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + diff --git a/java/google/registry/env/common/backend/BUILD b/java/google/registry/env/common/backend/BUILD index c1c5eb0e3..80135411c 100644 --- a/java/google/registry/env/common/backend/BUILD +++ b/java/google/registry/env/common/backend/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + exports_files(glob(["WEB-INF/*"])) diff --git a/java/google/registry/env/common/backend/WEB-INF/web.xml b/java/google/registry/env/common/backend/WEB-INF/web.xml index 77c5ccd1c..136a1d629 100644 --- a/java/google/registry/env/common/backend/WEB-INF/web.xml +++ b/java/google/registry/env/common/backend/WEB-INF/web.xml @@ -9,7 +9,7 @@ BackendServlet backend-servlet - com.google.domain.registry.module.backend.BackendServlet + google.registry.module.backend.BackendServlet 1 @@ -124,7 +124,7 @@ Exports a datastore backup snapshot to GCS. Export snapshot to GCS exportSnapshot - com.google.domain.registry.export.ExportSnapshotServlet + google.registry.export.ExportSnapshotServlet exportSnapshot @@ -135,7 +135,7 @@ Checks the completion of a datastore backup snapshot. Check on snapshot status checkSnapshot - com.google.domain.registry.export.CheckSnapshotServlet + google.registry.export.CheckSnapshotServlet checkSnapshot @@ -345,7 +345,7 @@ OfyFilter - com.google.domain.registry.model.ofy.OfyFilter + google.registry.model.ofy.OfyFilter OfyFilter diff --git a/java/google/registry/env/common/default/BUILD b/java/google/registry/env/common/default/BUILD index c1c5eb0e3..80135411c 100644 --- a/java/google/registry/env/common/default/BUILD +++ b/java/google/registry/env/common/default/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + exports_files(glob(["WEB-INF/*"])) diff --git a/java/google/registry/env/common/default/WEB-INF/web.xml b/java/google/registry/env/common/default/WEB-INF/web.xml index 64a27cb04..395f7874b 100644 --- a/java/google/registry/env/common/default/WEB-INF/web.xml +++ b/java/google/registry/env/common/default/WEB-INF/web.xml @@ -11,7 +11,7 @@ EPP epp - com.google.domain.registry.flows.EppTlsServlet + google.registry.flows.EppTlsServlet 1 @@ -25,7 +25,7 @@ Registrar Console XHR registrar-xhr - com.google.domain.registry.flows.EppConsoleServlet + google.registry.flows.EppConsoleServlet 1 @@ -36,7 +36,7 @@ Registrar Self-serve Settings registrar-settings - com.google.domain.registry.ui.server.registrar.RegistrarServlet + google.registry.ui.server.registrar.RegistrarServlet 1 @@ -48,7 +48,7 @@ FrontendServlet frontend-servlet - com.google.domain.registry.module.frontend.FrontendServlet + google.registry.module.frontend.FrontendServlet 1 @@ -95,7 +95,7 @@ Availability Check check - com.google.domain.registry.ui.server.api.CheckApiServlet + google.registry.ui.server.api.CheckApiServlet 1 @@ -254,7 +254,7 @@ OfyFilter - com.google.domain.registry.model.ofy.OfyFilter + google.registry.model.ofy.OfyFilter OfyFilter diff --git a/java/google/registry/env/common/tools/BUILD b/java/google/registry/env/common/tools/BUILD index c1c5eb0e3..80135411c 100644 --- a/java/google/registry/env/common/tools/BUILD +++ b/java/google/registry/env/common/tools/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + exports_files(glob(["WEB-INF/*"])) diff --git a/java/google/registry/env/common/tools/WEB-INF/web.xml b/java/google/registry/env/common/tools/WEB-INF/web.xml index 37adbb9b0..a69522423 100644 --- a/java/google/registry/env/common/tools/WEB-INF/web.xml +++ b/java/google/registry/env/common/tools/WEB-INF/web.xml @@ -9,7 +9,7 @@ ToolsServlet tools-servlet - com.google.domain.registry.module.tools.ToolsServlet + google.registry.module.tools.ToolsServlet 1 @@ -67,7 +67,7 @@ Registry tool EPP endpoint epptool - com.google.domain.registry.flows.EppToolServlet + google.registry.flows.EppToolServlet 1 @@ -112,12 +112,6 @@ /_dr/task/killAllCommitLogs - - - tools-servlet - /_dr/task/killAllCrossTld - - mapreduce @@ -229,7 +223,7 @@ OfyFilter - com.google.domain.registry.model.ofy.OfyFilter + google.registry.model.ofy.OfyFilter OfyFilter diff --git a/java/google/registry/env/production/BUILD b/java/google/registry/env/production/BUILD index 17f9f5013..17ccbda7c 100644 --- a/java/google/registry/env/production/BUILD +++ b/java/google/registry/env/production/BUILD @@ -1,4 +1,6 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + diff --git a/java/google/registry/env/production/backend/BUILD b/java/google/registry/env/production/backend/BUILD index 304557a76..737f8ac34 100644 --- a/java/google/registry/env/production/backend/BUILD +++ b/java/google/registry/env/production/backend/BUILD @@ -1,5 +1,7 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + diff --git a/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml index f1c19a1db..3dbbbc1c2 100644 --- a/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml +++ b/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml @@ -15,7 +15,7 @@ - diff --git a/java/google/registry/env/production/default/BUILD b/java/google/registry/env/production/default/BUILD index 304557a76..737f8ac34 100644 --- a/java/google/registry/env/production/default/BUILD +++ b/java/google/registry/env/production/default/BUILD @@ -1,5 +1,7 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + diff --git a/java/google/registry/env/production/default/WEB-INF/appengine-web.xml b/java/google/registry/env/production/default/WEB-INF/appengine-web.xml index bd46ddc34..0b2da7b6b 100644 --- a/java/google/registry/env/production/default/WEB-INF/appengine-web.xml +++ b/java/google/registry/env/production/default/WEB-INF/appengine-web.xml @@ -15,7 +15,7 @@ - diff --git a/java/google/registry/env/production/tools/BUILD b/java/google/registry/env/production/tools/BUILD index 304557a76..737f8ac34 100644 --- a/java/google/registry/env/production/tools/BUILD +++ b/java/google/registry/env/production/tools/BUILD @@ -1,5 +1,7 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + diff --git a/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml index a0d77a8a3..11b6162eb 100644 --- a/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml +++ b/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml @@ -15,7 +15,7 @@ - diff --git a/java/google/registry/export/BUILD b/java/google/registry/export/BUILD index 38df43564..9a0c99540 100644 --- a/java/google/registry/export/BUILD +++ b/java/google/registry/export/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "export", @@ -21,16 +23,6 @@ java_library( "//java/com/google/common/html", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/bigquery", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/gcs", - "//java/com/google/domain/registry/groups", - "//java/com/google/domain/registry/mapreduce", - "//java/com/google/domain/registry/mapreduce/inputs", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/storage/drive", - "//java/com/google/domain/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/appengine_gcs_client", "//third_party/java/appengine_mapreduce2:appengine_mapreduce", @@ -41,5 +33,15 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/bigquery", + "//java/google/registry/config", + "//java/google/registry/gcs", + "//java/google/registry/groups", + "//java/google/registry/mapreduce", + "//java/google/registry/mapreduce/inputs", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/storage/drive", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/export/BigqueryPollJobAction.java b/java/google/registry/export/BigqueryPollJobAction.java index b89592705..48df0dbe5 100644 --- a/java/google/registry/export/BigqueryPollJobAction.java +++ b/java/google/registry/export/BigqueryPollJobAction.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; -import static com.google.domain.registry.bigquery.BigqueryUtils.toJobReferenceString; +import static google.registry.bigquery.BigqueryUtils.toJobReferenceString; import com.google.api.services.bigquery.Bigquery; import com.google.api.services.bigquery.model.Job; @@ -25,16 +25,17 @@ import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.api.taskqueue.TaskHandle; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TaskOptions.Method; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Header; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.NotModifiedException; -import com.google.domain.registry.request.Payload; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.TaskEnqueuer; import dagger.Lazy; +import google.registry.request.Action; +import google.registry.request.Header; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.NotModifiedException; +import google.registry.request.Payload; +import google.registry.util.FormattingLogger; +import google.registry.util.TaskEnqueuer; + import org.joda.time.Duration; import java.io.ByteArrayInputStream; diff --git a/java/google/registry/export/CheckSnapshotServlet.java b/java/google/registry/export/CheckSnapshotServlet.java index 278b79b9c..321a7b46f 100644 --- a/java/google/registry/export/CheckSnapshotServlet.java +++ b/java/google/registry/export/CheckSnapshotServlet.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.collect.Sets.intersection; import static com.google.common.html.HtmlEscapers.htmlEscaper; -import static com.google.domain.registry.export.LoadSnapshotAction.enqueueLoadSnapshotTask; -import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter; -import static com.google.domain.registry.util.FormattingLogger.getLoggerForCallerClass; +import static google.registry.export.LoadSnapshotAction.enqueueLoadSnapshotTask; +import static google.registry.request.RequestParameters.extractRequiredParameter; +import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; @@ -35,10 +35,11 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.net.MediaType; -import com.google.domain.registry.export.DatastoreBackupInfo.BackupStatus; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.NonFinalForTesting; + +import google.registry.export.DatastoreBackupInfo.BackupStatus; +import google.registry.request.HttpException.BadRequestException; +import google.registry.util.FormattingLogger; +import google.registry.util.NonFinalForTesting; import org.joda.time.Duration; import org.joda.time.PeriodType; diff --git a/java/google/registry/export/DatastoreBackupInfo.java b/java/google/registry/export/DatastoreBackupInfo.java index ebfdb3499..c32f0005f 100644 --- a/java/google/registry/export/DatastoreBackupInfo.java +++ b/java/google/registry/export/DatastoreBackupInfo.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -24,9 +24,10 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.NonFinalForTesting; -import com.google.domain.registry.util.SystemClock; + +import google.registry.util.Clock; +import google.registry.util.NonFinalForTesting; +import google.registry.util.SystemClock; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/export/DatastoreBackupService.java b/java/google/registry/export/DatastoreBackupService.java index 158e58c82..d403d2a74 100644 --- a/java/google/registry/export/DatastoreBackupService.java +++ b/java/google/registry/export/DatastoreBackupService.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; import static com.google.appengine.api.datastore.DatastoreServiceFactory.getDatastoreService; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; @@ -30,7 +30,8 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import com.google.domain.registry.util.NonFinalForTesting; + +import google.registry.util.NonFinalForTesting; import java.util.NoSuchElementException; diff --git a/java/google/registry/export/DriveModule.java b/java/google/registry/export/DriveModule.java index 874d97526..80dd08a8a 100644 --- a/java/google/registry/export/DriveModule.java +++ b/java/google/registry/export/DriveModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; import static dagger.Provides.Type.SET_VALUES; @@ -21,22 +21,23 @@ import com.google.api.client.http.HttpTransport; import com.google.api.client.json.JsonFactory; import com.google.api.services.drive.Drive; import com.google.api.services.drive.DriveScopes; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.request.OAuthScopes; import dagger.Module; import dagger.Provides; +import google.registry.config.ConfigModule.Config; +import google.registry.request.OAuthScopes; + import java.util.Set; /** * Dagger module for Google {@link Drive} service connection objects. * - * @see com.google.domain.registry.config.ConfigModule - * @see com.google.domain.registry.request.Modules.UrlFetchTransportModule - * @see com.google.domain.registry.request.Modules.Jackson2Module - * @see com.google.domain.registry.request.Modules.AppIdentityCredentialModule - * @see com.google.domain.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule + * @see google.registry.config.ConfigModule + * @see google.registry.request.Modules.UrlFetchTransportModule + * @see google.registry.request.Modules.Jackson2Module + * @see google.registry.request.Modules.AppIdentityCredentialModule + * @see google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule */ @Module public final class DriveModule { diff --git a/java/google/registry/export/ExportConstants.java b/java/google/registry/export/ExportConstants.java index e756862e3..66a642704 100644 --- a/java/google/registry/export/ExportConstants.java +++ b/java/google/registry/export/ExportConstants.java @@ -12,40 +12,41 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; import static com.google.common.base.Predicates.not; -import static com.google.domain.registry.model.EntityClasses.CLASS_TO_KIND_FUNCTION; -import static com.google.domain.registry.util.TypeUtils.hasAnnotation; +import static google.registry.model.EntityClasses.CLASS_TO_KIND_FUNCTION; +import static google.registry.util.TypeUtils.hasAnnotation; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Ordering; -import com.google.domain.registry.model.EntityClasses; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.VirtualEntity; -import com.google.domain.registry.model.billing.BillingEvent.Cancellation; -import com.google.domain.registry.model.billing.BillingEvent.Modification; -import com.google.domain.registry.model.billing.BillingEvent.OneTime; -import com.google.domain.registry.model.billing.BillingEvent.Recurring; -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCreditBalance; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.index.DomainApplicationIndex; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.model.registry.label.PremiumList.PremiumListEntry; -import com.google.domain.registry.model.reporting.HistoryEntry; + +import google.registry.model.EntityClasses; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.VirtualEntity; +import google.registry.model.billing.BillingEvent.Cancellation; +import google.registry.model.billing.BillingEvent.Modification; +import google.registry.model.billing.BillingEvent.OneTime; +import google.registry.model.billing.BillingEvent.Recurring; +import google.registry.model.billing.RegistrarCredit; +import google.registry.model.billing.RegistrarCreditBalance; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainBase; +import google.registry.model.host.HostResource; +import google.registry.model.index.DomainApplicationIndex; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.model.registry.Registry; +import google.registry.model.registry.label.PremiumList; +import google.registry.model.registry.label.PremiumList.PremiumListEntry; +import google.registry.model.reporting.HistoryEntry; /** Constants related to export code. */ public final class ExportConstants { diff --git a/java/google/registry/export/ExportDomainListsAction.java b/java/google/registry/export/ExportDomainListsAction.java index 7d6447a2a..5e2f2a852 100644 --- a/java/google/registry/export/ExportDomainListsAction.java +++ b/java/google/registry/export/ExportDomainListsAction.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; import static com.google.appengine.tools.cloudstorage.GcsServiceFactory.createGcsService; -import static com.google.domain.registry.mapreduce.inputs.EppResourceInputs.createEntityInput; -import static com.google.domain.registry.model.EppResourceUtils.isActive; -import static com.google.domain.registry.model.registry.Registries.getTldsOfType; -import static com.google.domain.registry.util.PipelineUtils.createJobPath; +import static google.registry.mapreduce.inputs.EppResourceInputs.createEntityInput; +import static google.registry.model.EppResourceUtils.isActive; +import static google.registry.model.registry.Registries.getTldsOfType; +import static google.registry.util.PipelineUtils.createJobPath; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; @@ -29,15 +29,16 @@ import com.google.appengine.tools.mapreduce.Reducer; import com.google.appengine.tools.mapreduce.ReducerInput; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.gcs.GcsUtils; -import com.google.domain.registry.mapreduce.MapreduceAction; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.registry.Registry.TldType; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.config.ConfigModule.Config; +import google.registry.gcs.GcsUtils; +import google.registry.mapreduce.MapreduceAction; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.model.domain.DomainResource; +import google.registry.model.registry.Registry.TldType; +import google.registry.request.Action; +import google.registry.request.Response; +import google.registry.util.FormattingLogger; import org.joda.time.DateTime; diff --git a/java/google/registry/export/ExportRequestModule.java b/java/google/registry/export/ExportRequestModule.java index fb6e3782b..3296c3b52 100644 --- a/java/google/registry/export/ExportRequestModule.java +++ b/java/google/registry/export/ExportRequestModule.java @@ -12,26 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; -import static com.google.domain.registry.export.BigqueryPollJobAction.CHAINED_TASK_QUEUE_HEADER; -import static com.google.domain.registry.export.BigqueryPollJobAction.JOB_ID_HEADER; -import static com.google.domain.registry.export.BigqueryPollJobAction.PROJECT_ID_HEADER; -import static com.google.domain.registry.export.LoadSnapshotAction.LOAD_SNAPSHOT_FILE_PARAM; -import static com.google.domain.registry.export.LoadSnapshotAction.LOAD_SNAPSHOT_ID_PARAM; -import static com.google.domain.registry.export.LoadSnapshotAction.LOAD_SNAPSHOT_KINDS_PARAM; -import static com.google.domain.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_DATASET_ID_PARAM; -import static com.google.domain.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_KIND_PARAM; -import static com.google.domain.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_TABLE_ID_PARAM; -import static com.google.domain.registry.request.RequestParameters.extractRequiredHeader; -import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter; - -import com.google.domain.registry.request.Header; -import com.google.domain.registry.request.Parameter; +import static google.registry.export.BigqueryPollJobAction.CHAINED_TASK_QUEUE_HEADER; +import static google.registry.export.BigqueryPollJobAction.JOB_ID_HEADER; +import static google.registry.export.BigqueryPollJobAction.PROJECT_ID_HEADER; +import static google.registry.export.LoadSnapshotAction.LOAD_SNAPSHOT_FILE_PARAM; +import static google.registry.export.LoadSnapshotAction.LOAD_SNAPSHOT_ID_PARAM; +import static google.registry.export.LoadSnapshotAction.LOAD_SNAPSHOT_KINDS_PARAM; +import static google.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_DATASET_ID_PARAM; +import static google.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_KIND_PARAM; +import static google.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_TABLE_ID_PARAM; +import static google.registry.request.RequestParameters.extractRequiredHeader; +import static google.registry.request.RequestParameters.extractRequiredParameter; import dagger.Module; import dagger.Provides; +import google.registry.request.Header; +import google.registry.request.Parameter; + import javax.servlet.http.HttpServletRequest; /** Dagger module for data export tasks. */ diff --git a/java/google/registry/export/ExportReservedTermsAction.java b/java/google/registry/export/ExportReservedTermsAction.java index e44ff803c..40ba89970 100644 --- a/java/google/registry/export/ExportReservedTermsAction.java +++ b/java/google/registry/export/ExportReservedTermsAction.java @@ -12,25 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; -import static com.google.domain.registry.export.ExportUtils.exportReservedTerms; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.export.ExportUtils.exportReservedTerms; +import static google.registry.request.Action.Method.POST; import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.net.MediaType; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.storage.drive.DriveConnection; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.model.registry.Registry; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; +import google.registry.request.Response; +import google.registry.storage.drive.DriveConnection; +import google.registry.util.FormattingLogger; import javax.inject.Inject; diff --git a/java/google/registry/export/ExportSnapshotServlet.java b/java/google/registry/export/ExportSnapshotServlet.java index 936170c3c..afb708e87 100644 --- a/java/google/registry/export/ExportSnapshotServlet.java +++ b/java/google/registry/export/ExportSnapshotServlet.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.html.HtmlEscapers.htmlEscaper; @@ -21,11 +21,12 @@ import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.net.MediaType; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.NonFinalForTesting; -import com.google.domain.registry.util.SystemClock; + +import google.registry.config.RegistryEnvironment; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; +import google.registry.util.NonFinalForTesting; +import google.registry.util.SystemClock; import java.io.IOException; diff --git a/java/google/registry/export/ExportUtils.java b/java/google/registry/export/ExportUtils.java index c05002e7c..cbaf0bebc 100644 --- a/java/google/registry/export/ExportUtils.java +++ b/java/google/registry/export/ExportUtils.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; -import static com.google.domain.registry.model.registry.label.ReservationType.UNRESERVED; +import static google.registry.model.registry.label.ReservationType.UNRESERVED; import com.google.common.base.Joiner; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.label.ReservedList; -import com.google.domain.registry.model.registry.label.ReservedList.ReservedListEntry; import com.googlecode.objectify.Key; +import google.registry.config.RegistryEnvironment; +import google.registry.model.registry.Registry; +import google.registry.model.registry.label.ReservedList; +import google.registry.model.registry.label.ReservedList.ReservedListEntry; + import java.util.Set; import java.util.TreeSet; diff --git a/java/google/registry/export/LoadSnapshotAction.java b/java/google/registry/export/LoadSnapshotAction.java index 45e2b0c63..3926eeccf 100644 --- a/java/google/registry/export/LoadSnapshotAction.java +++ b/java/google/registry/export/LoadSnapshotAction.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.export.UpdateSnapshotViewAction.createViewUpdateTask; -import static com.google.domain.registry.request.Action.Method.POST; -import static com.google.domain.registry.util.FormattingLogger.getLoggerForCallerClass; +import static google.registry.export.UpdateSnapshotViewAction.createViewUpdateTask; +import static google.registry.request.Action.Method.POST; +import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import com.google.api.services.bigquery.Bigquery; import com.google.api.services.bigquery.model.Job; @@ -34,17 +34,18 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.bigquery.BigqueryFactory; -import com.google.domain.registry.bigquery.BigqueryUtils.SourceFormat; -import com.google.domain.registry.bigquery.BigqueryUtils.WriteDisposition; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.export.BigqueryPollJobAction.BigqueryPollJobEnqueuer; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.InternalServerErrorException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.bigquery.BigqueryFactory; +import google.registry.bigquery.BigqueryUtils.SourceFormat; +import google.registry.bigquery.BigqueryUtils.WriteDisposition; +import google.registry.config.ConfigModule.Config; +import google.registry.export.BigqueryPollJobAction.BigqueryPollJobEnqueuer; +import google.registry.request.Action; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.InternalServerErrorException; +import google.registry.request.Parameter; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; import org.joda.time.DateTime; diff --git a/java/google/registry/export/PublishDetailReportAction.java b/java/google/registry/export/PublishDetailReportAction.java index 9999274f5..ef8f5dee3 100644 --- a/java/google/registry/export/PublishDetailReportAction.java +++ b/java/google/registry/export/PublishDetailReportAction.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; import static com.google.common.base.MoreObjects.firstNonNull; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteStreams; import com.google.common.net.MediaType; -import com.google.domain.registry.gcs.GcsUtils; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.InternalServerErrorException; -import com.google.domain.registry.request.JsonActionRunner; -import com.google.domain.registry.request.JsonActionRunner.JsonAction; -import com.google.domain.registry.storage.drive.DriveConnection; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.gcs.GcsUtils; +import google.registry.model.registrar.Registrar; +import google.registry.request.Action; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.InternalServerErrorException; +import google.registry.request.JsonActionRunner; +import google.registry.request.JsonActionRunner.JsonAction; +import google.registry.storage.drive.DriveConnection; +import google.registry.util.FormattingLogger; import java.io.FileNotFoundException; import java.io.InputStream; diff --git a/java/google/registry/export/SyncGroupMembersAction.java b/java/google/registry/export/SyncGroupMembersAction.java index 5cefa3785..850fff77d 100644 --- a/java/google/registry/export/SyncGroupMembersAction.java +++ b/java/google/registry/export/SyncGroupMembersAction.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; +package google.registry.export; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.request.Action.Method.POST; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; -import static com.google.domain.registry.util.RegistrarUtils.normalizeClientId; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.request.Action.Method.POST; +import static google.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.RegistrarUtils.normalizeClientId; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_OK; @@ -27,18 +27,19 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.groups.GroupsConnection; -import com.google.domain.registry.groups.GroupsConnection.Role; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.Concurrent; -import com.google.domain.registry.util.FormattingLogger; import com.googlecode.objectify.VoidWork; +import google.registry.config.ConfigModule.Config; +import google.registry.groups.GroupsConnection; +import google.registry.groups.GroupsConnection.Role; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.request.Action; +import google.registry.request.Response; +import google.registry.util.Concurrent; +import google.registry.util.FormattingLogger; + import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/java/google/registry/export/UpdateSnapshotViewAction.java b/java/google/registry/export/UpdateSnapshotViewAction.java index eaf46a8f7..f3562e91f 100644 --- a/java/google/registry/export/UpdateSnapshotViewAction.java +++ b/java/google/registry/export/UpdateSnapshotViewAction.java @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export; -import static com.google.domain.registry.request.Action.Method.POST; +package google.registry.export; +import static google.registry.request.Action.Method.POST; import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.google.api.services.bigquery.Bigquery; @@ -22,13 +22,14 @@ import com.google.api.services.bigquery.model.TableReference; import com.google.api.services.bigquery.model.ViewDefinition; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TaskOptions.Method; -import com.google.domain.registry.bigquery.BigqueryFactory; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException.InternalServerErrorException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.SqlTemplate; + +import google.registry.bigquery.BigqueryFactory; +import google.registry.config.ConfigModule.Config; +import google.registry.request.Action; +import google.registry.request.HttpException.InternalServerErrorException; +import google.registry.request.Parameter; +import google.registry.util.FormattingLogger; +import google.registry.util.SqlTemplate; import java.io.IOException; diff --git a/java/google/registry/export/package-info.java b/java/google/registry/export/package-info.java index bab035e20..783058e44 100644 --- a/java/google/registry/export/package-info.java +++ b/java/google/registry/export/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.export; +package google.registry.export; diff --git a/java/google/registry/export/sheet/BUILD b/java/google/registry/export/sheet/BUILD index 9926cd258..a99f2c586 100644 --- a/java/google/registry/export/sheet/BUILD +++ b/java/google/registry/export/sheet/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 java_library( @@ -10,10 +12,6 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", "//java/com/google/gdata", "//java/com/google/gdata:spreadsheet", "//third_party/java/appengine:appengine-api", @@ -22,5 +20,9 @@ java_library( "//third_party/java/jsr305_annotations", "//third_party/java/jsr330_inject", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/export/sheet/SheetModule.java b/java/google/registry/export/sheet/SheetModule.java index 58dca8687..0373c8025 100644 --- a/java/google/registry/export/sheet/SheetModule.java +++ b/java/google/registry/export/sheet/SheetModule.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export.sheet; +package google.registry.export.sheet; import static com.google.common.base.Strings.emptyToNull; import com.google.common.base.Optional; -import com.google.domain.registry.request.Parameter; import dagger.Module; import dagger.Provides; +import google.registry.request.Parameter; + import javax.servlet.http.HttpServletRequest; /** Dagger module for the sheet package. */ diff --git a/java/google/registry/export/sheet/SheetSynchronizer.java b/java/google/registry/export/sheet/SheetSynchronizer.java index d8527fcd2..87dfd4626 100644 --- a/java/google/registry/export/sheet/SheetSynchronizer.java +++ b/java/google/registry/export/sheet/SheetSynchronizer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export.sheet; +package google.registry.export.sheet; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/java/google/registry/export/sheet/SpreadsheetServiceModule.java b/java/google/registry/export/sheet/SpreadsheetServiceModule.java index 55601113b..20d265b1b 100644 --- a/java/google/registry/export/sheet/SpreadsheetServiceModule.java +++ b/java/google/registry/export/sheet/SpreadsheetServiceModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export.sheet; +package google.registry.export.sheet; import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; import com.google.common.collect.ImmutableList; diff --git a/java/google/registry/export/sheet/SyncRegistrarsSheet.java b/java/google/registry/export/sheet/SyncRegistrarsSheet.java index 47c33106a..71f595411 100644 --- a/java/google/registry/export/sheet/SyncRegistrarsSheet.java +++ b/java/google/registry/export/sheet/SyncRegistrarsSheet.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export.sheet; +package google.registry.export.sheet; import static com.google.common.base.MoreObjects.firstNonNull; -import static com.google.domain.registry.model.registrar.RegistrarContact.Type.ABUSE; -import static com.google.domain.registry.model.registrar.RegistrarContact.Type.ADMIN; -import static com.google.domain.registry.model.registrar.RegistrarContact.Type.BILLING; -import static com.google.domain.registry.model.registrar.RegistrarContact.Type.LEGAL; -import static com.google.domain.registry.model.registrar.RegistrarContact.Type.MARKETING; -import static com.google.domain.registry.model.registrar.RegistrarContact.Type.TECH; -import static com.google.domain.registry.model.registrar.RegistrarContact.Type.WHOIS; +import static google.registry.model.registrar.RegistrarContact.Type.ABUSE; +import static google.registry.model.registrar.RegistrarContact.Type.ADMIN; +import static google.registry.model.registrar.RegistrarContact.Type.BILLING; +import static google.registry.model.registrar.RegistrarContact.Type.LEGAL; +import static google.registry.model.registrar.RegistrarContact.Type.MARKETING; +import static google.registry.model.registrar.RegistrarContact.Type.TECH; +import static google.registry.model.registrar.RegistrarContact.Type.WHOIS; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -31,13 +31,14 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Ordering; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarAddress; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.DateTimeUtils; import com.google.gdata.util.ServiceException; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarAddress; +import google.registry.model.registrar.RegistrarContact; +import google.registry.util.Clock; +import google.registry.util.DateTimeUtils; + import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java b/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java index 3c2b1a2e6..9bb5e15f3 100644 --- a/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java +++ b/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.export.sheet; +package google.registry.export.sheet; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.request.Action.Method.POST; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; @@ -28,15 +28,16 @@ import com.google.appengine.api.modules.ModulesServiceFactory; import com.google.appengine.api.taskqueue.TaskHandle; import com.google.appengine.api.taskqueue.TaskOptions.Method; import com.google.common.base.Optional; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.model.server.Lock; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.NonFinalForTesting; import com.google.gdata.util.ServiceException; +import google.registry.config.ConfigModule.Config; +import google.registry.model.server.Lock; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.request.Response; +import google.registry.util.FormattingLogger; +import google.registry.util.NonFinalForTesting; + import org.joda.time.Duration; import java.io.IOException; diff --git a/java/google/registry/export/sheet/package-info.java b/java/google/registry/export/sheet/package-info.java index f187be876..6109b9834 100644 --- a/java/google/registry/export/sheet/package-info.java +++ b/java/google/registry/export/sheet/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.export.sheet; +package google.registry.export.sheet; diff --git a/java/google/registry/flows/BUILD b/java/google/registry/flows/BUILD index 51ef468fc..2ded8635f 100644 --- a/java/google/registry/flows/BUILD +++ b/java/google/registry/flows/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + filegroup( name = "flows_files", @@ -23,18 +25,6 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/dns", - "//java/com/google/domain/registry/mapreduce", - "//java/com/google/domain/registry/mapreduce/inputs", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/monitoring/whitebox", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/security:servlets", - "//java/com/google/domain/registry/tldconfig/idn", - "//java/com/google/domain/registry/tmch", - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/xml", "//third_party/java/appengine:appengine-api", "//third_party/java/appengine_mapreduce2:appengine_mapreduce", "//third_party/java/dagger", @@ -44,6 +34,18 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/dns", + "//java/google/registry/mapreduce", + "//java/google/registry/mapreduce/inputs", + "//java/google/registry/model", + "//java/google/registry/monitoring/whitebox", + "//java/google/registry/request", + "//java/google/registry/security:servlets", + "//java/google/registry/tldconfig/idn", + "//java/google/registry/tmch", + "//java/google/registry/util", + "//java/google/registry/xml", ], visibility = ["//visibility:public"], ) diff --git a/java/google/registry/flows/EppConsoleServlet.java b/java/google/registry/flows/EppConsoleServlet.java index 99e6b2554..7956e3bfe 100644 --- a/java/google/registry/flows/EppConsoleServlet.java +++ b/java/google/registry/flows/EppConsoleServlet.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import static com.google.appengine.api.users.UserServiceFactory.getUserService; import static com.google.common.base.Strings.nullToEmpty; -import static com.google.domain.registry.flows.EppServletUtils.handleEppCommandAndWriteResponse; +import static google.registry.flows.EppServletUtils.handleEppCommandAndWriteResponse; import static java.lang.System.identityHashCode; import com.google.appengine.api.users.User; import com.google.common.annotations.VisibleForTesting; import com.google.common.io.ByteStreams; -import com.google.domain.registry.flows.EppException.AuthenticationErrorException; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.security.XsrfProtectedServlet; + +import google.registry.flows.EppException.AuthenticationErrorException; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.security.XsrfProtectedServlet; import org.joda.time.Duration; diff --git a/java/google/registry/flows/EppController.java b/java/google/registry/flows/EppController.java index 03d23bd3f..628a67337 100644 --- a/java/google/registry/flows/EppController.java +++ b/java/google/registry/flows/EppController.java @@ -12,28 +12,29 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.EppXmlTransformer.marshalWithLenientRetry; -import static com.google.domain.registry.flows.EppXmlTransformer.unmarshal; -import static com.google.domain.registry.flows.FlowRegistry.getFlowClass; +import static google.registry.flows.EppXmlTransformer.marshalWithLenientRetry; +import static google.registry.flows.EppXmlTransformer.unmarshal; +import static google.registry.flows.FlowRegistry.getFlowClass; import com.google.apphosting.api.ApiProxy; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.flows.FlowRunner.CommitMode; -import com.google.domain.registry.flows.FlowRunner.UserPrivileges; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.eppinput.EppInput; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Response; -import com.google.domain.registry.model.eppoutput.Result; -import com.google.domain.registry.model.eppoutput.Result.Code; -import com.google.domain.registry.monitoring.whitebox.EppMetrics; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.SystemClock; + +import google.registry.flows.FlowRunner.CommitMode; +import google.registry.flows.FlowRunner.UserPrivileges; +import google.registry.model.eppcommon.Trid; +import google.registry.model.eppinput.EppInput; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Response; +import google.registry.model.eppoutput.Result; +import google.registry.model.eppoutput.Result.Code; +import google.registry.monitoring.whitebox.EppMetrics; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; +import google.registry.util.SystemClock; /** * The EppController class, which implements the state machine for the EPP command/response diff --git a/java/google/registry/flows/EppException.java b/java/google/registry/flows/EppException.java index 14a2a3df9..7b93af24b 100644 --- a/java/google/registry/flows/EppException.java +++ b/java/google/registry/flows/EppException.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; import com.google.common.base.Preconditions; -import com.google.domain.registry.model.annotations.ExternalMessagingName; -import com.google.domain.registry.model.eppinput.EppInput.InnerCommand; -import com.google.domain.registry.model.eppinput.ResourceCommand; -import com.google.domain.registry.model.eppoutput.Result; -import com.google.domain.registry.model.eppoutput.Result.Code; + +import google.registry.model.annotations.ExternalMessagingName; +import google.registry.model.eppinput.EppInput.InnerCommand; +import google.registry.model.eppinput.ResourceCommand; +import google.registry.model.eppoutput.Result; +import google.registry.model.eppoutput.Result.Code; import java.lang.annotation.Documented; import java.lang.annotation.Inherited; diff --git a/java/google/registry/flows/EppServletUtils.java b/java/google/registry/flows/EppServletUtils.java index 7b28ff2fe..05a1a7029 100644 --- a/java/google/registry/flows/EppServletUtils.java +++ b/java/google/registry/flows/EppServletUtils.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.EppController.handleEppCommand; +import static google.registry.flows.EppController.handleEppCommand; import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.net.MediaType; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.util.FormattingLogger; import java.io.IOException; import java.io.OutputStream; diff --git a/java/google/registry/flows/EppTlsServlet.java b/java/google/registry/flows/EppTlsServlet.java index b071986eb..5e7b2c7c5 100644 --- a/java/google/registry/flows/EppTlsServlet.java +++ b/java/google/registry/flows/EppTlsServlet.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import static com.google.common.io.ByteStreams.toByteArray; -import static com.google.domain.registry.flows.EppServletUtils.handleEppCommandAndWriteResponse; +import static google.registry.flows.EppServletUtils.handleEppCommandAndWriteResponse; -import com.google.domain.registry.util.FormattingLogger; +import google.registry.util.FormattingLogger; import java.io.IOException; diff --git a/java/google/registry/flows/EppToolServlet.java b/java/google/registry/flows/EppToolServlet.java index eb8188be3..180484b47 100644 --- a/java/google/registry/flows/EppToolServlet.java +++ b/java/google/registry/flows/EppToolServlet.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.EppServletUtils.handleEppCommandAndWriteResponse; +import static google.registry.flows.EppServletUtils.handleEppCommandAndWriteResponse; import com.google.common.io.ByteStreams; -import com.google.domain.registry.flows.SessionMetadata.SessionSource; -import com.google.domain.registry.model.eppcommon.ProtocolDefinition; -import com.google.domain.registry.security.XsrfProtectedServlet; + +import google.registry.flows.SessionMetadata.SessionSource; +import google.registry.model.eppcommon.ProtocolDefinition; +import google.registry.security.XsrfProtectedServlet; import java.io.IOException; diff --git a/java/google/registry/flows/EppXmlTransformer.java b/java/google/registry/flows/EppXmlTransformer.java index 3a7958ebb..c5c0dd0d7 100644 --- a/java/google/registry/flows/EppXmlTransformer.java +++ b/java/google/registry/flows/EppXmlTransformer.java @@ -12,32 +12,33 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.xml.ValidationMode.LENIENT; -import static com.google.domain.registry.xml.ValidationMode.STRICT; +import static google.registry.xml.ValidationMode.LENIENT; +import static google.registry.xml.ValidationMode.STRICT; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.flows.EppException.ParameterValueRangeErrorException; -import com.google.domain.registry.flows.EppException.ParameterValueSyntaxErrorException; -import com.google.domain.registry.flows.EppException.SyntaxErrorException; -import com.google.domain.registry.flows.EppException.UnimplementedProtocolVersionException; -import com.google.domain.registry.model.EppResourceUtils.InvalidRepoIdException; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppinput.EppInput; -import com.google.domain.registry.model.eppinput.EppInput.WrongProtocolVersionException; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.host.InetAddressAdapter.IpVersionMismatchException; -import com.google.domain.registry.model.translators.CurrencyUnitAdapter.UnknownCurrencyException; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.xml.ValidationMode; -import com.google.domain.registry.xml.XmlException; -import com.google.domain.registry.xml.XmlTransformer; + +import google.registry.flows.EppException.ParameterValueRangeErrorException; +import google.registry.flows.EppException.ParameterValueSyntaxErrorException; +import google.registry.flows.EppException.SyntaxErrorException; +import google.registry.flows.EppException.UnimplementedProtocolVersionException; +import google.registry.model.EppResourceUtils.InvalidRepoIdException; +import google.registry.model.ImmutableObject; +import google.registry.model.eppinput.EppInput; +import google.registry.model.eppinput.EppInput.WrongProtocolVersionException; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.host.InetAddressAdapter.IpVersionMismatchException; +import google.registry.model.translators.CurrencyUnitAdapter.UnknownCurrencyException; +import google.registry.util.FormattingLogger; +import google.registry.xml.ValidationMode; +import google.registry.xml.XmlException; +import google.registry.xml.XmlTransformer; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/java/google/registry/flows/Flow.java b/java/google/registry/flows/Flow.java index 049717393..d32fe6760 100644 --- a/java/google/registry/flows/Flow.java +++ b/java/google/registry/flows/Flow.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.eppinput.EppInput; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Response; -import com.google.domain.registry.model.eppoutput.Response.ResponseData; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; -import com.google.domain.registry.model.eppoutput.Result; + +import google.registry.model.eppcommon.Trid; +import google.registry.model.eppinput.EppInput; +import google.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Response; +import google.registry.model.eppoutput.Response.ResponseData; +import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.eppoutput.Result; import org.joda.time.DateTime; diff --git a/java/google/registry/flows/FlowRegistry.java b/java/google/registry/flows/FlowRegistry.java index 9b205a67d..b837cfe5a 100644 --- a/java/google/registry/flows/FlowRegistry.java +++ b/java/google/registry/flows/FlowRegistry.java @@ -12,75 +12,76 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.model.domain.launch.LaunchCreateExtension.CreateType.APPLICATION; +import static google.registry.model.domain.launch.LaunchCreateExtension.CreateType.APPLICATION; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableTable; import com.google.common.collect.Table; -import com.google.domain.registry.flows.EppException.SyntaxErrorException; -import com.google.domain.registry.flows.EppException.UnimplementedCommandException; -import com.google.domain.registry.flows.contact.ContactCheckFlow; -import com.google.domain.registry.flows.contact.ContactCreateFlow; -import com.google.domain.registry.flows.contact.ContactDeleteFlow; -import com.google.domain.registry.flows.contact.ContactInfoFlow; -import com.google.domain.registry.flows.contact.ContactTransferApproveFlow; -import com.google.domain.registry.flows.contact.ContactTransferCancelFlow; -import com.google.domain.registry.flows.contact.ContactTransferQueryFlow; -import com.google.domain.registry.flows.contact.ContactTransferRejectFlow; -import com.google.domain.registry.flows.contact.ContactTransferRequestFlow; -import com.google.domain.registry.flows.contact.ContactUpdateFlow; -import com.google.domain.registry.flows.domain.ClaimsCheckFlow; -import com.google.domain.registry.flows.domain.DomainAllocateFlow; -import com.google.domain.registry.flows.domain.DomainApplicationCreateFlow; -import com.google.domain.registry.flows.domain.DomainApplicationDeleteFlow; -import com.google.domain.registry.flows.domain.DomainApplicationInfoFlow; -import com.google.domain.registry.flows.domain.DomainApplicationUpdateFlow; -import com.google.domain.registry.flows.domain.DomainCheckFlow; -import com.google.domain.registry.flows.domain.DomainCreateFlow; -import com.google.domain.registry.flows.domain.DomainDeleteFlow; -import com.google.domain.registry.flows.domain.DomainInfoFlow; -import com.google.domain.registry.flows.domain.DomainRenewFlow; -import com.google.domain.registry.flows.domain.DomainRestoreRequestFlow; -import com.google.domain.registry.flows.domain.DomainTransferApproveFlow; -import com.google.domain.registry.flows.domain.DomainTransferCancelFlow; -import com.google.domain.registry.flows.domain.DomainTransferQueryFlow; -import com.google.domain.registry.flows.domain.DomainTransferRejectFlow; -import com.google.domain.registry.flows.domain.DomainTransferRequestFlow; -import com.google.domain.registry.flows.domain.DomainUpdateFlow; -import com.google.domain.registry.flows.host.HostCheckFlow; -import com.google.domain.registry.flows.host.HostCreateFlow; -import com.google.domain.registry.flows.host.HostDeleteFlow; -import com.google.domain.registry.flows.host.HostInfoFlow; -import com.google.domain.registry.flows.host.HostUpdateFlow; -import com.google.domain.registry.flows.poll.PollAckFlow; -import com.google.domain.registry.flows.poll.PollRequestFlow; -import com.google.domain.registry.flows.session.HelloFlow; -import com.google.domain.registry.flows.session.LoginFlow; -import com.google.domain.registry.flows.session.LogoutFlow; -import com.google.domain.registry.model.contact.ContactCommand; -import com.google.domain.registry.model.domain.DomainCommand; -import com.google.domain.registry.model.domain.allocate.AllocateCreateExtension; -import com.google.domain.registry.model.domain.launch.ApplicationIdTargetExtension; -import com.google.domain.registry.model.domain.launch.LaunchCheckExtension; -import com.google.domain.registry.model.domain.launch.LaunchCheckExtension.CheckType; -import com.google.domain.registry.model.domain.launch.LaunchCreateExtension; -import com.google.domain.registry.model.domain.launch.LaunchPhase; -import com.google.domain.registry.model.domain.rgp.RestoreCommand.RestoreOp; -import com.google.domain.registry.model.domain.rgp.RgpUpdateExtension; -import com.google.domain.registry.model.eppinput.EppInput; -import com.google.domain.registry.model.eppinput.EppInput.Hello; -import com.google.domain.registry.model.eppinput.EppInput.InnerCommand; -import com.google.domain.registry.model.eppinput.EppInput.Login; -import com.google.domain.registry.model.eppinput.EppInput.Logout; -import com.google.domain.registry.model.eppinput.EppInput.Poll; -import com.google.domain.registry.model.eppinput.EppInput.ResourceCommandWrapper; -import com.google.domain.registry.model.eppinput.EppInput.Transfer; -import com.google.domain.registry.model.eppinput.EppInput.Transfer.TransferOp; -import com.google.domain.registry.model.eppinput.ResourceCommand; -import com.google.domain.registry.model.host.HostCommand; + +import google.registry.flows.EppException.SyntaxErrorException; +import google.registry.flows.EppException.UnimplementedCommandException; +import google.registry.flows.contact.ContactCheckFlow; +import google.registry.flows.contact.ContactCreateFlow; +import google.registry.flows.contact.ContactDeleteFlow; +import google.registry.flows.contact.ContactInfoFlow; +import google.registry.flows.contact.ContactTransferApproveFlow; +import google.registry.flows.contact.ContactTransferCancelFlow; +import google.registry.flows.contact.ContactTransferQueryFlow; +import google.registry.flows.contact.ContactTransferRejectFlow; +import google.registry.flows.contact.ContactTransferRequestFlow; +import google.registry.flows.contact.ContactUpdateFlow; +import google.registry.flows.domain.ClaimsCheckFlow; +import google.registry.flows.domain.DomainAllocateFlow; +import google.registry.flows.domain.DomainApplicationCreateFlow; +import google.registry.flows.domain.DomainApplicationDeleteFlow; +import google.registry.flows.domain.DomainApplicationInfoFlow; +import google.registry.flows.domain.DomainApplicationUpdateFlow; +import google.registry.flows.domain.DomainCheckFlow; +import google.registry.flows.domain.DomainCreateFlow; +import google.registry.flows.domain.DomainDeleteFlow; +import google.registry.flows.domain.DomainInfoFlow; +import google.registry.flows.domain.DomainRenewFlow; +import google.registry.flows.domain.DomainRestoreRequestFlow; +import google.registry.flows.domain.DomainTransferApproveFlow; +import google.registry.flows.domain.DomainTransferCancelFlow; +import google.registry.flows.domain.DomainTransferQueryFlow; +import google.registry.flows.domain.DomainTransferRejectFlow; +import google.registry.flows.domain.DomainTransferRequestFlow; +import google.registry.flows.domain.DomainUpdateFlow; +import google.registry.flows.host.HostCheckFlow; +import google.registry.flows.host.HostCreateFlow; +import google.registry.flows.host.HostDeleteFlow; +import google.registry.flows.host.HostInfoFlow; +import google.registry.flows.host.HostUpdateFlow; +import google.registry.flows.poll.PollAckFlow; +import google.registry.flows.poll.PollRequestFlow; +import google.registry.flows.session.HelloFlow; +import google.registry.flows.session.LoginFlow; +import google.registry.flows.session.LogoutFlow; +import google.registry.model.contact.ContactCommand; +import google.registry.model.domain.DomainCommand; +import google.registry.model.domain.allocate.AllocateCreateExtension; +import google.registry.model.domain.launch.ApplicationIdTargetExtension; +import google.registry.model.domain.launch.LaunchCheckExtension; +import google.registry.model.domain.launch.LaunchCheckExtension.CheckType; +import google.registry.model.domain.launch.LaunchCreateExtension; +import google.registry.model.domain.launch.LaunchPhase; +import google.registry.model.domain.rgp.RestoreCommand.RestoreOp; +import google.registry.model.domain.rgp.RgpUpdateExtension; +import google.registry.model.eppinput.EppInput; +import google.registry.model.eppinput.EppInput.Hello; +import google.registry.model.eppinput.EppInput.InnerCommand; +import google.registry.model.eppinput.EppInput.Login; +import google.registry.model.eppinput.EppInput.Logout; +import google.registry.model.eppinput.EppInput.Poll; +import google.registry.model.eppinput.EppInput.ResourceCommandWrapper; +import google.registry.model.eppinput.EppInput.Transfer; +import google.registry.model.eppinput.EppInput.Transfer.TransferOp; +import google.registry.model.eppinput.ResourceCommand; +import google.registry.model.host.HostCommand; import java.util.Map; import java.util.Set; diff --git a/java/google/registry/flows/FlowRunner.java b/java/google/registry/flows/FlowRunner.java index 6ed276a9a..d3303fbf2 100644 --- a/java/google/registry/flows/FlowRunner.java +++ b/java/google/registry/flows/FlowRunner.java @@ -12,27 +12,28 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import static com.google.common.base.Throwables.getStackTraceAsString; import static com.google.common.base.Throwables.propagateIfInstanceOf; import static com.google.common.io.BaseEncoding.base64; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.xml.XmlTransformer.prettyPrint; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.xml.XmlTransformer.prettyPrint; import com.google.common.base.Strings; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.eppinput.EppInput; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.monitoring.whitebox.EppMetrics; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.NonFinalForTesting; -import com.google.domain.registry.util.SystemClock; -import com.google.domain.registry.util.TypeUtils; import com.googlecode.objectify.Work; +import google.registry.model.eppcommon.Trid; +import google.registry.model.eppinput.EppInput; +import google.registry.model.eppoutput.EppOutput; +import google.registry.monitoring.whitebox.EppMetrics; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; +import google.registry.util.NonFinalForTesting; +import google.registry.util.SystemClock; +import google.registry.util.TypeUtils; + import org.joda.time.DateTime; /** Run a flow, either transactionally or not, with logging and retrying as needed. */ diff --git a/java/google/registry/flows/HttpSessionMetadata.java b/java/google/registry/flows/HttpSessionMetadata.java index caa294e52..fb6da53d2 100644 --- a/java/google/registry/flows/HttpSessionMetadata.java +++ b/java/google/registry/flows/HttpSessionMetadata.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import static com.google.common.base.Preconditions.checkState; diff --git a/java/google/registry/flows/LoggedInFlow.java b/java/google/registry/flows/LoggedInFlow.java index f247f882a..4a4d958ee 100644 --- a/java/google/registry/flows/LoggedInFlow.java +++ b/java/google/registry/flows/LoggedInFlow.java @@ -12,26 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import static com.google.common.base.Verify.verifyNotNull; import static com.google.common.collect.Sets.difference; import static com.google.common.collect.Sets.intersection; -import static com.google.domain.registry.model.registry.Registries.getTlds; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.model.registry.Registries.getTlds; +import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppException.CommandUseErrorException; -import com.google.domain.registry.flows.EppException.SyntaxErrorException; -import com.google.domain.registry.flows.EppException.UnimplementedExtensionException; -import com.google.domain.registry.model.eppcommon.ProtocolDefinition; -import com.google.domain.registry.model.eppcommon.ProtocolDefinition.ServiceExtension; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.flows.EppException.CommandUseErrorException; +import google.registry.flows.EppException.SyntaxErrorException; +import google.registry.flows.EppException.UnimplementedExtensionException; +import google.registry.model.eppcommon.ProtocolDefinition; +import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension; +import google.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.registrar.Registrar; +import google.registry.util.FormattingLogger; import java.util.Set; diff --git a/java/google/registry/flows/OwnedResourceMutateFlow.java b/java/google/registry/flows/OwnedResourceMutateFlow.java index 2f83f9292..9fad064a1 100644 --- a/java/google/registry/flows/OwnedResourceMutateFlow.java +++ b/java/google/registry/flows/OwnedResourceMutateFlow.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.ResourceFlowUtils.verifyResourceOwnership; +import static google.registry.flows.ResourceFlowUtils.verifyResourceOwnership; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.EppResource; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; /** * An EPP flow that mutates a single stored resource that is owned by the current registrar. diff --git a/java/google/registry/flows/OwnedResourceMutatePendingTransferFlow.java b/java/google/registry/flows/OwnedResourceMutatePendingTransferFlow.java index 4ffb074dd..f00e07f1f 100644 --- a/java/google/registry/flows/OwnedResourceMutatePendingTransferFlow.java +++ b/java/google/registry/flows/OwnedResourceMutatePendingTransferFlow.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.ResourceFlowUtils.verifyResourceOwnership; +import static google.registry.flows.ResourceFlowUtils.verifyResourceOwnership; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.Builder; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.EppResource; +import google.registry.model.EppResource.Builder; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; /** * An EPP flow that acts on an owned resource with a pending transfer on it. diff --git a/java/google/registry/flows/ResourceAsyncDeleteFlow.java b/java/google/registry/flows/ResourceAsyncDeleteFlow.java index 3f349d9ca..aaba301fd 100644 --- a/java/google/registry/flows/ResourceAsyncDeleteFlow.java +++ b/java/google/registry/flows/ResourceAsyncDeleteFlow.java @@ -12,22 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.model.eppoutput.Result.Code.SuccessWithActionPending; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; - -import com.google.domain.registry.flows.EppException.AssociationProhibitsOperationException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.Builder; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.eppoutput.Result.Code; -import com.google.domain.registry.model.index.ForeignKeyIndex; +import static google.registry.model.eppoutput.Result.Code.SuccessWithActionPending; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.googlecode.objectify.Work; +import google.registry.flows.EppException.AssociationProhibitsOperationException; +import google.registry.model.EppResource; +import google.registry.model.EppResource.Builder; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.eppoutput.Result.Code; +import google.registry.model.index.ForeignKeyIndex; + /** * An EPP flow that deletes a resource asynchronously (i.e. via mapreduce). * diff --git a/java/google/registry/flows/ResourceCheckFlow.java b/java/google/registry/flows/ResourceCheckFlow.java index 7678300d1..b675f2d99 100644 --- a/java/google/registry/flows/ResourceCheckFlow.java +++ b/java/google/registry/flows/ResourceCheckFlow.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; +import static google.registry.model.eppoutput.Result.Code.Success; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.flows.EppException.ParameterValuePolicyErrorException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceCheck; -import com.google.domain.registry.model.eppoutput.CheckData; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; + +import google.registry.config.RegistryEnvironment; +import google.registry.flows.EppException.ParameterValuePolicyErrorException; +import google.registry.model.EppResource; +import google.registry.model.eppinput.ResourceCommand.ResourceCheck; +import google.registry.model.eppoutput.CheckData; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Response.ResponseExtension; import java.util.List; diff --git a/java/google/registry/flows/ResourceCreateFlow.java b/java/google/registry/flows/ResourceCreateFlow.java index 3d5e565c5..a03393d5d 100644 --- a/java/google/registry/flows/ResourceCreateFlow.java +++ b/java/google/registry/flows/ResourceCreateFlow.java @@ -12,25 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.annotations.VisibleForTesting; -import com.google.domain.registry.flows.EppException.ObjectAlreadyExistsException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.Builder; -import com.google.domain.registry.model.EppResource.ForeignKeyedEppResource; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.index.DomainApplicationIndex; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; import com.googlecode.objectify.Key; +import google.registry.flows.EppException.ObjectAlreadyExistsException; +import google.registry.model.EppResource; +import google.registry.model.EppResource.Builder; +import google.registry.model.EppResource.ForeignKeyedEppResource; +import google.registry.model.domain.DomainApplication; +import google.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.index.DomainApplicationIndex; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.util.TypeUtils.TypeInstantiator; + import javax.annotation.Nullable; /** diff --git a/java/google/registry/flows/ResourceCreateOrMutateFlow.java b/java/google/registry/flows/ResourceCreateOrMutateFlow.java index 620ecac7c..306c538ac 100644 --- a/java/google/registry/flows/ResourceCreateOrMutateFlow.java +++ b/java/google/registry/flows/ResourceCreateOrMutateFlow.java @@ -12,23 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; - -import com.google.domain.registry.flows.EppException.AuthorizationErrorException; -import com.google.domain.registry.flows.SessionMetadata.SessionSource; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.domain.metadata.MetadataExtension; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.googlecode.objectify.Key; +import google.registry.flows.EppException.AuthorizationErrorException; +import google.registry.flows.SessionMetadata.SessionSource; +import google.registry.model.EppResource; +import google.registry.model.domain.Period; +import google.registry.model.domain.metadata.MetadataExtension; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.reporting.HistoryEntry; +import google.registry.util.TypeUtils.TypeInstantiator; + /** * An EPP flow that creates or mutates a single stored resource. * diff --git a/java/google/registry/flows/ResourceDeleteFlow.java b/java/google/registry/flows/ResourceDeleteFlow.java index d27074dc1..5a8e87973 100644 --- a/java/google/registry/flows/ResourceDeleteFlow.java +++ b/java/google/registry/flows/ResourceDeleteFlow.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; +import static google.registry.model.eppoutput.Result.Code.Success; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; -import com.google.domain.registry.model.eppoutput.Result.Code; + +import google.registry.model.EppResource; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.eppoutput.Result.Code; import java.util.Set; diff --git a/java/google/registry/flows/ResourceFlow.java b/java/google/registry/flows/ResourceFlow.java index 3be990f8a..41d506214 100644 --- a/java/google/registry/flows/ResourceFlow.java +++ b/java/google/registry/flows/ResourceFlow.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import com.google.domain.registry.flows.EppException.CommandUseErrorException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppinput.EppInput.ResourceCommandWrapper; -import com.google.domain.registry.model.eppinput.ResourceCommand; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; + +import google.registry.flows.EppException.CommandUseErrorException; +import google.registry.model.EppResource; +import google.registry.model.eppinput.EppInput.ResourceCommandWrapper; +import google.registry.model.eppinput.ResourceCommand; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldState; +import google.registry.util.TypeUtils.TypeInstantiator; /** * An EPP flow that addresses a stored resource. diff --git a/java/google/registry/flows/ResourceFlowUtils.java b/java/google/registry/flows/ResourceFlowUtils.java index 763a963c3..5a47cd771 100644 --- a/java/google/registry/flows/ResourceFlowUtils.java +++ b/java/google/registry/flows/ResourceFlowUtils.java @@ -12,37 +12,38 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.model.domain.DomainResource.extendRegistrationWithCap; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.domain.DomainResource.extendRegistrationWithCap; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import com.google.domain.registry.flows.EppException.AuthorizationErrorException; -import com.google.domain.registry.flows.EppException.InvalidAuthorizationInformationErrorException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.Builder; -import com.google.domain.registry.model.EppResource.ForeignKeyedEppResource; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.eppcommon.AuthInfo; -import com.google.domain.registry.model.eppcommon.AuthInfo.BadAuthInfoException; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.model.poll.PendingActionNotificationResponse; -import com.google.domain.registry.model.poll.PendingActionNotificationResponse.ContactPendingActionNotificationResponse; -import com.google.domain.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferResponse; -import com.google.domain.registry.model.transfer.TransferResponse.ContactTransferResponse; -import com.google.domain.registry.model.transfer.TransferResponse.DomainTransferResponse; -import com.google.domain.registry.model.transfer.TransferStatus; + +import google.registry.flows.EppException.AuthorizationErrorException; +import google.registry.flows.EppException.InvalidAuthorizationInformationErrorException; +import google.registry.model.EppResource; +import google.registry.model.EppResource.Builder; +import google.registry.model.EppResource.ForeignKeyedEppResource; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainResource; +import google.registry.model.eppcommon.AuthInfo; +import google.registry.model.eppcommon.AuthInfo.BadAuthInfoException; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.model.poll.PendingActionNotificationResponse; +import google.registry.model.poll.PendingActionNotificationResponse.ContactPendingActionNotificationResponse; +import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; +import google.registry.model.poll.PollMessage; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferResponse; +import google.registry.model.transfer.TransferResponse.ContactTransferResponse; +import google.registry.model.transfer.TransferResponse.DomainTransferResponse; +import google.registry.model.transfer.TransferStatus; import org.joda.time.DateTime; diff --git a/java/google/registry/flows/ResourceInfoFlow.java b/java/google/registry/flows/ResourceInfoFlow.java index 4c0fd28ff..bad18fd82 100644 --- a/java/google/registry/flows/ResourceInfoFlow.java +++ b/java/google/registry/flows/ResourceInfoFlow.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.model.EppResourceUtils.cloneResourceWithLinkedStatus; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; +import static google.registry.model.EppResourceUtils.cloneResourceWithLinkedStatus; +import static google.registry.model.eppoutput.Result.Code.Success; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Response.ResponseData; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; + +import google.registry.model.EppResource; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Response.ResponseData; +import google.registry.model.eppoutput.Response.ResponseExtension; /** * An EPP flow that reads a storable resource. diff --git a/java/google/registry/flows/ResourceMutateFlow.java b/java/google/registry/flows/ResourceMutateFlow.java index d841753ea..8988ddbdf 100644 --- a/java/google/registry/flows/ResourceMutateFlow.java +++ b/java/google/registry/flows/ResourceMutateFlow.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.ResourceFlowUtils.verifyAuthInfoForResource; +import static google.registry.flows.ResourceFlowUtils.verifyAuthInfoForResource; -import com.google.domain.registry.flows.EppException.ObjectDoesNotExistException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; +import google.registry.flows.EppException.ObjectDoesNotExistException; +import google.registry.model.EppResource; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.util.TypeUtils.TypeInstantiator; /** * An EPP flow that mutates a single stored resource. diff --git a/java/google/registry/flows/ResourceMutatePendingTransferFlow.java b/java/google/registry/flows/ResourceMutatePendingTransferFlow.java index b4af9a19d..4b614cc4c 100644 --- a/java/google/registry/flows/ResourceMutatePendingTransferFlow.java +++ b/java/google/registry/flows/ResourceMutatePendingTransferFlow.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.ResourceFlowUtils.createTransferResponse; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.flows.ResourceFlowUtils.createTransferResponse; +import static google.registry.model.eppoutput.Result.Code.Success; +import static google.registry.model.ofy.ObjectifyService.ofy; -import com.google.domain.registry.flows.EppException.ObjectNotPendingTransferException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.Builder; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferStatus; +import google.registry.flows.EppException.ObjectNotPendingTransferException; +import google.registry.model.EppResource; +import google.registry.model.EppResource.Builder; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferStatus; /** * An EPP flow that acts on a resource with a pending transfer on it. diff --git a/java/google/registry/flows/ResourceQueryFlow.java b/java/google/registry/flows/ResourceQueryFlow.java index 939fd8087..7bd69cc29 100644 --- a/java/google/registry/flows/ResourceQueryFlow.java +++ b/java/google/registry/flows/ResourceQueryFlow.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.ResourceFlowUtils.verifyAuthInfoForResource; +import static google.registry.flows.ResourceFlowUtils.verifyAuthInfoForResource; -import com.google.domain.registry.flows.EppException.ObjectDoesNotExistException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; +import google.registry.flows.EppException.ObjectDoesNotExistException; +import google.registry.model.EppResource; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.util.TypeUtils.TypeInstantiator; /** * An EPP flow that queries a storable resource. diff --git a/java/google/registry/flows/ResourceSyncDeleteFlow.java b/java/google/registry/flows/ResourceSyncDeleteFlow.java index 8982bf681..974a3dcfa 100644 --- a/java/google/registry/flows/ResourceSyncDeleteFlow.java +++ b/java/google/registry/flows/ResourceSyncDeleteFlow.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.ResourceFlowUtils.handlePendingTransferOnDelete; -import static com.google.domain.registry.flows.ResourceFlowUtils.prepareDeletedResourceAsBuilder; -import static com.google.domain.registry.flows.ResourceFlowUtils.updateForeignKeyIndexDeletionTime; +import static google.registry.flows.ResourceFlowUtils.handlePendingTransferOnDelete; +import static google.registry.flows.ResourceFlowUtils.prepareDeletedResourceAsBuilder; +import static google.registry.flows.ResourceFlowUtils.updateForeignKeyIndexDeletionTime; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.Builder; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.index.ForeignKeyIndex; +import google.registry.model.EppResource; +import google.registry.model.EppResource.Builder; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.index.ForeignKeyIndex; /** * An EPP flow that deletes a resource synchronously. diff --git a/java/google/registry/flows/ResourceTransferApproveFlow.java b/java/google/registry/flows/ResourceTransferApproveFlow.java index 26a64f72b..186089704 100644 --- a/java/google/registry/flows/ResourceTransferApproveFlow.java +++ b/java/google/registry/flows/ResourceTransferApproveFlow.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.ResourceFlowUtils.createPendingTransferNotificationResponse; -import static com.google.domain.registry.flows.ResourceFlowUtils.createTransferResponse; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.flows.ResourceFlowUtils.createPendingTransferNotificationResponse; +import static google.registry.flows.ResourceFlowUtils.createTransferResponse; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.Builder; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferStatus; + +import google.registry.model.EppResource; +import google.registry.model.EppResource.Builder; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.poll.PollMessage; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferStatus; /** * An EPP flow that approves a transfer on a resource. diff --git a/java/google/registry/flows/ResourceTransferCancelFlow.java b/java/google/registry/flows/ResourceTransferCancelFlow.java index 1e5f10d14..650187cdc 100644 --- a/java/google/registry/flows/ResourceTransferCancelFlow.java +++ b/java/google/registry/flows/ResourceTransferCancelFlow.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.ResourceFlowUtils.createTransferResponse; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.flows.ResourceFlowUtils.createTransferResponse; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.flows.EppException.AuthorizationErrorException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.Builder; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.transfer.TransferStatus; + +import google.registry.flows.EppException.AuthorizationErrorException; +import google.registry.model.EppResource; +import google.registry.model.EppResource.Builder; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.poll.PollMessage; +import google.registry.model.transfer.TransferStatus; /** * An EPP flow that cancels a transfer on a resource. diff --git a/java/google/registry/flows/ResourceTransferFlow.java b/java/google/registry/flows/ResourceTransferFlow.java index da24f6994..ad879fb65 100644 --- a/java/google/registry/flows/ResourceTransferFlow.java +++ b/java/google/registry/flows/ResourceTransferFlow.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.EppResource; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; /** * An EPP flow that involves a transfer on a resource. diff --git a/java/google/registry/flows/ResourceTransferQueryFlow.java b/java/google/registry/flows/ResourceTransferQueryFlow.java index 4ebb6def8..81c8bff4f 100644 --- a/java/google/registry/flows/ResourceTransferQueryFlow.java +++ b/java/google/registry/flows/ResourceTransferQueryFlow.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.ResourceFlowUtils.createTransferResponse; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; +import static google.registry.flows.ResourceFlowUtils.createTransferResponse; +import static google.registry.model.eppoutput.Result.Code.Success; -import com.google.domain.registry.flows.EppException.AuthorizationErrorException; -import com.google.domain.registry.flows.EppException.CommandUseErrorException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.eppoutput.EppOutput; +import google.registry.flows.EppException.AuthorizationErrorException; +import google.registry.flows.EppException.CommandUseErrorException; +import google.registry.model.EppResource; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.eppoutput.EppOutput; /** * An EPP flow that queries the state of a pending transfer on a resource. diff --git a/java/google/registry/flows/ResourceTransferRejectFlow.java b/java/google/registry/flows/ResourceTransferRejectFlow.java index c52a99ee3..0ec933d31 100644 --- a/java/google/registry/flows/ResourceTransferRejectFlow.java +++ b/java/google/registry/flows/ResourceTransferRejectFlow.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.ResourceFlowUtils.createPendingTransferNotificationResponse; -import static com.google.domain.registry.flows.ResourceFlowUtils.createTransferResponse; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.flows.ResourceFlowUtils.createPendingTransferNotificationResponse; +import static google.registry.flows.ResourceFlowUtils.createTransferResponse; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.Builder; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferStatus; + +import google.registry.model.EppResource; +import google.registry.model.EppResource.Builder; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.poll.PollMessage; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferStatus; /** * An EPP flow that rejects a transfer on a resource. diff --git a/java/google/registry/flows/ResourceTransferRequestFlow.java b/java/google/registry/flows/ResourceTransferRequestFlow.java index 29e345863..bc96d753e 100644 --- a/java/google/registry/flows/ResourceTransferRequestFlow.java +++ b/java/google/registry/flows/ResourceTransferRequestFlow.java @@ -12,33 +12,34 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.flows.ResourceFlowUtils.createPendingTransferNotificationResponse; -import static com.google.domain.registry.flows.ResourceFlowUtils.createTransferResponse; -import static com.google.domain.registry.flows.ResourceFlowUtils.verifyAuthInfoForResource; -import static com.google.domain.registry.model.eppoutput.Result.Code.SuccessWithActionPending; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CollectionUtils.union; +import static google.registry.flows.ResourceFlowUtils.createPendingTransferNotificationResponse; +import static google.registry.flows.ResourceFlowUtils.createTransferResponse; +import static google.registry.flows.ResourceFlowUtils.verifyAuthInfoForResource; +import static google.registry.model.eppoutput.Result.Code.SuccessWithActionPending; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CollectionUtils.union; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppException.AuthorizationErrorException; -import com.google.domain.registry.flows.EppException.CommandUseErrorException; -import com.google.domain.registry.flows.EppException.ObjectPendingTransferException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Response.ResponseData; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; -import com.google.domain.registry.model.transfer.TransferStatus; import com.googlecode.objectify.Key; +import google.registry.flows.EppException.AuthorizationErrorException; +import google.registry.flows.EppException.CommandUseErrorException; +import google.registry.flows.EppException.ObjectPendingTransferException; +import google.registry.model.EppResource; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Response.ResponseData; +import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.poll.PollMessage; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; +import google.registry.model.transfer.TransferStatus; + import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/flows/ResourceUpdateFlow.java b/java/google/registry/flows/ResourceUpdateFlow.java index aef036042..531776b2f 100644 --- a/java/google/registry/flows/ResourceUpdateFlow.java +++ b/java/google/registry/flows/ResourceUpdateFlow.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; +import static google.registry.model.eppoutput.Result.Code.Success; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import com.google.domain.registry.flows.EppException.ParameterValuePolicyErrorException; -import com.google.domain.registry.flows.EppException.ParameterValueRangeErrorException; -import com.google.domain.registry.flows.EppException.StatusProhibitsOperationException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.Builder; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppinput.ResourceCommand.AddRemoveSameValueException; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceUpdate; -import com.google.domain.registry.model.eppoutput.EppOutput; + +import google.registry.flows.EppException.ParameterValuePolicyErrorException; +import google.registry.flows.EppException.ParameterValueRangeErrorException; +import google.registry.flows.EppException.StatusProhibitsOperationException; +import google.registry.model.EppResource; +import google.registry.model.EppResource.Builder; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppinput.ResourceCommand.AddRemoveSameValueException; +import google.registry.model.eppinput.ResourceCommand.ResourceUpdate; +import google.registry.model.eppoutput.EppOutput; import java.util.Set; diff --git a/java/google/registry/flows/SessionMetadata.java b/java/google/registry/flows/SessionMetadata.java index 715808ac2..08ca01981 100644 --- a/java/google/registry/flows/SessionMetadata.java +++ b/java/google/registry/flows/SessionMetadata.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.base.Joiner; import com.google.common.base.Optional; diff --git a/java/google/registry/flows/SingleResourceFlow.java b/java/google/registry/flows/SingleResourceFlow.java index 1e6c49a23..51e108406 100644 --- a/java/google/registry/flows/SingleResourceFlow.java +++ b/java/google/registry/flows/SingleResourceFlow.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.EppResourceUtils.loadByUniqueId; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import com.google.domain.registry.flows.EppException.StatusProhibitsOperationException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.domain.launch.ApplicationIdTargetExtension; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; + +import google.registry.flows.EppException.StatusProhibitsOperationException; +import google.registry.model.EppResource; +import google.registry.model.domain.launch.ApplicationIdTargetExtension; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; import java.util.Set; diff --git a/java/google/registry/flows/StatelessRequestSessionMetadata.java b/java/google/registry/flows/StatelessRequestSessionMetadata.java index b827dc9c3..c3205719e 100644 --- a/java/google/registry/flows/StatelessRequestSessionMetadata.java +++ b/java/google/registry/flows/StatelessRequestSessionMetadata.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import java.util.Set; diff --git a/java/google/registry/flows/TlsCredentials.java b/java/google/registry/flows/TlsCredentials.java index 5c4be4efe..be31889b3 100644 --- a/java/google/registry/flows/TlsCredentials.java +++ b/java/google/registry/flows/TlsCredentials.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Strings.isNullOrEmpty; @@ -21,10 +21,11 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.net.HostAndPort; import com.google.common.net.InetAddresses; -import com.google.domain.registry.flows.EppException.AuthenticationErrorException; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.util.CidrAddressBlock; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.flows.EppException.AuthenticationErrorException; +import google.registry.model.registrar.Registrar; +import google.registry.util.CidrAddressBlock; +import google.registry.util.FormattingLogger; import java.net.InetAddress; diff --git a/java/google/registry/flows/TransactionalFlow.java b/java/google/registry/flows/TransactionalFlow.java index 840732e40..a2ea7f85c 100644 --- a/java/google/registry/flows/TransactionalFlow.java +++ b/java/google/registry/flows/TransactionalFlow.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; /** * Marker interface indicating that a {@link Flow} needs to be run transactionally. diff --git a/java/google/registry/flows/TransportCredentials.java b/java/google/registry/flows/TransportCredentials.java index ac926ce08..6b33b9648 100644 --- a/java/google/registry/flows/TransportCredentials.java +++ b/java/google/registry/flows/TransportCredentials.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows; +package google.registry.flows; -import com.google.domain.registry.flows.EppException.AuthenticationErrorException; -import com.google.domain.registry.model.registrar.Registrar; +import google.registry.flows.EppException.AuthenticationErrorException; +import google.registry.model.registrar.Registrar; /** * A marker interface for objects containing registrar credentials provided via an EPP transport. @@ -31,7 +31,7 @@ public interface TransportCredentials { boolean performsLoginCheck(); /** - * Called by {@link com.google.domain.registry.flows.session.LoginFlow LoginFlow} + * Called by {@link google.registry.flows.session.LoginFlow LoginFlow} * to check the transport credentials against the stored registrar's credentials. * If they do not match, throw an AuthenticationErrorException. */ diff --git a/java/google/registry/flows/async/AsyncFlowUtils.java b/java/google/registry/flows/async/AsyncFlowUtils.java index 2b89abf57..fa744c50d 100644 --- a/java/google/registry/flows/async/AsyncFlowUtils.java +++ b/java/google/registry/flows/async/AsyncFlowUtils.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.async; +package google.registry.flows.async; -import static com.google.domain.registry.request.Actions.getPathForAction; +import static google.registry.request.Actions.getPathForAction; import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.api.taskqueue.QueueFactory; @@ -24,9 +24,10 @@ import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TaskOptions.Method; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.mapreduce.MapreduceAction; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.config.RegistryEnvironment; +import google.registry.mapreduce.MapreduceAction; +import google.registry.util.FormattingLogger; import org.joda.time.Duration; diff --git a/java/google/registry/flows/async/AsyncFlowsModule.java b/java/google/registry/flows/async/AsyncFlowsModule.java index 9ce080527..1ecafc955 100644 --- a/java/google/registry/flows/async/AsyncFlowsModule.java +++ b/java/google/registry/flows/async/AsyncFlowsModule.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.async; +package google.registry.flows.async; -import static com.google.domain.registry.flows.async.DeleteEppResourceAction.PARAM_IS_SUPERUSER; -import static com.google.domain.registry.flows.async.DeleteEppResourceAction.PARAM_REQUESTING_CLIENT_ID; -import static com.google.domain.registry.flows.async.DeleteEppResourceAction.PARAM_RESOURCE_KEY; -import static com.google.domain.registry.flows.async.DnsRefreshForHostRenameAction.PARAM_HOST_KEY; -import static com.google.domain.registry.request.RequestParameters.extractBooleanParameter; -import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter; - -import com.google.domain.registry.request.Parameter; +import static google.registry.flows.async.DeleteEppResourceAction.PARAM_IS_SUPERUSER; +import static google.registry.flows.async.DeleteEppResourceAction.PARAM_REQUESTING_CLIENT_ID; +import static google.registry.flows.async.DeleteEppResourceAction.PARAM_RESOURCE_KEY; +import static google.registry.flows.async.DnsRefreshForHostRenameAction.PARAM_HOST_KEY; +import static google.registry.request.RequestParameters.extractBooleanParameter; +import static google.registry.request.RequestParameters.extractRequiredParameter; import dagger.Module; import dagger.Provides; +import google.registry.request.Parameter; + import javax.servlet.http.HttpServletRequest; /** Dagger module for the async flows package. */ diff --git a/java/google/registry/flows/async/DeleteContactResourceAction.java b/java/google/registry/flows/async/DeleteContactResourceAction.java index c3a82fb64..731320029 100644 --- a/java/google/registry/flows/async/DeleteContactResourceAction.java +++ b/java/google/registry/flows/async/DeleteContactResourceAction.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.async; +package google.registry.flows.async; -import static com.google.domain.registry.flows.ResourceFlowUtils.handlePendingTransferOnDelete; +import static google.registry.flows.ResourceFlowUtils.handlePendingTransferOnDelete; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.reporting.HistoryEntry.Type; -import com.google.domain.registry.request.Action; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.reporting.HistoryEntry.Type; +import google.registry.request.Action; import org.joda.time.DateTime; diff --git a/java/google/registry/flows/async/DeleteEppResourceAction.java b/java/google/registry/flows/async/DeleteEppResourceAction.java index 530455e79..26a1a05c1 100644 --- a/java/google/registry/flows/async/DeleteEppResourceAction.java +++ b/java/google/registry/flows/async/DeleteEppResourceAction.java @@ -12,47 +12,48 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.async; +package google.registry.flows.async; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.flows.ResourceFlowUtils.prepareDeletedResourceAsBuilder; -import static com.google.domain.registry.flows.ResourceFlowUtils.updateForeignKeyIndexDeletionTime; -import static com.google.domain.registry.model.EppResourceUtils.isActive; -import static com.google.domain.registry.model.EppResourceUtils.isDeleted; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.PipelineUtils.createJobPath; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; +import static google.registry.flows.ResourceFlowUtils.prepareDeletedResourceAsBuilder; +import static google.registry.flows.ResourceFlowUtils.updateForeignKeyIndexDeletionTime; +import static google.registry.model.EppResourceUtils.isActive; +import static google.registry.model.EppResourceUtils.isDeleted; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.PipelineUtils.createJobPath; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.appengine.tools.mapreduce.Mapper; import com.google.appengine.tools.mapreduce.Reducer; import com.google.appengine.tools.mapreduce.ReducerInput; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; -import com.google.domain.registry.mapreduce.MapreduceAction; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.mapreduce.inputs.EppResourceInputs; -import com.google.domain.registry.mapreduce.inputs.NullInput; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.annotations.ExternalMessagingName; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.NonFinalForTesting; -import com.google.domain.registry.util.SystemClock; -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; import com.googlecode.objectify.Work; +import google.registry.mapreduce.MapreduceAction; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.mapreduce.inputs.EppResourceInputs; +import google.registry.mapreduce.inputs.NullInput; +import google.registry.model.EppResource; +import google.registry.model.annotations.ExternalMessagingName; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.poll.PollMessage; +import google.registry.model.reporting.HistoryEntry; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.Parameter; +import google.registry.request.Response; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; +import google.registry.util.NonFinalForTesting; +import google.registry.util.SystemClock; +import google.registry.util.TypeUtils.TypeInstantiator; + import org.joda.time.DateTime; import javax.inject.Inject; diff --git a/java/google/registry/flows/async/DeleteHostResourceAction.java b/java/google/registry/flows/async/DeleteHostResourceAction.java index b92d66e88..3100a2eee 100644 --- a/java/google/registry/flows/async/DeleteHostResourceAction.java +++ b/java/google/registry/flows/async/DeleteHostResourceAction.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.async; +package google.registry.flows.async; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; -import com.google.domain.registry.dns.DnsQueue; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.reporting.HistoryEntry.Type; -import com.google.domain.registry.request.Action; +import google.registry.dns.DnsQueue; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.host.HostResource; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.reporting.HistoryEntry.Type; +import google.registry.request.Action; import org.joda.time.DateTime; diff --git a/java/google/registry/flows/async/DnsRefreshForHostRenameAction.java b/java/google/registry/flows/async/DnsRefreshForHostRenameAction.java index a88d7d3d9..b14f62be2 100644 --- a/java/google/registry/flows/async/DnsRefreshForHostRenameAction.java +++ b/java/google/registry/flows/async/DnsRefreshForHostRenameAction.java @@ -12,32 +12,33 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.async; +package google.registry.flows.async; -import static com.google.domain.registry.model.EppResourceUtils.isActive; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.PipelineUtils.createJobPath; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; +import static google.registry.model.EppResourceUtils.isActive; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.PipelineUtils.createJobPath; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.dns.DnsQueue; -import com.google.domain.registry.mapreduce.MapreduceAction; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.mapreduce.inputs.EppResourceInputs; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.NonFinalForTesting; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.dns.DnsQueue; +import google.registry.mapreduce.MapreduceAction; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.mapreduce.inputs.EppResourceInputs; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.host.HostResource; +import google.registry.request.Action; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.Parameter; +import google.registry.request.Response; +import google.registry.util.FormattingLogger; +import google.registry.util.NonFinalForTesting; + import org.joda.time.DateTime; import javax.inject.Inject; diff --git a/java/google/registry/flows/contact/ContactCheckFlow.java b/java/google/registry/flows/contact/ContactCheckFlow.java index d163d729f..6e03e2825 100644 --- a/java/google/registry/flows/contact/ContactCheckFlow.java +++ b/java/google/registry/flows/contact/ContactCheckFlow.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.contact; +package google.registry.flows.contact; -import static com.google.domain.registry.model.EppResourceUtils.checkResourcesExist; +import static google.registry.model.EppResourceUtils.checkResourcesExist; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.flows.ResourceCheckFlow; -import com.google.domain.registry.model.contact.ContactCommand.Check; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.eppoutput.CheckData; -import com.google.domain.registry.model.eppoutput.CheckData.ContactCheck; -import com.google.domain.registry.model.eppoutput.CheckData.ContactCheckData; + +import google.registry.flows.ResourceCheckFlow; +import google.registry.model.contact.ContactCommand.Check; +import google.registry.model.contact.ContactResource; +import google.registry.model.eppoutput.CheckData; +import google.registry.model.eppoutput.CheckData.ContactCheck; +import google.registry.model.eppoutput.CheckData.ContactCheckData; import java.util.Set; /** * An EPP flow that checks whether a contact can be provisioned. * - * @error {@link com.google.domain.registry.flows.ResourceCheckFlow.TooManyResourceChecksException} + * @error {@link google.registry.flows.ResourceCheckFlow.TooManyResourceChecksException} */ public class ContactCheckFlow extends ResourceCheckFlow { @Override diff --git a/java/google/registry/flows/contact/ContactCreateFlow.java b/java/google/registry/flows/contact/ContactCreateFlow.java index 370f10fed..7aaf9eebe 100644 --- a/java/google/registry/flows/contact/ContactCreateFlow.java +++ b/java/google/registry/flows/contact/ContactCreateFlow.java @@ -12,27 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.contact; +package google.registry.flows.contact; -import static com.google.domain.registry.flows.contact.ContactFlowUtils.validateAsciiPostalInfo; -import static com.google.domain.registry.flows.contact.ContactFlowUtils.validateContactAgainstPolicy; -import static com.google.domain.registry.model.EppResourceUtils.createContactHostRoid; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; +import static google.registry.flows.contact.ContactFlowUtils.validateAsciiPostalInfo; +import static google.registry.flows.contact.ContactFlowUtils.validateContactAgainstPolicy; +import static google.registry.model.EppResourceUtils.createContactHostRoid; +import static google.registry.model.eppoutput.Result.Code.Success; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.ResourceCreateFlow; -import com.google.domain.registry.model.contact.ContactCommand.Create; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.ContactResource.Builder; -import com.google.domain.registry.model.eppoutput.CreateData.ContactCreateData; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.ofy.ObjectifyService; -import com.google.domain.registry.model.reporting.HistoryEntry; +import google.registry.flows.EppException; +import google.registry.flows.ResourceCreateFlow; +import google.registry.model.contact.ContactCommand.Create; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.ContactResource.Builder; +import google.registry.model.eppoutput.CreateData.ContactCreateData; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.ofy.ObjectifyService; +import google.registry.model.reporting.HistoryEntry; /** * An EPP flow that creates a new contact resource. * - * @error {@link com.google.domain.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException} + * @error {@link google.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException} * @error {@link ContactFlowUtils.BadInternationalizedPostalInfoException} * @error {@link ContactFlowUtils.DeclineContactDisclosureFieldDisallowedPolicyException} */ diff --git a/java/google/registry/flows/contact/ContactDeleteFlow.java b/java/google/registry/flows/contact/ContactDeleteFlow.java index 3e8784ae6..606e85bfc 100644 --- a/java/google/registry/flows/contact/ContactDeleteFlow.java +++ b/java/google/registry/flows/contact/ContactDeleteFlow.java @@ -12,36 +12,37 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.contact; +package google.registry.flows.contact; -import static com.google.domain.registry.model.EppResourceUtils.queryDomainsUsingResource; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.EppResourceUtils.queryDomainsUsingResource; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.ResourceAsyncDeleteFlow; -import com.google.domain.registry.flows.async.AsyncFlowUtils; -import com.google.domain.registry.flows.async.DeleteContactResourceAction; -import com.google.domain.registry.flows.async.DeleteEppResourceAction; -import com.google.domain.registry.model.contact.ContactCommand.Delete; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.ContactResource.Builder; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.reporting.HistoryEntry; import com.googlecode.objectify.Key; +import google.registry.config.RegistryEnvironment; +import google.registry.flows.EppException; +import google.registry.flows.ResourceAsyncDeleteFlow; +import google.registry.flows.async.AsyncFlowUtils; +import google.registry.flows.async.DeleteContactResourceAction; +import google.registry.flows.async.DeleteEppResourceAction; +import google.registry.model.contact.ContactCommand.Delete; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.ContactResource.Builder; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.reporting.HistoryEntry; + /** * An EPP flow that deletes a contact resource. * - * @error {@link com.google.domain.registry.flows.ResourceAsyncDeleteFlow.ResourceToDeleteIsReferencedException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} + * @error {@link google.registry.flows.ResourceAsyncDeleteFlow.ResourceToDeleteIsReferencedException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} */ public class ContactDeleteFlow extends ResourceAsyncDeleteFlow { diff --git a/java/google/registry/flows/contact/ContactFlowUtils.java b/java/google/registry/flows/contact/ContactFlowUtils.java index 51bc6602b..ecf85e649 100644 --- a/java/google/registry/flows/contact/ContactFlowUtils.java +++ b/java/google/registry/flows/contact/ContactFlowUtils.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.contact; +package google.registry.flows.contact; -import static com.google.domain.registry.model.contact.PostalInfo.Type.INTERNATIONALIZED; +import static google.registry.model.contact.PostalInfo.Type.INTERNATIONALIZED; import com.google.common.base.CharMatcher; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.ParameterValuePolicyErrorException; -import com.google.domain.registry.flows.EppException.ParameterValueSyntaxErrorException; -import com.google.domain.registry.model.contact.ContactAddress; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.PostalInfo; + +import google.registry.flows.EppException; +import google.registry.flows.EppException.ParameterValuePolicyErrorException; +import google.registry.flows.EppException.ParameterValueSyntaxErrorException; +import google.registry.model.contact.ContactAddress; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.PostalInfo; import java.util.Set; diff --git a/java/google/registry/flows/contact/ContactInfoFlow.java b/java/google/registry/flows/contact/ContactInfoFlow.java index 3130d4d6f..94aceb116 100644 --- a/java/google/registry/flows/contact/ContactInfoFlow.java +++ b/java/google/registry/flows/contact/ContactInfoFlow.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.contact; +package google.registry.flows.contact; -import com.google.domain.registry.flows.ResourceInfoFlow; -import com.google.domain.registry.model.contact.ContactCommand.Info; -import com.google.domain.registry.model.contact.ContactResource; +import google.registry.flows.ResourceInfoFlow; +import google.registry.model.contact.ContactCommand.Info; +import google.registry.model.contact.ContactResource; /** * An EPP flow that reads a contact. * - * @error {@link com.google.domain.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException} + * @error {@link google.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException} */ public class ContactInfoFlow extends ResourceInfoFlow {} diff --git a/java/google/registry/flows/contact/ContactTransferApproveFlow.java b/java/google/registry/flows/contact/ContactTransferApproveFlow.java index 659670125..64bca5897 100644 --- a/java/google/registry/flows/contact/ContactTransferApproveFlow.java +++ b/java/google/registry/flows/contact/ContactTransferApproveFlow.java @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.contact; +package google.registry.flows.contact; -import com.google.domain.registry.flows.ResourceTransferApproveFlow; -import com.google.domain.registry.model.contact.ContactCommand.Transfer; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.ContactResource.Builder; -import com.google.domain.registry.model.reporting.HistoryEntry; +import google.registry.flows.ResourceTransferApproveFlow; +import google.registry.model.contact.ContactCommand.Transfer; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.ContactResource.Builder; +import google.registry.model.reporting.HistoryEntry; /** * An EPP flow that approves a pending transfer on a {@link ContactResource}. * - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException} + * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException} */ public class ContactTransferApproveFlow extends ResourceTransferApproveFlow { diff --git a/java/google/registry/flows/contact/ContactTransferCancelFlow.java b/java/google/registry/flows/contact/ContactTransferCancelFlow.java index c071cff1f..766c953ea 100644 --- a/java/google/registry/flows/contact/ContactTransferCancelFlow.java +++ b/java/google/registry/flows/contact/ContactTransferCancelFlow.java @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.contact; +package google.registry.flows.contact; -import com.google.domain.registry.flows.ResourceTransferCancelFlow; -import com.google.domain.registry.model.contact.ContactCommand.Transfer; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.ContactResource.Builder; -import com.google.domain.registry.model.reporting.HistoryEntry; +import google.registry.flows.ResourceTransferCancelFlow; +import google.registry.model.contact.ContactCommand.Transfer; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.ContactResource.Builder; +import google.registry.model.reporting.HistoryEntry; /** * An EPP flow that cancels a pending transfer on a {@link ContactResource}. * - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException} - * @error {@link com.google.domain.registry.flows.ResourceTransferCancelFlow.NotTransferInitiatorException} + * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException} + * @error {@link google.registry.flows.ResourceTransferCancelFlow.NotTransferInitiatorException} */ public class ContactTransferCancelFlow extends ResourceTransferCancelFlow { diff --git a/java/google/registry/flows/contact/ContactTransferQueryFlow.java b/java/google/registry/flows/contact/ContactTransferQueryFlow.java index 57234d336..e48b8b53f 100644 --- a/java/google/registry/flows/contact/ContactTransferQueryFlow.java +++ b/java/google/registry/flows/contact/ContactTransferQueryFlow.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.contact; +package google.registry.flows.contact; -import com.google.domain.registry.flows.ResourceTransferQueryFlow; -import com.google.domain.registry.model.contact.ContactCommand.Transfer; -import com.google.domain.registry.model.contact.ContactResource; +import google.registry.flows.ResourceTransferQueryFlow; +import google.registry.model.contact.ContactCommand.Transfer; +import google.registry.model.contact.ContactResource; /** * An EPP flow that queries a pending transfer on a {@link ContactResource}. * - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} - * @error {@link com.google.domain.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceTransferQueryFlow.NoTransferHistoryToQueryException} - * @error {@link com.google.domain.registry.flows.ResourceTransferQueryFlow.NotAuthorizedToViewTransferException} + * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} + * @error {@link google.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException} + * @error {@link google.registry.flows.ResourceTransferQueryFlow.NoTransferHistoryToQueryException} + * @error {@link google.registry.flows.ResourceTransferQueryFlow.NotAuthorizedToViewTransferException} */ public class ContactTransferQueryFlow extends ResourceTransferQueryFlow { } diff --git a/java/google/registry/flows/contact/ContactTransferRejectFlow.java b/java/google/registry/flows/contact/ContactTransferRejectFlow.java index eb6d5bd33..02fa7be2f 100644 --- a/java/google/registry/flows/contact/ContactTransferRejectFlow.java +++ b/java/google/registry/flows/contact/ContactTransferRejectFlow.java @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.contact; +package google.registry.flows.contact; -import com.google.domain.registry.flows.ResourceTransferRejectFlow; -import com.google.domain.registry.model.contact.ContactCommand.Transfer; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.ContactResource.Builder; -import com.google.domain.registry.model.reporting.HistoryEntry; +import google.registry.flows.ResourceTransferRejectFlow; +import google.registry.model.contact.ContactCommand.Transfer; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.ContactResource.Builder; +import google.registry.model.reporting.HistoryEntry; /** * An EPP flow that rejects a pending transfer on a {@link ContactResource}. * - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException} + * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException} */ public class ContactTransferRejectFlow extends ResourceTransferRejectFlow { diff --git a/java/google/registry/flows/contact/ContactTransferRequestFlow.java b/java/google/registry/flows/contact/ContactTransferRequestFlow.java index 278129e8c..658960fe3 100644 --- a/java/google/registry/flows/contact/ContactTransferRequestFlow.java +++ b/java/google/registry/flows/contact/ContactTransferRequestFlow.java @@ -12,24 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.contact; +package google.registry.flows.contact; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.flows.ResourceTransferRequestFlow; -import com.google.domain.registry.model.contact.ContactCommand.Transfer; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.reporting.HistoryEntry; +import google.registry.config.RegistryEnvironment; +import google.registry.flows.ResourceTransferRequestFlow; +import google.registry.model.contact.ContactCommand.Transfer; +import google.registry.model.contact.ContactResource; +import google.registry.model.reporting.HistoryEntry; import org.joda.time.Duration; /** * An EPP flow that requests a transfer on a {@link ContactResource}. * - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceTransferRequestFlow.AlreadyPendingTransferException} - * @error {@link com.google.domain.registry.flows.ResourceTransferRequestFlow.MissingTransferRequestAuthInfoException} - * @error {@link com.google.domain.registry.flows.ResourceTransferRequestFlow.ObjectAlreadySponsoredException} + * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.ResourceTransferRequestFlow.AlreadyPendingTransferException} + * @error {@link google.registry.flows.ResourceTransferRequestFlow.MissingTransferRequestAuthInfoException} + * @error {@link google.registry.flows.ResourceTransferRequestFlow.ObjectAlreadySponsoredException} */ public class ContactTransferRequestFlow extends ResourceTransferRequestFlow { diff --git a/java/google/registry/flows/contact/ContactUpdateFlow.java b/java/google/registry/flows/contact/ContactUpdateFlow.java index 800af68dd..b867088b0 100644 --- a/java/google/registry/flows/contact/ContactUpdateFlow.java +++ b/java/google/registry/flows/contact/ContactUpdateFlow.java @@ -12,26 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.contact; +package google.registry.flows.contact; -import static com.google.domain.registry.flows.contact.ContactFlowUtils.validateAsciiPostalInfo; -import static com.google.domain.registry.flows.contact.ContactFlowUtils.validateContactAgainstPolicy; +import static google.registry.flows.contact.ContactFlowUtils.validateAsciiPostalInfo; +import static google.registry.flows.contact.ContactFlowUtils.validateContactAgainstPolicy; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.ResourceUpdateFlow; -import com.google.domain.registry.model.contact.ContactCommand.Update; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.ContactResource.Builder; -import com.google.domain.registry.model.reporting.HistoryEntry; +import google.registry.flows.EppException; +import google.registry.flows.ResourceUpdateFlow; +import google.registry.model.contact.ContactCommand.Update; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.ContactResource.Builder; +import google.registry.model.reporting.HistoryEntry; /** * An EPP flow that updates a contact resource. * - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceUpdateFlow.ResourceHasClientUpdateProhibitedException} - * @error {@link com.google.domain.registry.flows.ResourceUpdateFlow.StatusNotClientSettableException} - * @error {@link com.google.domain.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.ResourceUpdateFlow.ResourceHasClientUpdateProhibitedException} + * @error {@link google.registry.flows.ResourceUpdateFlow.StatusNotClientSettableException} + * @error {@link google.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} * @error {@link ContactFlowUtils.BadInternationalizedPostalInfoException} * @error {@link ContactFlowUtils.DeclineContactDisclosureFieldDisallowedPolicyException} */ diff --git a/java/google/registry/flows/domain/BaseDomainCheckFlow.java b/java/google/registry/flows/domain/BaseDomainCheckFlow.java index aa40c5033..ddaab0d10 100644 --- a/java/google/registry/flows/domain/BaseDomainCheckFlow.java +++ b/java/google/registry/flows/domain/BaseDomainCheckFlow.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateDomainName; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateDomainNameWithIdnTables; +import static google.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; +import static google.registry.flows.domain.DomainFlowUtils.validateDomainName; +import static google.registry.flows.domain.DomainFlowUtils.validateDomainNameWithIdnTables; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.ResourceCheckFlow; -import com.google.domain.registry.model.domain.DomainCommand.Check; -import com.google.domain.registry.model.domain.DomainResource; + +import google.registry.flows.EppException; +import google.registry.flows.ResourceCheckFlow; +import google.registry.model.domain.DomainCommand.Check; +import google.registry.model.domain.DomainResource; import java.util.Map; diff --git a/java/google/registry/flows/domain/BaseDomainCreateFlow.java b/java/google/registry/flows/domain/BaseDomainCreateFlow.java index 8d81d99bc..5df93bee7 100644 --- a/java/google/registry/flows/domain/BaseDomainCreateFlow.java +++ b/java/google/registry/flows/domain/BaseDomainCreateFlow.java @@ -12,57 +12,58 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.cloneAndLinkReferences; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateContactsHaveTypes; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateDomainName; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateDomainNameWithIdnTables; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateDsData; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateNameservers; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateNoDuplicateContacts; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateRegistrantAllowedOnTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateRequiredContactsPresent; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyLaunchPhase; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyNotInPendingDelete; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyNotReserved; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyPremiumNameIsNotBlocked; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifySignedMarks; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyUnitIsYears; -import static com.google.domain.registry.model.EppResourceUtils.createDomainRoid; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.Registries.findTldForName; -import static com.google.domain.registry.model.registry.label.ReservedList.matchesAnchorTenantReservation; +import static google.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; +import static google.registry.flows.domain.DomainFlowUtils.cloneAndLinkReferences; +import static google.registry.flows.domain.DomainFlowUtils.validateContactsHaveTypes; +import static google.registry.flows.domain.DomainFlowUtils.validateDomainName; +import static google.registry.flows.domain.DomainFlowUtils.validateDomainNameWithIdnTables; +import static google.registry.flows.domain.DomainFlowUtils.validateDsData; +import static google.registry.flows.domain.DomainFlowUtils.validateNameservers; +import static google.registry.flows.domain.DomainFlowUtils.validateNoDuplicateContacts; +import static google.registry.flows.domain.DomainFlowUtils.validateRegistrantAllowedOnTld; +import static google.registry.flows.domain.DomainFlowUtils.validateRequiredContactsPresent; +import static google.registry.flows.domain.DomainFlowUtils.verifyLaunchPhase; +import static google.registry.flows.domain.DomainFlowUtils.verifyNotInPendingDelete; +import static google.registry.flows.domain.DomainFlowUtils.verifyNotReserved; +import static google.registry.flows.domain.DomainFlowUtils.verifyPremiumNameIsNotBlocked; +import static google.registry.flows.domain.DomainFlowUtils.verifySignedMarks; +import static google.registry.flows.domain.DomainFlowUtils.verifyUnitIsYears; +import static google.registry.model.EppResourceUtils.createDomainRoid; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.Registries.findTldForName; +import static google.registry.model.registry.label.ReservedList.matchesAnchorTenantReservation; import com.google.common.base.Optional; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.ParameterValuePolicyErrorException; -import com.google.domain.registry.flows.EppException.ParameterValueRangeErrorException; -import com.google.domain.registry.flows.EppException.ParameterValueSyntaxErrorException; -import com.google.domain.registry.flows.EppException.StatusProhibitsOperationException; -import com.google.domain.registry.flows.EppException.UnimplementedOptionException; -import com.google.domain.registry.flows.ResourceCreateFlow; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.DomainBase.Builder; -import com.google.domain.registry.model.domain.DomainCommand.Create; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.fee.FeeCreateExtension; -import com.google.domain.registry.model.domain.launch.LaunchCreateExtension; -import com.google.domain.registry.model.domain.launch.LaunchNotice; -import com.google.domain.registry.model.domain.launch.LaunchNotice.InvalidChecksumException; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.domain.secdns.SecDnsCreateExtension; -import com.google.domain.registry.model.ofy.ObjectifyService; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.model.smd.SignedMark; -import com.google.domain.registry.model.tmch.ClaimsListShard; import com.googlecode.objectify.Work; +import google.registry.flows.EppException; +import google.registry.flows.EppException.ParameterValuePolicyErrorException; +import google.registry.flows.EppException.ParameterValueRangeErrorException; +import google.registry.flows.EppException.ParameterValueSyntaxErrorException; +import google.registry.flows.EppException.StatusProhibitsOperationException; +import google.registry.flows.EppException.UnimplementedOptionException; +import google.registry.flows.ResourceCreateFlow; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.DomainBase.Builder; +import google.registry.model.domain.DomainCommand.Create; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.fee.FeeCreateExtension; +import google.registry.model.domain.launch.LaunchCreateExtension; +import google.registry.model.domain.launch.LaunchNotice; +import google.registry.model.domain.launch.LaunchNotice.InvalidChecksumException; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.domain.secdns.SecDnsCreateExtension; +import google.registry.model.ofy.ObjectifyService; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldState; +import google.registry.model.smd.SignedMark; +import google.registry.model.tmch.ClaimsListShard; + import org.joda.money.Money; import javax.annotation.Nullable; diff --git a/java/google/registry/flows/domain/BaseDomainInfoFlow.java b/java/google/registry/flows/domain/BaseDomainInfoFlow.java index 590543054..89906c389 100644 --- a/java/google/registry/flows/domain/BaseDomainInfoFlow.java +++ b/java/google/registry/flows/domain/BaseDomainInfoFlow.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.util.CollectionUtils.forceEmptyToNull; +import static google.registry.util.CollectionUtils.forceEmptyToNull; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.ResourceInfoFlow; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.DomainBase.Builder; -import com.google.domain.registry.model.domain.DomainCommand; -import com.google.domain.registry.model.domain.secdns.SecDnsInfoExtension; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; + +import google.registry.flows.EppException; +import google.registry.flows.ResourceInfoFlow; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.DomainBase.Builder; +import google.registry.model.domain.DomainCommand; +import google.registry.model.domain.secdns.SecDnsInfoExtension; +import google.registry.model.eppoutput.Response.ResponseExtension; /** * An EPP flow that reads a domain resource or application. diff --git a/java/google/registry/flows/domain/BaseDomainUpdateFlow.java b/java/google/registry/flows/domain/BaseDomainUpdateFlow.java index b94d3cab6..9af81be68 100644 --- a/java/google/registry/flows/domain/BaseDomainUpdateFlow.java +++ b/java/google/registry/flows/domain/BaseDomainUpdateFlow.java @@ -12,33 +12,34 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; import static com.google.common.collect.Sets.difference; import static com.google.common.collect.Sets.union; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.cloneAndLinkReferences; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateContactsHaveTypes; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateDsData; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateNameservers; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateNoDuplicateContacts; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateRegistrantAllowedOnTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateRequiredContactsPresent; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyNotInPendingDelete; +import static google.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; +import static google.registry.flows.domain.DomainFlowUtils.cloneAndLinkReferences; +import static google.registry.flows.domain.DomainFlowUtils.validateContactsHaveTypes; +import static google.registry.flows.domain.DomainFlowUtils.validateDsData; +import static google.registry.flows.domain.DomainFlowUtils.validateNameservers; +import static google.registry.flows.domain.DomainFlowUtils.validateNoDuplicateContacts; +import static google.registry.flows.domain.DomainFlowUtils.validateRegistrantAllowedOnTld; +import static google.registry.flows.domain.DomainFlowUtils.validateRequiredContactsPresent; +import static google.registry.flows.domain.DomainFlowUtils.verifyNotInPendingDelete; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.ParameterValuePolicyErrorException; -import com.google.domain.registry.flows.EppException.RequiredParameterMissingException; -import com.google.domain.registry.flows.EppException.UnimplementedOptionException; -import com.google.domain.registry.flows.ResourceUpdateFlow; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.DomainBase.Builder; -import com.google.domain.registry.model.domain.DomainCommand.Update; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.domain.secdns.SecDnsUpdateExtension; -import com.google.domain.registry.model.domain.secdns.SecDnsUpdateExtension.Add; -import com.google.domain.registry.model.domain.secdns.SecDnsUpdateExtension.Remove; + +import google.registry.flows.EppException; +import google.registry.flows.EppException.ParameterValuePolicyErrorException; +import google.registry.flows.EppException.RequiredParameterMissingException; +import google.registry.flows.EppException.UnimplementedOptionException; +import google.registry.flows.ResourceUpdateFlow; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.DomainBase.Builder; +import google.registry.model.domain.DomainCommand.Update; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.domain.secdns.SecDnsUpdateExtension; +import google.registry.model.domain.secdns.SecDnsUpdateExtension.Add; +import google.registry.model.domain.secdns.SecDnsUpdateExtension.Remove; import java.util.Set; diff --git a/java/google/registry/flows/domain/ClaimsCheckFlow.java b/java/google/registry/flows/domain/ClaimsCheckFlow.java index af2cf2807..a1a72fb79 100644 --- a/java/google/registry/flows/domain/ClaimsCheckFlow.java +++ b/java/google/registry/flows/domain/ClaimsCheckFlow.java @@ -12,34 +12,35 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.model.domain.launch.LaunchPhase.CLAIMS; -import static com.google.domain.registry.util.DateTimeUtils.isAtOrAfter; +import static google.registry.model.domain.launch.LaunchPhase.CLAIMS; +import static google.registry.util.DateTimeUtils.isAtOrAfter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.model.domain.launch.LaunchCheckExtension; -import com.google.domain.registry.model.domain.launch.LaunchCheckResponseExtension; -import com.google.domain.registry.model.domain.launch.LaunchCheckResponseExtension.LaunchCheck; -import com.google.domain.registry.model.domain.launch.LaunchCheckResponseExtension.LaunchCheckName; -import com.google.domain.registry.model.eppoutput.CheckData; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.model.tmch.ClaimsListShard; + +import google.registry.flows.EppException; +import google.registry.model.domain.launch.LaunchCheckExtension; +import google.registry.model.domain.launch.LaunchCheckResponseExtension; +import google.registry.model.domain.launch.LaunchCheckResponseExtension.LaunchCheck; +import google.registry.model.domain.launch.LaunchCheckResponseExtension.LaunchCheckName; +import google.registry.model.eppoutput.CheckData; +import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldState; +import google.registry.model.tmch.ClaimsListShard; import java.util.Map.Entry; /** * An EPP flow that checks whether strings are trademarked. * - * @error {@link com.google.domain.registry.flows.ResourceCheckFlow.TooManyResourceChecksException} - * @error {@link com.google.domain.registry.flows.ResourceFlow.BadCommandForRegistryPhaseException} - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceCheckFlow.TooManyResourceChecksException} + * @error {@link google.registry.flows.ResourceFlow.BadCommandForRegistryPhaseException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} * @error {@link DomainFlowUtils.TldDoesNotExistException} */ public class ClaimsCheckFlow extends BaseDomainCheckFlow { diff --git a/java/google/registry/flows/domain/DomainAllocateFlow.java b/java/google/registry/flows/domain/DomainAllocateFlow.java index d0e7703a0..d08ad0033 100644 --- a/java/google/registry/flows/domain/DomainAllocateFlow.java +++ b/java/google/registry/flows/domain/DomainAllocateFlow.java @@ -12,47 +12,48 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.getReservationType; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CollectionUtils.isNullOrEmpty; +import static google.registry.flows.domain.DomainFlowUtils.getReservationType; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CollectionUtils.isNullOrEmpty; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.AuthorizationErrorException; -import com.google.domain.registry.flows.EppException.ObjectDoesNotExistException; -import com.google.domain.registry.flows.EppException.RequiredParameterMissingException; -import com.google.domain.registry.flows.EppException.StatusProhibitsOperationException; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Flag; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainResource.Builder; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.allocate.AllocateCreateExtension; -import com.google.domain.registry.model.domain.launch.ApplicationStatus; -import com.google.domain.registry.model.domain.launch.LaunchInfoResponseExtension; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.label.ReservationType; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.tmch.LordnTask; import com.googlecode.objectify.Ref; +import google.registry.flows.EppException; +import google.registry.flows.EppException.AuthorizationErrorException; +import google.registry.flows.EppException.ObjectDoesNotExistException; +import google.registry.flows.EppException.RequiredParameterMissingException; +import google.registry.flows.EppException.StatusProhibitsOperationException; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Flag; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainResource.Builder; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.allocate.AllocateCreateExtension; +import google.registry.model.domain.launch.ApplicationStatus; +import google.registry.model.domain.launch.LaunchInfoResponseExtension; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; +import google.registry.model.poll.PollMessage; +import google.registry.model.registry.Registry; +import google.registry.model.registry.label.ReservationType; +import google.registry.model.reporting.HistoryEntry; +import google.registry.tmch.LordnTask; + /** * An EPP flow that allocates a new domain resource from a domain application. * - * @error {@link com.google.domain.registry.flows.EppException.UnimplementedExtensionException} - * @error {@link com.google.domain.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException} - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.EppException.UnimplementedExtensionException} + * @error {@link google.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} * @error {@link DomainAllocateFlow.HasFinalStatusException} * @error {@link DomainAllocateFlow.MissingAllocateCreateExtensionException} * @error {@link DomainAllocateFlow.MissingApplicationException} diff --git a/java/google/registry/flows/domain/DomainApplicationCreateFlow.java b/java/google/registry/flows/domain/DomainApplicationCreateFlow.java index 8f96d1657..7f6d22d8e 100644 --- a/java/google/registry/flows/domain/DomainApplicationCreateFlow.java +++ b/java/google/registry/flows/domain/DomainApplicationCreateFlow.java @@ -12,51 +12,52 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.DISALLOWED_TLD_STATES_FOR_LAUNCH_FLOWS; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateFeeChallenge; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; -import static com.google.domain.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName; -import static com.google.domain.registry.model.index.ForeignKeyIndex.loadAndGetReference; +import static google.registry.flows.domain.DomainFlowUtils.DISALLOWED_TLD_STATES_FOR_LAUNCH_FLOWS; +import static google.registry.flows.domain.DomainFlowUtils.validateFeeChallenge; +import static google.registry.model.eppoutput.Result.Code.Success; +import static google.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName; +import static google.registry.model.index.ForeignKeyIndex.loadAndGetReference; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.CommandUseErrorException; -import com.google.domain.registry.flows.EppException.ObjectAlreadyExistsException; -import com.google.domain.registry.flows.EppException.RequiredParameterMissingException; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainApplication.Builder; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.domain.fee.Fee; -import com.google.domain.registry.model.domain.fee.FeeCreateExtension; -import com.google.domain.registry.model.domain.fee.FeeCreateResponseExtension; -import com.google.domain.registry.model.domain.launch.ApplicationStatus; -import com.google.domain.registry.model.domain.launch.LaunchCreateExtension; -import com.google.domain.registry.model.domain.launch.LaunchCreateResponseExtension; -import com.google.domain.registry.model.domain.launch.LaunchPhase; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppoutput.CreateData.DomainCreateData; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.smd.AbstractSignedMark; -import com.google.domain.registry.model.smd.EncodedSignedMark; + +import google.registry.flows.EppException; +import google.registry.flows.EppException.CommandUseErrorException; +import google.registry.flows.EppException.ObjectAlreadyExistsException; +import google.registry.flows.EppException.RequiredParameterMissingException; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainApplication.Builder; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.Period; +import google.registry.model.domain.fee.Fee; +import google.registry.model.domain.fee.FeeCreateExtension; +import google.registry.model.domain.fee.FeeCreateResponseExtension; +import google.registry.model.domain.launch.ApplicationStatus; +import google.registry.model.domain.launch.LaunchCreateExtension; +import google.registry.model.domain.launch.LaunchCreateResponseExtension; +import google.registry.model.domain.launch.LaunchPhase; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppoutput.CreateData.DomainCreateData; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.registry.Registry.TldState; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.smd.AbstractSignedMark; +import google.registry.model.smd.EncodedSignedMark; import java.util.List; /** * An EPP flow that creates a new application for a domain resource. * - * @error {@link com.google.domain.registry.flows.EppException.UnimplementedExtensionException} - * @error {@link com.google.domain.registry.flows.ResourceFlow.BadCommandForRegistryPhaseException} - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} - * @error {@link com.google.domain.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException} + * @error {@link google.registry.flows.EppException.UnimplementedExtensionException} + * @error {@link google.registry.flows.ResourceFlow.BadCommandForRegistryPhaseException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException} * @error {@link BaseDomainCreateFlow.AcceptedTooLongAgoException} * @error {@link BaseDomainCreateFlow.ClaimsPeriodEndedException} * @error {@link BaseDomainCreateFlow.ExpiredClaimException} diff --git a/java/google/registry/flows/domain/DomainApplicationDeleteFlow.java b/java/google/registry/flows/domain/DomainApplicationDeleteFlow.java index 95cbb30e2..2ef78db3c 100644 --- a/java/google/registry/flows/domain/DomainApplicationDeleteFlow.java +++ b/java/google/registry/flows/domain/DomainApplicationDeleteFlow.java @@ -12,37 +12,38 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.DISALLOWED_TLD_STATES_FOR_LAUNCH_FLOWS; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyLaunchApplicationIdMatchesDomain; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyLaunchPhase; +import static google.registry.flows.domain.DomainFlowUtils.DISALLOWED_TLD_STATES_FOR_LAUNCH_FLOWS; +import static google.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; +import static google.registry.flows.domain.DomainFlowUtils.verifyLaunchApplicationIdMatchesDomain; +import static google.registry.flows.domain.DomainFlowUtils.verifyLaunchPhase; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.StatusProhibitsOperationException; -import com.google.domain.registry.flows.ResourceSyncDeleteFlow; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainApplication.Builder; -import com.google.domain.registry.model.domain.DomainCommand.Delete; -import com.google.domain.registry.model.domain.launch.LaunchDeleteExtension; -import com.google.domain.registry.model.domain.launch.LaunchPhase; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.model.reporting.HistoryEntry; + +import google.registry.flows.EppException; +import google.registry.flows.EppException.StatusProhibitsOperationException; +import google.registry.flows.ResourceSyncDeleteFlow; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainApplication.Builder; +import google.registry.model.domain.DomainCommand.Delete; +import google.registry.model.domain.launch.LaunchDeleteExtension; +import google.registry.model.domain.launch.LaunchPhase; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldState; +import google.registry.model.reporting.HistoryEntry; import java.util.Set; /** * An EPP flow that deletes a domain application. * - * @error {@link com.google.domain.registry.flows.EppException.UnimplementedExtensionException} - * @error {@link com.google.domain.registry.flows.ResourceFlow.BadCommandForRegistryPhaseException} - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.EppException.UnimplementedExtensionException} + * @error {@link google.registry.flows.ResourceFlow.BadCommandForRegistryPhaseException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} * @error {@link DomainApplicationDeleteFlow.SunriseApplicationCannotBeDeletedInLandrushException} * @error {@link DomainFlowUtils.ApplicationDomainNameMismatchException} * @error {@link DomainFlowUtils.LaunchPhaseMismatchException} diff --git a/java/google/registry/flows/domain/DomainApplicationInfoFlow.java b/java/google/registry/flows/domain/DomainApplicationInfoFlow.java index f24581073..63a7fe9e6 100644 --- a/java/google/registry/flows/domain/DomainApplicationInfoFlow.java +++ b/java/google/registry/flows/domain/DomainApplicationInfoFlow.java @@ -12,30 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.flows.EppXmlTransformer.unmarshal; -import static com.google.domain.registry.flows.ResourceFlowUtils.verifyResourceOwnership; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyLaunchApplicationIdMatchesDomain; +import static google.registry.flows.EppXmlTransformer.unmarshal; +import static google.registry.flows.ResourceFlowUtils.verifyResourceOwnership; +import static google.registry.flows.domain.DomainFlowUtils.verifyLaunchApplicationIdMatchesDomain; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.ParameterValuePolicyErrorException; -import com.google.domain.registry.flows.EppException.RequiredParameterMissingException; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainApplication.Builder; -import com.google.domain.registry.model.domain.launch.LaunchInfoExtension; -import com.google.domain.registry.model.domain.launch.LaunchInfoResponseExtension; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; -import com.google.domain.registry.model.mark.Mark; -import com.google.domain.registry.model.smd.EncodedSignedMark; -import com.google.domain.registry.model.smd.SignedMark; + +import google.registry.flows.EppException; +import google.registry.flows.EppException.ParameterValuePolicyErrorException; +import google.registry.flows.EppException.RequiredParameterMissingException; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainApplication.Builder; +import google.registry.model.domain.launch.LaunchInfoExtension; +import google.registry.model.domain.launch.LaunchInfoResponseExtension; +import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.mark.Mark; +import google.registry.model.smd.EncodedSignedMark; +import google.registry.model.smd.SignedMark; /** * An EPP flow that reads a domain application. * - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException} * @error {@link DomainFlowUtils.ApplicationDomainNameMismatchException} * @error {@link DomainApplicationInfoFlow.ApplicationLaunchPhaseMismatchException} * @error {@link DomainApplicationInfoFlow.MissingApplicationIdException} diff --git a/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java b/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java index 64da578ed..54f16780a 100644 --- a/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java +++ b/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java @@ -12,34 +12,35 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; import static com.google.common.base.CaseFormat.LOWER_CAMEL; import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.DISALLOWED_TLD_STATES_FOR_LAUNCH_FLOWS; +import static google.registry.flows.domain.DomainFlowUtils.DISALLOWED_TLD_STATES_FOR_LAUNCH_FLOWS; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.StatusProhibitsOperationException; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainApplication.Builder; -import com.google.domain.registry.model.domain.launch.ApplicationStatus; -import com.google.domain.registry.model.domain.launch.LaunchUpdateExtension; -import com.google.domain.registry.model.domain.secdns.SecDnsUpdateExtension; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.model.reporting.HistoryEntry; + +import google.registry.flows.EppException; +import google.registry.flows.EppException.StatusProhibitsOperationException; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainApplication.Builder; +import google.registry.model.domain.launch.ApplicationStatus; +import google.registry.model.domain.launch.LaunchUpdateExtension; +import google.registry.model.domain.secdns.SecDnsUpdateExtension; +import google.registry.model.registry.Registry.TldState; +import google.registry.model.reporting.HistoryEntry; /** * An EPP flow that updates a domain resource. * - * @error {@link com.google.domain.registry.flows.EppException.UnimplementedExtensionException} - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceUpdateFlow.AddRemoveSameValueEppException} - * @error {@link com.google.domain.registry.flows.ResourceUpdateFlow.ResourceHasClientUpdateProhibitedException} - * @error {@link com.google.domain.registry.flows.ResourceUpdateFlow.StatusNotClientSettableException} - * @error {@link com.google.domain.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} + * @error {@link google.registry.flows.EppException.UnimplementedExtensionException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.ResourceUpdateFlow.AddRemoveSameValueEppException} + * @error {@link google.registry.flows.ResourceUpdateFlow.ResourceHasClientUpdateProhibitedException} + * @error {@link google.registry.flows.ResourceUpdateFlow.StatusNotClientSettableException} + * @error {@link google.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} * @error {@link BaseDomainUpdateFlow.EmptySecDnsUpdateException} * @error {@link BaseDomainUpdateFlow.MaxSigLifeChangeNotSupportedException} * @error {@link BaseDomainUpdateFlow.SecDnsAllUsageException} diff --git a/java/google/registry/flows/domain/DomainCheckFlow.java b/java/google/registry/flows/domain/DomainCheckFlow.java index e00349456..b7b32898f 100644 --- a/java/google/registry/flows/domain/DomainCheckFlow.java +++ b/java/google/registry/flows/domain/DomainCheckFlow.java @@ -12,38 +12,39 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.getReservationType; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.handleFeeRequest; -import static com.google.domain.registry.model.EppResourceUtils.checkResourcesExist; -import static com.google.domain.registry.model.registry.label.ReservationType.UNRESERVED; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; -import static com.google.domain.registry.util.DomainNameUtils.getTldFromDomainName; +import static google.registry.flows.domain.DomainFlowUtils.getReservationType; +import static google.registry.flows.domain.DomainFlowUtils.handleFeeRequest; +import static google.registry.model.EppResourceUtils.checkResourcesExist; +import static google.registry.model.registry.label.ReservationType.UNRESERVED; +import static google.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.DomainNameUtils.getTldFromDomainName; import com.google.common.collect.ImmutableList; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.ParameterValuePolicyErrorException; -import com.google.domain.registry.model.domain.fee.FeeCheckExtension; -import com.google.domain.registry.model.domain.fee.FeeCheckResponseExtension; -import com.google.domain.registry.model.domain.fee.FeeCheckResponseExtension.FeeCheck; -import com.google.domain.registry.model.domain.launch.LaunchCheckExtension; -import com.google.domain.registry.model.eppcommon.ProtocolDefinition.ServiceExtension; -import com.google.domain.registry.model.eppoutput.CheckData; -import com.google.domain.registry.model.eppoutput.CheckData.DomainCheck; -import com.google.domain.registry.model.eppoutput.CheckData.DomainCheckData; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.label.ReservationType; + +import google.registry.flows.EppException; +import google.registry.flows.EppException.ParameterValuePolicyErrorException; +import google.registry.model.domain.fee.FeeCheckExtension; +import google.registry.model.domain.fee.FeeCheckResponseExtension; +import google.registry.model.domain.fee.FeeCheckResponseExtension.FeeCheck; +import google.registry.model.domain.launch.LaunchCheckExtension; +import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension; +import google.registry.model.eppoutput.CheckData; +import google.registry.model.eppoutput.CheckData.DomainCheck; +import google.registry.model.eppoutput.CheckData.DomainCheckData; +import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.registry.Registry; +import google.registry.model.registry.label.ReservationType; import java.util.Set; /** * An EPP flow that checks whether a domain can be provisioned. * - * @error {@link com.google.domain.registry.flows.ResourceCheckFlow.TooManyResourceChecksException} - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceCheckFlow.TooManyResourceChecksException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} * @error {@link DomainFlowUtils.BadDomainNameCharacterException} * @error {@link DomainFlowUtils.BadDomainNamePartsCountException} * @error {@link DomainFlowUtils.BadPeriodUnitException} diff --git a/java/google/registry/flows/domain/DomainCreateFlow.java b/java/google/registry/flows/domain/DomainCreateFlow.java index fe3b3c6ef..b59dd6b6f 100644 --- a/java/google/registry/flows/domain/DomainCreateFlow.java +++ b/java/google/registry/flows/domain/DomainCreateFlow.java @@ -12,42 +12,43 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateFeeChallenge; -import static com.google.domain.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.flows.domain.DomainFlowUtils.validateFeeChallenge; +import static google.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.CommandUseErrorException; -import com.google.domain.registry.flows.EppException.StatusProhibitsOperationException; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainResource.Builder; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.fee.FeeCreateExtension; -import com.google.domain.registry.model.domain.launch.LaunchCreateExtension; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.tmch.LordnTask; + +import google.registry.flows.EppException; +import google.registry.flows.EppException.CommandUseErrorException; +import google.registry.flows.EppException.StatusProhibitsOperationException; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainResource.Builder; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.fee.FeeCreateExtension; +import google.registry.model.domain.launch.LaunchCreateExtension; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldState; +import google.registry.model.reporting.HistoryEntry; +import google.registry.tmch.LordnTask; import java.util.Set; /** * An EPP flow that creates a new domain resource. * - * @error {@link com.google.domain.registry.flows.EppException.UnimplementedExtensionException} - * @error {@link com.google.domain.registry.flows.LoggedInFlow.UndeclaredServiceExtensionException} - * @error {@link com.google.domain.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException} - * @error {@link com.google.domain.registry.flows.ResourceCreateOrMutateFlow.OnlyToolCanPassMetadataException} - * @error {@link com.google.domain.registry.flows.ResourceFlow.BadCommandForRegistryPhaseException} - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.EppException.UnimplementedExtensionException} + * @error {@link google.registry.flows.LoggedInFlow.UndeclaredServiceExtensionException} + * @error {@link google.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException} + * @error {@link google.registry.flows.ResourceCreateOrMutateFlow.OnlyToolCanPassMetadataException} + * @error {@link google.registry.flows.ResourceFlow.BadCommandForRegistryPhaseException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} * @error {@link BaseDomainCreateFlow.AcceptedTooLongAgoException} * @error {@link BaseDomainCreateFlow.ClaimsPeriodEndedException} * @error {@link BaseDomainCreateFlow.ExpiredClaimException} diff --git a/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java b/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java index 9497f54da..9f04f0d13 100644 --- a/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java +++ b/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java @@ -12,32 +12,33 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.leapSafeAddYears; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.leapSafeAddYears; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.dns.DnsQueue; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Flag; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.DomainResource.Builder; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.domain.fee.Fee; -import com.google.domain.registry.model.domain.fee.FeeCreateResponseExtension; -import com.google.domain.registry.model.domain.metadata.MetadataExtension; -import com.google.domain.registry.model.eppoutput.CreateData.DomainCreateData; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Result; -import com.google.domain.registry.model.poll.PollMessage; import com.googlecode.objectify.Ref; +import google.registry.dns.DnsQueue; +import google.registry.flows.EppException; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Flag; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.DomainResource.Builder; +import google.registry.model.domain.Period; +import google.registry.model.domain.fee.Fee; +import google.registry.model.domain.fee.FeeCreateResponseExtension; +import google.registry.model.domain.metadata.MetadataExtension; +import google.registry.model.eppoutput.CreateData.DomainCreateData; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Result; +import google.registry.model.poll.PollMessage; + import org.joda.time.DateTime; /** An EPP flow that creates or allocates a new domain resource. */ diff --git a/java/google/registry/flows/domain/DomainDeleteFlow.java b/java/google/registry/flows/domain/DomainDeleteFlow.java index 242532580..3f45b5f7d 100644 --- a/java/google/registry/flows/domain/DomainDeleteFlow.java +++ b/java/google/registry/flows/domain/DomainDeleteFlow.java @@ -12,44 +12,45 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurrenceEndTime; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; -import static com.google.domain.registry.model.eppoutput.Result.Code.SuccessWithActionPending; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; +import static google.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurrenceEndTime; +import static google.registry.model.eppoutput.Result.Code.Success; +import static google.registry.model.eppoutput.Result.Code.SuccessWithActionPending; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.dns.DnsQueue; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.AssociationProhibitsOperationException; -import com.google.domain.registry.flows.ResourceSyncDeleteFlow; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.common.TimeOfYear; -import com.google.domain.registry.model.domain.DomainCommand.Delete; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.DomainResource.Builder; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.fee.Credit; -import com.google.domain.registry.model.domain.fee.FeeDeleteResponseExtension; -import com.google.domain.registry.model.domain.metadata.MetadataExtension; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.domain.secdns.SecDnsUpdateExtension; -import com.google.domain.registry.model.eppcommon.ProtocolDefinition.ServiceExtension; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; -import com.google.domain.registry.model.eppoutput.Result.Code; -import com.google.domain.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.reporting.HistoryEntry; import com.googlecode.objectify.Key; +import google.registry.dns.DnsQueue; +import google.registry.flows.EppException; +import google.registry.flows.EppException.AssociationProhibitsOperationException; +import google.registry.flows.ResourceSyncDeleteFlow; +import google.registry.model.billing.BillingEvent; +import google.registry.model.common.TimeOfYear; +import google.registry.model.domain.DomainCommand.Delete; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.DomainResource.Builder; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.fee.Credit; +import google.registry.model.domain.fee.FeeDeleteResponseExtension; +import google.registry.model.domain.metadata.MetadataExtension; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.domain.secdns.SecDnsUpdateExtension; +import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.eppoutput.Result.Code; +import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; +import google.registry.model.poll.PollMessage; +import google.registry.model.registry.Registry; +import google.registry.model.reporting.HistoryEntry; + import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; @@ -57,11 +58,11 @@ import org.joda.time.DateTime; /** * An EPP flow that deletes a domain resource. * - * @error {@link com.google.domain.registry.flows.ResourceCreateOrMutateFlow.OnlyToolCanPassMetadataException} - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} + * @error {@link google.registry.flows.ResourceCreateOrMutateFlow.OnlyToolCanPassMetadataException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} * @error {@link DomainDeleteFlow.DomainToDeleteHasHostsException} */ public class DomainDeleteFlow extends ResourceSyncDeleteFlow { diff --git a/java/google/registry/flows/domain/DomainFlowUtils.java b/java/google/registry/flows/domain/DomainFlowUtils.java index 66de9dd3d..413c0d6ec 100644 --- a/java/google/registry/flows/domain/DomainFlowUtils.java +++ b/java/google/registry/flows/domain/DomainFlowUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; @@ -20,14 +20,14 @@ import static com.google.common.base.Predicates.equalTo; import static com.google.common.base.Strings.emptyToNull; import static com.google.common.collect.Iterables.any; import static com.google.common.collect.Iterables.concat; -import static com.google.domain.registry.flows.EppXmlTransformer.unmarshal; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.Registries.findTldForName; -import static com.google.domain.registry.model.registry.label.ReservedList.getReservation; -import static com.google.domain.registry.tldconfig.idn.IdnLabelValidator.findValidIdnTableForTld; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; -import static com.google.domain.registry.util.DateTimeUtils.isAtOrAfter; -import static com.google.domain.registry.util.DomainNameUtils.ACE_PREFIX; +import static google.registry.flows.EppXmlTransformer.unmarshal; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.Registries.findTldForName; +import static google.registry.model.registry.label.ReservedList.getReservation; +import static google.registry.tldconfig.idn.IdnLabelValidator.findValidIdnTableForTld; +import static google.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.DateTimeUtils.isAtOrAfter; +import static google.registry.util.DomainNameUtils.ACE_PREFIX; import com.google.common.base.CharMatcher; import com.google.common.base.Joiner; @@ -38,58 +38,59 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.AuthorizationErrorException; -import com.google.domain.registry.flows.EppException.ObjectDoesNotExistException; -import com.google.domain.registry.flows.EppException.ParameterValuePolicyErrorException; -import com.google.domain.registry.flows.EppException.ParameterValueRangeErrorException; -import com.google.domain.registry.flows.EppException.ParameterValueSyntaxErrorException; -import com.google.domain.registry.flows.EppException.RequiredParameterMissingException; -import com.google.domain.registry.flows.EppException.StatusProhibitsOperationException; -import com.google.domain.registry.flows.EppException.UnimplementedOptionException; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Flag; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.DesignatedContact.Type; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.DomainCommand.CreateOrUpdate; -import com.google.domain.registry.model.domain.DomainCommand.InvalidReferenceException; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.domain.fee.BaseFeeCommand; -import com.google.domain.registry.model.domain.fee.BaseFeeRequest; -import com.google.domain.registry.model.domain.fee.BaseFeeResponse; -import com.google.domain.registry.model.domain.fee.Fee; -import com.google.domain.registry.model.domain.fee.FeeCommandDescriptor; -import com.google.domain.registry.model.domain.launch.LaunchExtension; -import com.google.domain.registry.model.domain.launch.LaunchPhase; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.mark.Mark; -import com.google.domain.registry.model.mark.ProtectedMark; -import com.google.domain.registry.model.mark.Trademark; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.model.registry.label.ReservationType; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.smd.AbstractSignedMark; -import com.google.domain.registry.model.smd.EncodedSignedMark; -import com.google.domain.registry.model.smd.SignedMark; -import com.google.domain.registry.model.smd.SignedMarkRevocationList; -import com.google.domain.registry.tmch.TmchXmlSignature; -import com.google.domain.registry.tmch.TmchXmlSignature.CertificateSignatureException; -import com.google.domain.registry.util.Idn; import com.googlecode.objectify.Key; +import google.registry.flows.EppException; +import google.registry.flows.EppException.AuthorizationErrorException; +import google.registry.flows.EppException.ObjectDoesNotExistException; +import google.registry.flows.EppException.ParameterValuePolicyErrorException; +import google.registry.flows.EppException.ParameterValueRangeErrorException; +import google.registry.flows.EppException.ParameterValueSyntaxErrorException; +import google.registry.flows.EppException.RequiredParameterMissingException; +import google.registry.flows.EppException.StatusProhibitsOperationException; +import google.registry.flows.EppException.UnimplementedOptionException; +import google.registry.model.EppResource; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Flag; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.DesignatedContact.Type; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.DomainCommand.CreateOrUpdate; +import google.registry.model.domain.DomainCommand.InvalidReferenceException; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.Period; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.domain.fee.BaseFeeCommand; +import google.registry.model.domain.fee.BaseFeeRequest; +import google.registry.model.domain.fee.BaseFeeResponse; +import google.registry.model.domain.fee.Fee; +import google.registry.model.domain.fee.FeeCommandDescriptor; +import google.registry.model.domain.launch.LaunchExtension; +import google.registry.model.domain.launch.LaunchPhase; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.host.HostResource; +import google.registry.model.mark.Mark; +import google.registry.model.mark.ProtectedMark; +import google.registry.model.mark.Trademark; +import google.registry.model.poll.PollMessage; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldState; +import google.registry.model.registry.label.ReservationType; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.smd.AbstractSignedMark; +import google.registry.model.smd.EncodedSignedMark; +import google.registry.model.smd.SignedMark; +import google.registry.model.smd.SignedMarkRevocationList; +import google.registry.tmch.TmchXmlSignature; +import google.registry.tmch.TmchXmlSignature.CertificateSignatureException; +import google.registry.util.Idn; + import org.joda.money.Money; import org.joda.time.DateTime; import org.xml.sax.SAXException; diff --git a/java/google/registry/flows/domain/DomainInfoFlow.java b/java/google/registry/flows/domain/DomainInfoFlow.java index da88fd8d2..bc3b52ca1 100644 --- a/java/google/registry/flows/domain/DomainInfoFlow.java +++ b/java/google/registry/flows/domain/DomainInfoFlow.java @@ -12,26 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.handleFeeRequest; +import static google.registry.flows.domain.DomainFlowUtils.handleFeeRequest; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.DomainResource.Builder; -import com.google.domain.registry.model.domain.fee.FeeInfoExtension; -import com.google.domain.registry.model.domain.fee.FeeInfoResponseExtension; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.domain.rgp.RgpInfoExtension; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; + +import google.registry.flows.EppException; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.DomainResource.Builder; +import google.registry.model.domain.fee.FeeInfoExtension; +import google.registry.model.domain.fee.FeeInfoResponseExtension; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.domain.rgp.RgpInfoExtension; +import google.registry.model.eppoutput.Response.ResponseExtension; /** * An EPP flow that reads a domain. * - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} - * @error {@link com.google.domain.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException} + * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} + * @error {@link google.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException} * @error {@link DomainFlowUtils.BadPeriodUnitException} * @error {@link DomainFlowUtils.CurrencyUnitMismatchException} * @error {@link DomainFlowUtils.FeeChecksDontSupportPhasesException} diff --git a/java/google/registry/flows/domain/DomainRenewFlow.java b/java/google/registry/flows/domain/DomainRenewFlow.java index 9cec4f426..8b397ad32 100644 --- a/java/google/registry/flows/domain/DomainRenewFlow.java +++ b/java/google/registry/flows/domain/DomainRenewFlow.java @@ -12,46 +12,47 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.newAutorenewBillingEvent; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.newAutorenewPollMessage; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurrenceEndTime; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateFeeChallenge; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyUnitIsYears; -import static com.google.domain.registry.model.domain.DomainResource.MAX_REGISTRATION_YEARS; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.leapSafeAddYears; +import static google.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; +import static google.registry.flows.domain.DomainFlowUtils.newAutorenewBillingEvent; +import static google.registry.flows.domain.DomainFlowUtils.newAutorenewPollMessage; +import static google.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurrenceEndTime; +import static google.registry.flows.domain.DomainFlowUtils.validateFeeChallenge; +import static google.registry.flows.domain.DomainFlowUtils.verifyUnitIsYears; +import static google.registry.model.domain.DomainResource.MAX_REGISTRATION_YEARS; +import static google.registry.model.eppoutput.Result.Code.Success; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.leapSafeAddYears; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.ObjectPendingTransferException; -import com.google.domain.registry.flows.EppException.ParameterValueRangeErrorException; -import com.google.domain.registry.flows.OwnedResourceMutateFlow; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.domain.DomainCommand.Renew; -import com.google.domain.registry.model.domain.DomainRenewData; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.domain.fee.Fee; -import com.google.domain.registry.model.domain.fee.FeeRenewExtension; -import com.google.domain.registry.model.domain.fee.FeeRenewResponseExtension; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.transfer.TransferStatus; import com.googlecode.objectify.Ref; +import google.registry.flows.EppException; +import google.registry.flows.EppException.ObjectPendingTransferException; +import google.registry.flows.EppException.ParameterValueRangeErrorException; +import google.registry.flows.OwnedResourceMutateFlow; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.domain.DomainCommand.Renew; +import google.registry.model.domain.DomainRenewData; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.Period; +import google.registry.model.domain.fee.Fee; +import google.registry.model.domain.fee.FeeRenewExtension; +import google.registry.model.domain.fee.FeeRenewResponseExtension; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.poll.PollMessage; +import google.registry.model.registry.Registry; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.TransferStatus; + import org.joda.money.Money; import org.joda.time.DateTime; @@ -60,10 +61,10 @@ import java.util.Set; /** * An EPP flow that updates a domain resource. * - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} * @error {@link DomainFlowUtils.BadPeriodUnitException} * @error {@link DomainFlowUtils.CurrencyUnitMismatchException} * @error {@link DomainFlowUtils.CurrencyValueScaleException} diff --git a/java/google/registry/flows/domain/DomainRestoreRequestFlow.java b/java/google/registry/flows/domain/DomainRestoreRequestFlow.java index 876e7486b..57cf5ff9e 100644 --- a/java/google/registry/flows/domain/DomainRestoreRequestFlow.java +++ b/java/google/registry/flows/domain/DomainRestoreRequestFlow.java @@ -12,53 +12,54 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.newAutorenewBillingEvent; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.newAutorenewPollMessage; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateFeeChallenge; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyNotReserved; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyPremiumNameIsNotBlocked; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; +import static google.registry.flows.domain.DomainFlowUtils.newAutorenewBillingEvent; +import static google.registry.flows.domain.DomainFlowUtils.newAutorenewPollMessage; +import static google.registry.flows.domain.DomainFlowUtils.validateFeeChallenge; +import static google.registry.flows.domain.DomainFlowUtils.verifyNotReserved; +import static google.registry.flows.domain.DomainFlowUtils.verifyPremiumNameIsNotBlocked; +import static google.registry.model.eppoutput.Result.Code.Success; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.ImmutableList; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.dns.DnsQueue; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.CommandUseErrorException; -import com.google.domain.registry.flows.EppException.StatusProhibitsOperationException; -import com.google.domain.registry.flows.OwnedResourceMutateFlow; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.domain.DomainCommand.Update; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.fee.Fee; -import com.google.domain.registry.model.domain.fee.FeeUpdateExtension; -import com.google.domain.registry.model.domain.fee.FeeUpdateResponseExtension; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.domain.rgp.RgpUpdateExtension; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.reporting.HistoryEntry; import com.googlecode.objectify.Ref; +import google.registry.dns.DnsQueue; +import google.registry.flows.EppException; +import google.registry.flows.EppException.CommandUseErrorException; +import google.registry.flows.EppException.StatusProhibitsOperationException; +import google.registry.flows.OwnedResourceMutateFlow; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.domain.DomainCommand.Update; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.fee.Fee; +import google.registry.model.domain.fee.FeeUpdateExtension; +import google.registry.model.domain.fee.FeeUpdateResponseExtension; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.domain.rgp.RgpUpdateExtension; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.model.poll.PollMessage; +import google.registry.model.registry.Registry; +import google.registry.model.reporting.HistoryEntry; + import org.joda.money.Money; import org.joda.time.DateTime; /** * An EPP flow that requests that a deleted domain be restored. * - * @error {@link com.google.domain.registry.flows.EppException.UnimplementedExtensionException} - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.EppException.UnimplementedExtensionException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} * @error {@link DomainFlowUtils.CurrencyUnitMismatchException} * @error {@link DomainFlowUtils.CurrencyValueScaleException} * @error {@link DomainFlowUtils.DomainReservedException} diff --git a/java/google/registry/flows/domain/DomainTransferApproveFlow.java b/java/google/registry/flows/domain/DomainTransferApproveFlow.java index a20961f94..c80044ae1 100644 --- a/java/google/registry/flows/domain/DomainTransferApproveFlow.java +++ b/java/google/registry/flows/domain/DomainTransferApproveFlow.java @@ -12,35 +12,36 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurrenceEndTime; -import static com.google.domain.registry.model.domain.DomainResource.extendRegistrationWithCap; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; +import static google.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurrenceEndTime; +import static google.registry.model.domain.DomainResource.extendRegistrationWithCap; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.ResourceTransferApproveFlow; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Flag; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.domain.DomainCommand.Transfer; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.DomainResource.Builder; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.transfer.TransferData; import com.googlecode.objectify.Ref; +import google.registry.flows.EppException; +import google.registry.flows.ResourceTransferApproveFlow; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Flag; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.domain.DomainCommand.Transfer; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.DomainResource.Builder; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.poll.PollMessage; +import google.registry.model.registry.Registry; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.TransferData; + import org.joda.time.DateTime; /** @@ -49,11 +50,11 @@ import org.joda.time.DateTime; * The logic in this flow, which handles client approvals, very closely parallels the logic in * {@link DomainResource#cloneProjectedAtTime} which handles implicit server approvals. * - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException} */ public class DomainTransferApproveFlow extends ResourceTransferApproveFlow { diff --git a/java/google/registry/flows/domain/DomainTransferCancelFlow.java b/java/google/registry/flows/domain/DomainTransferCancelFlow.java index 16fa21438..1c1b85684 100644 --- a/java/google/registry/flows/domain/DomainTransferCancelFlow.java +++ b/java/google/registry/flows/domain/DomainTransferCancelFlow.java @@ -12,27 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurrenceEndTime; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; +import static google.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurrenceEndTime; +import static google.registry.util.DateTimeUtils.END_OF_TIME; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.ResourceTransferCancelFlow; -import com.google.domain.registry.model.domain.DomainCommand.Transfer; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.DomainResource.Builder; -import com.google.domain.registry.model.reporting.HistoryEntry; +import google.registry.flows.EppException; +import google.registry.flows.ResourceTransferCancelFlow; +import google.registry.model.domain.DomainCommand.Transfer; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.DomainResource.Builder; +import google.registry.model.reporting.HistoryEntry; /** * An EPP flow that cancels a pending transfer on a {@link DomainResource}. * - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException} - * @error {@link com.google.domain.registry.flows.ResourceTransferCancelFlow.NotTransferInitiatorException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException} + * @error {@link google.registry.flows.ResourceTransferCancelFlow.NotTransferInitiatorException} */ public class DomainTransferCancelFlow extends ResourceTransferCancelFlow { diff --git a/java/google/registry/flows/domain/DomainTransferQueryFlow.java b/java/google/registry/flows/domain/DomainTransferQueryFlow.java index 588660c47..4ce787265 100644 --- a/java/google/registry/flows/domain/DomainTransferQueryFlow.java +++ b/java/google/registry/flows/domain/DomainTransferQueryFlow.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import com.google.domain.registry.flows.ResourceTransferQueryFlow; -import com.google.domain.registry.model.domain.DomainCommand.Transfer; -import com.google.domain.registry.model.domain.DomainResource; +import google.registry.flows.ResourceTransferQueryFlow; +import google.registry.model.domain.DomainCommand.Transfer; +import google.registry.model.domain.DomainResource; /** * An EPP flow that queries a pending transfer on a {@link DomainResource}. * - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} - * @error {@link com.google.domain.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceTransferQueryFlow.NoTransferHistoryToQueryException} - * @error {@link com.google.domain.registry.flows.ResourceTransferQueryFlow.NotAuthorizedToViewTransferException} + * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} + * @error {@link google.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException} + * @error {@link google.registry.flows.ResourceTransferQueryFlow.NoTransferHistoryToQueryException} + * @error {@link google.registry.flows.ResourceTransferQueryFlow.NotAuthorizedToViewTransferException} */ public class DomainTransferQueryFlow extends ResourceTransferQueryFlow {} diff --git a/java/google/registry/flows/domain/DomainTransferRejectFlow.java b/java/google/registry/flows/domain/DomainTransferRejectFlow.java index 7f37fb83d..fcc660a28 100644 --- a/java/google/registry/flows/domain/DomainTransferRejectFlow.java +++ b/java/google/registry/flows/domain/DomainTransferRejectFlow.java @@ -12,27 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurrenceEndTime; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; +import static google.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurrenceEndTime; +import static google.registry.util.DateTimeUtils.END_OF_TIME; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.ResourceTransferRejectFlow; -import com.google.domain.registry.model.domain.DomainCommand.Transfer; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.DomainResource.Builder; -import com.google.domain.registry.model.reporting.HistoryEntry; +import google.registry.flows.EppException; +import google.registry.flows.ResourceTransferRejectFlow; +import google.registry.model.domain.DomainCommand.Transfer; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.DomainResource.Builder; +import google.registry.model.reporting.HistoryEntry; /** * An EPP flow that rejects a pending transfer on a {@link DomainResource}. * - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.ResourceMutatePendingTransferFlow.NotPendingTransferException} */ public class DomainTransferRejectFlow extends ResourceTransferRejectFlow { diff --git a/java/google/registry/flows/domain/DomainTransferRequestFlow.java b/java/google/registry/flows/domain/DomainTransferRequestFlow.java index efea8f6ef..173785888 100644 --- a/java/google/registry/flows/domain/DomainTransferRequestFlow.java +++ b/java/google/registry/flows/domain/DomainTransferRequestFlow.java @@ -12,41 +12,42 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurrenceEndTime; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.validateFeeChallenge; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyPremiumNameIsNotBlocked; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyUnitIsYears; -import static com.google.domain.registry.model.domain.DomainResource.extendRegistrationWithCap; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld; +import static google.registry.flows.domain.DomainFlowUtils.updateAutorenewRecurrenceEndTime; +import static google.registry.flows.domain.DomainFlowUtils.validateFeeChallenge; +import static google.registry.flows.domain.DomainFlowUtils.verifyPremiumNameIsNotBlocked; +import static google.registry.flows.domain.DomainFlowUtils.verifyUnitIsYears; +import static google.registry.model.domain.DomainResource.extendRegistrationWithCap; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.ResourceTransferRequestFlow; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Flag; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.domain.DomainCommand.Transfer; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.domain.fee.Fee; -import com.google.domain.registry.model.domain.fee.FeeTransferExtension; -import com.google.domain.registry.model.domain.fee.FeeTransferResponseExtension; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.flows.EppException; +import google.registry.flows.ResourceTransferRequestFlow; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Flag; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.domain.DomainCommand.Transfer; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.Period; +import google.registry.model.domain.fee.Fee; +import google.registry.model.domain.fee.FeeTransferExtension; +import google.registry.model.domain.fee.FeeTransferResponseExtension; +import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.poll.PollMessage; +import google.registry.model.registry.Registry; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; + import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; @@ -57,13 +58,13 @@ import java.util.Set; /** * An EPP flow that requests a transfer on a {@link DomainResource}. * - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceTransferRequestFlow.AlreadyPendingTransferException} - * @error {@link com.google.domain.registry.flows.ResourceTransferRequestFlow.MissingTransferRequestAuthInfoException} - * @error {@link com.google.domain.registry.flows.ResourceTransferRequestFlow.ObjectAlreadySponsoredException} - * @error {@link com.google.domain.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.ResourceTransferRequestFlow.AlreadyPendingTransferException} + * @error {@link google.registry.flows.ResourceTransferRequestFlow.MissingTransferRequestAuthInfoException} + * @error {@link google.registry.flows.ResourceTransferRequestFlow.ObjectAlreadySponsoredException} + * @error {@link google.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} * @error {@link DomainFlowUtils.BadPeriodUnitException} * @error {@link DomainFlowUtils.CurrencyUnitMismatchException} * @error {@link DomainFlowUtils.CurrencyValueScaleException} diff --git a/java/google/registry/flows/domain/DomainUpdateFlow.java b/java/google/registry/flows/domain/DomainUpdateFlow.java index b59c73c14..03c3a4890 100644 --- a/java/google/registry/flows/domain/DomainUpdateFlow.java +++ b/java/google/registry/flows/domain/DomainUpdateFlow.java @@ -12,27 +12,28 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.domain; +package google.registry.flows.domain; import static com.google.common.collect.Sets.symmetricDifference; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.earliestOf; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.earliestOf; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import com.google.domain.registry.dns.DnsQueue; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.DomainResource.Builder; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.metadata.MetadataExtension; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.domain.secdns.SecDnsUpdateExtension; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.reporting.HistoryEntry; + +import google.registry.dns.DnsQueue; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.DomainResource.Builder; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.metadata.MetadataExtension; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.domain.secdns.SecDnsUpdateExtension; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.registry.Registry; +import google.registry.model.reporting.HistoryEntry; import org.joda.time.DateTime; @@ -41,15 +42,15 @@ import java.util.Set; /** * An EPP flow that updates a domain resource. * - * @error {@link com.google.domain.registry.flows.EppException.UnimplementedExtensionException} - * @error {@link com.google.domain.registry.flows.ResourceCreateOrMutateFlow.OnlyToolCanPassMetadataException} - * @error {@link com.google.domain.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceUpdateFlow.AddRemoveSameValueEppException} - * @error {@link com.google.domain.registry.flows.ResourceUpdateFlow.ResourceHasClientUpdateProhibitedException} - * @error {@link com.google.domain.registry.flows.ResourceUpdateFlow.StatusNotClientSettableException} - * @error {@link com.google.domain.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} + * @error {@link google.registry.flows.EppException.UnimplementedExtensionException} + * @error {@link google.registry.flows.ResourceCreateOrMutateFlow.OnlyToolCanPassMetadataException} + * @error {@link google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.ResourceUpdateFlow.AddRemoveSameValueEppException} + * @error {@link google.registry.flows.ResourceUpdateFlow.ResourceHasClientUpdateProhibitedException} + * @error {@link google.registry.flows.ResourceUpdateFlow.StatusNotClientSettableException} + * @error {@link google.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} * @error {@link BaseDomainUpdateFlow.EmptySecDnsUpdateException} * @error {@link BaseDomainUpdateFlow.MaxSigLifeChangeNotSupportedException} * @error {@link BaseDomainUpdateFlow.SecDnsAllUsageException} diff --git a/java/google/registry/flows/host/HostCheckFlow.java b/java/google/registry/flows/host/HostCheckFlow.java index c16f353a0..ada9d81dc 100644 --- a/java/google/registry/flows/host/HostCheckFlow.java +++ b/java/google/registry/flows/host/HostCheckFlow.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.host; +package google.registry.flows.host; -import static com.google.domain.registry.model.EppResourceUtils.checkResourcesExist; +import static google.registry.model.EppResourceUtils.checkResourcesExist; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.flows.ResourceCheckFlow; -import com.google.domain.registry.model.eppoutput.CheckData; -import com.google.domain.registry.model.eppoutput.CheckData.HostCheck; -import com.google.domain.registry.model.eppoutput.CheckData.HostCheckData; -import com.google.domain.registry.model.host.HostCommand.Check; -import com.google.domain.registry.model.host.HostResource; + +import google.registry.flows.ResourceCheckFlow; +import google.registry.model.eppoutput.CheckData; +import google.registry.model.eppoutput.CheckData.HostCheck; +import google.registry.model.eppoutput.CheckData.HostCheckData; +import google.registry.model.host.HostCommand.Check; +import google.registry.model.host.HostResource; import java.util.Set; /** * An EPP flow that checks whether a host can be provisioned. * - * @error {@link com.google.domain.registry.flows.ResourceCheckFlow.TooManyResourceChecksException} + * @error {@link google.registry.flows.ResourceCheckFlow.TooManyResourceChecksException} */ public class HostCheckFlow extends ResourceCheckFlow { @Override diff --git a/java/google/registry/flows/host/HostCreateFlow.java b/java/google/registry/flows/host/HostCreateFlow.java index c396320b6..6ef87520e 100644 --- a/java/google/registry/flows/host/HostCreateFlow.java +++ b/java/google/registry/flows/host/HostCreateFlow.java @@ -12,38 +12,39 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.host; +package google.registry.flows.host; -import static com.google.domain.registry.flows.host.HostFlowUtils.lookupSuperordinateDomain; -import static com.google.domain.registry.flows.host.HostFlowUtils.validateHostName; -import static com.google.domain.registry.flows.host.HostFlowUtils.verifyDomainIsSameRegistrar; -import static com.google.domain.registry.model.EppResourceUtils.createContactHostRoid; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CollectionUtils.isNullOrEmpty; +import static google.registry.flows.host.HostFlowUtils.lookupSuperordinateDomain; +import static google.registry.flows.host.HostFlowUtils.validateHostName; +import static google.registry.flows.host.HostFlowUtils.verifyDomainIsSameRegistrar; +import static google.registry.model.EppResourceUtils.createContactHostRoid; +import static google.registry.model.eppoutput.Result.Code.Success; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CollectionUtils.isNullOrEmpty; import com.google.common.base.Optional; -import com.google.domain.registry.dns.DnsQueue; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.ParameterValueRangeErrorException; -import com.google.domain.registry.flows.EppException.RequiredParameterMissingException; -import com.google.domain.registry.flows.ResourceCreateFlow; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.eppoutput.CreateData.HostCreateData; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.host.HostCommand.Create; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.host.HostResource.Builder; -import com.google.domain.registry.model.ofy.ObjectifyService; -import com.google.domain.registry.model.reporting.HistoryEntry; import com.googlecode.objectify.Ref; +import google.registry.dns.DnsQueue; +import google.registry.flows.EppException; +import google.registry.flows.EppException.ParameterValueRangeErrorException; +import google.registry.flows.EppException.RequiredParameterMissingException; +import google.registry.flows.ResourceCreateFlow; +import google.registry.model.domain.DomainResource; +import google.registry.model.eppoutput.CreateData.HostCreateData; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.host.HostCommand.Create; +import google.registry.model.host.HostResource; +import google.registry.model.host.HostResource.Builder; +import google.registry.model.ofy.ObjectifyService; +import google.registry.model.reporting.HistoryEntry; + /** * An EPP flow that creates a new host resource. * - * @error {@link com.google.domain.registry.flows.EppXmlTransformer.IpAddressVersionMismatchException} - * @error {@link com.google.domain.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException} + * @error {@link google.registry.flows.EppXmlTransformer.IpAddressVersionMismatchException} + * @error {@link google.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException} * @error {@link HostFlowUtils.HostNameTooLongException} * @error {@link HostFlowUtils.HostNameTooShallowException} * @error {@link HostFlowUtils.InvalidHostNameException} diff --git a/java/google/registry/flows/host/HostDeleteFlow.java b/java/google/registry/flows/host/HostDeleteFlow.java index b8b9d7919..fef0cb04e 100644 --- a/java/google/registry/flows/host/HostDeleteFlow.java +++ b/java/google/registry/flows/host/HostDeleteFlow.java @@ -12,36 +12,37 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.host; +package google.registry.flows.host; -import static com.google.domain.registry.model.EppResourceUtils.queryDomainsUsingResource; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.EppResourceUtils.queryDomainsUsingResource; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.ResourceAsyncDeleteFlow; -import com.google.domain.registry.flows.async.AsyncFlowUtils; -import com.google.domain.registry.flows.async.DeleteEppResourceAction; -import com.google.domain.registry.flows.async.DeleteHostResourceAction; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.host.HostCommand.Delete; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.host.HostResource.Builder; -import com.google.domain.registry.model.reporting.HistoryEntry; import com.googlecode.objectify.Key; +import google.registry.config.RegistryEnvironment; +import google.registry.flows.EppException; +import google.registry.flows.ResourceAsyncDeleteFlow; +import google.registry.flows.async.AsyncFlowUtils; +import google.registry.flows.async.DeleteEppResourceAction; +import google.registry.flows.async.DeleteHostResourceAction; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.host.HostCommand.Delete; +import google.registry.model.host.HostResource; +import google.registry.model.host.HostResource.Builder; +import google.registry.model.reporting.HistoryEntry; + /** * An EPP flow that deletes a host resource. * - * @error {@link com.google.domain.registry.flows.ResourceAsyncDeleteFlow.ResourceToDeleteIsReferencedException} - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} + * @error {@link google.registry.flows.ResourceAsyncDeleteFlow.ResourceToDeleteIsReferencedException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} */ public class HostDeleteFlow extends ResourceAsyncDeleteFlow { diff --git a/java/google/registry/flows/host/HostFlowUtils.java b/java/google/registry/flows/host/HostFlowUtils.java index aff7ac530..0b6b13dbc 100644 --- a/java/google/registry/flows/host/HostFlowUtils.java +++ b/java/google/registry/flows/host/HostFlowUtils.java @@ -12,26 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.host; +package google.registry.flows.host; -import static com.google.domain.registry.model.EppResourceUtils.isActive; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.model.registry.Registries.findTldForName; +import static google.registry.model.EppResourceUtils.isActive; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.registry.Registries.findTldForName; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.Iterables; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.AuthorizationErrorException; -import com.google.domain.registry.flows.EppException.ObjectDoesNotExistException; -import com.google.domain.registry.flows.EppException.ParameterValuePolicyErrorException; -import com.google.domain.registry.flows.EppException.ParameterValueRangeErrorException; -import com.google.domain.registry.flows.EppException.ParameterValueSyntaxErrorException; -import com.google.domain.registry.model.domain.DomainResource; import com.googlecode.objectify.Ref; +import google.registry.flows.EppException; +import google.registry.flows.EppException.AuthorizationErrorException; +import google.registry.flows.EppException.ObjectDoesNotExistException; +import google.registry.flows.EppException.ParameterValuePolicyErrorException; +import google.registry.flows.EppException.ParameterValueRangeErrorException; +import google.registry.flows.EppException.ParameterValueSyntaxErrorException; +import google.registry.model.domain.DomainResource; + import org.joda.time.DateTime; /** Static utility functions for host flows. */ diff --git a/java/google/registry/flows/host/HostInfoFlow.java b/java/google/registry/flows/host/HostInfoFlow.java index 700011ed5..7eece7515 100644 --- a/java/google/registry/flows/host/HostInfoFlow.java +++ b/java/google/registry/flows/host/HostInfoFlow.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.host; +package google.registry.flows.host; -import com.google.domain.registry.flows.ResourceInfoFlow; -import com.google.domain.registry.model.host.HostCommand; -import com.google.domain.registry.model.host.HostResource; +import google.registry.flows.ResourceInfoFlow; +import google.registry.model.host.HostCommand; +import google.registry.model.host.HostResource; /** * An EPP flow that reads a host. * - * @error {@link com.google.domain.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException} + * @error {@link google.registry.flows.ResourceQueryFlow.ResourceToQueryDoesNotExistException} */ public class HostInfoFlow extends ResourceInfoFlow {} diff --git a/java/google/registry/flows/host/HostUpdateFlow.java b/java/google/registry/flows/host/HostUpdateFlow.java index 63edb57aa..4ab9a0984 100644 --- a/java/google/registry/flows/host/HostUpdateFlow.java +++ b/java/google/registry/flows/host/HostUpdateFlow.java @@ -12,36 +12,37 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.host; +package google.registry.flows.host; import static com.google.common.base.MoreObjects.firstNonNull; -import static com.google.domain.registry.flows.host.HostFlowUtils.lookupSuperordinateDomain; -import static com.google.domain.registry.flows.host.HostFlowUtils.validateHostName; -import static com.google.domain.registry.flows.host.HostFlowUtils.verifyDomainIsSameRegistrar; -import static com.google.domain.registry.model.index.ForeignKeyIndex.loadAndGetReference; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CollectionUtils.isNullOrEmpty; +import static google.registry.flows.host.HostFlowUtils.lookupSuperordinateDomain; +import static google.registry.flows.host.HostFlowUtils.validateHostName; +import static google.registry.flows.host.HostFlowUtils.verifyDomainIsSameRegistrar; +import static google.registry.model.index.ForeignKeyIndex.loadAndGetReference; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CollectionUtils.isNullOrEmpty; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.dns.DnsQueue; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.ObjectAlreadyExistsException; -import com.google.domain.registry.flows.EppException.ParameterValueRangeErrorException; -import com.google.domain.registry.flows.EppException.RequiredParameterMissingException; -import com.google.domain.registry.flows.EppException.StatusProhibitsOperationException; -import com.google.domain.registry.flows.ResourceUpdateFlow; -import com.google.domain.registry.flows.async.AsyncFlowUtils; -import com.google.domain.registry.flows.async.DnsRefreshForHostRenameAction; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.host.HostCommand.Update; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.host.HostResource.Builder; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.model.reporting.HistoryEntry; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.dns.DnsQueue; +import google.registry.flows.EppException; +import google.registry.flows.EppException.ObjectAlreadyExistsException; +import google.registry.flows.EppException.ParameterValueRangeErrorException; +import google.registry.flows.EppException.RequiredParameterMissingException; +import google.registry.flows.EppException.StatusProhibitsOperationException; +import google.registry.flows.ResourceUpdateFlow; +import google.registry.flows.async.AsyncFlowUtils; +import google.registry.flows.async.DnsRefreshForHostRenameAction; +import google.registry.model.domain.DomainResource; +import google.registry.model.host.HostCommand.Update; +import google.registry.model.host.HostResource; +import google.registry.model.host.HostResource.Builder; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.model.reporting.HistoryEntry; + import org.joda.time.Duration; import java.util.Objects; @@ -49,11 +50,11 @@ import java.util.Objects; /** * An EPP flow that updates a host resource. * - * @error {@link com.google.domain.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} - * @error {@link com.google.domain.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} - * @error {@link com.google.domain.registry.flows.ResourceUpdateFlow.ResourceHasClientUpdateProhibitedException} - * @error {@link com.google.domain.registry.flows.ResourceUpdateFlow.StatusNotClientSettableException} - * @error {@link com.google.domain.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} + * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException} + * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException} + * @error {@link google.registry.flows.ResourceUpdateFlow.ResourceHasClientUpdateProhibitedException} + * @error {@link google.registry.flows.ResourceUpdateFlow.StatusNotClientSettableException} + * @error {@link google.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException} * @error {@link HostFlowUtils.HostNameTooShallowException} * @error {@link HostFlowUtils.InvalidHostNameException} * @error {@link HostFlowUtils.SuperordinateDomainDoesNotExistException} diff --git a/java/google/registry/flows/poll/PollAckFlow.java b/java/google/registry/flows/poll/PollAckFlow.java index 71fdd00b4..71b11e48e 100644 --- a/java/google/registry/flows/poll/PollAckFlow.java +++ b/java/google/registry/flows/poll/PollAckFlow.java @@ -12,27 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.poll; +package google.registry.flows.poll; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.model.eppoutput.Result.Code.Success; -import static com.google.domain.registry.model.eppoutput.Result.Code.SuccessWithNoMessages; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; - -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.AuthorizationErrorException; -import com.google.domain.registry.flows.EppException.ObjectDoesNotExistException; -import com.google.domain.registry.flows.EppException.ParameterValueSyntaxErrorException; -import com.google.domain.registry.flows.EppException.RequiredParameterMissingException; -import com.google.domain.registry.flows.TransactionalFlow; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.poll.MessageQueueInfo; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.poll.PollMessageExternalKeyConverter.PollMessageExternalKeyParseException; +import static google.registry.model.eppoutput.Result.Code.Success; +import static google.registry.model.eppoutput.Result.Code.SuccessWithNoMessages; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; import com.googlecode.objectify.Key; +import google.registry.flows.EppException; +import google.registry.flows.EppException.AuthorizationErrorException; +import google.registry.flows.EppException.ObjectDoesNotExistException; +import google.registry.flows.EppException.ParameterValueSyntaxErrorException; +import google.registry.flows.EppException.RequiredParameterMissingException; +import google.registry.flows.TransactionalFlow; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.poll.MessageQueueInfo; +import google.registry.model.poll.PollMessage; +import google.registry.model.poll.PollMessageExternalKeyConverter.PollMessageExternalKeyParseException; + import org.joda.time.DateTime; /** diff --git a/java/google/registry/flows/poll/PollFlow.java b/java/google/registry/flows/poll/PollFlow.java index a04f6507e..85d54a262 100644 --- a/java/google/registry/flows/poll/PollFlow.java +++ b/java/google/registry/flows/poll/PollFlow.java @@ -12,26 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.poll; +package google.registry.flows.poll; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.LoggedInFlow; -import com.google.domain.registry.model.eppinput.EppInput.Poll; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Response; -import com.google.domain.registry.model.eppoutput.Response.ResponseData; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; -import com.google.domain.registry.model.eppoutput.Result; -import com.google.domain.registry.model.poll.MessageQueueInfo; -import com.google.domain.registry.model.poll.PollMessage; import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; import com.googlecode.objectify.cmd.Query; +import google.registry.flows.EppException; +import google.registry.flows.LoggedInFlow; +import google.registry.model.eppinput.EppInput.Poll; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Response; +import google.registry.model.eppoutput.Response.ResponseData; +import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.eppoutput.Result; +import google.registry.model.poll.MessageQueueInfo; +import google.registry.model.poll.PollMessage; + import java.util.List; /** Base class of EPP Poll command flows. Mostly provides datastore helper methods. */ diff --git a/java/google/registry/flows/poll/PollRequestFlow.java b/java/google/registry/flows/poll/PollRequestFlow.java index eea1a2d3a..ac6805e81 100644 --- a/java/google/registry/flows/poll/PollRequestFlow.java +++ b/java/google/registry/flows/poll/PollRequestFlow.java @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.poll; +package google.registry.flows.poll; -import static com.google.domain.registry.model.eppoutput.Result.Code.SuccessWithAckMessage; -import static com.google.domain.registry.model.eppoutput.Result.Code.SuccessWithNoMessages; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CollectionUtils.forceEmptyToNull; - -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.ParameterValueSyntaxErrorException; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.poll.MessageQueueInfo; -import com.google.domain.registry.model.poll.PollMessage; +import static google.registry.model.eppoutput.Result.Code.SuccessWithAckMessage; +import static google.registry.model.eppoutput.Result.Code.SuccessWithNoMessages; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CollectionUtils.forceEmptyToNull; import com.googlecode.objectify.Key; +import google.registry.flows.EppException; +import google.registry.flows.EppException.ParameterValueSyntaxErrorException; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.poll.MessageQueueInfo; +import google.registry.model.poll.PollMessage; + import java.util.List; /** diff --git a/java/google/registry/flows/session/HelloFlow.java b/java/google/registry/flows/session/HelloFlow.java index b2806d796..46a68c3d5 100644 --- a/java/google/registry/flows/session/HelloFlow.java +++ b/java/google/registry/flows/session/HelloFlow.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.session; +package google.registry.flows.session; -import com.google.domain.registry.flows.Flow; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Greeting; +import google.registry.flows.Flow; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Greeting; /** A flow for an Epp "hello". */ public class HelloFlow extends Flow { diff --git a/java/google/registry/flows/session/LoginFlow.java b/java/google/registry/flows/session/LoginFlow.java index fe4d5c9df..0d5cd4396 100644 --- a/java/google/registry/flows/session/LoginFlow.java +++ b/java/google/registry/flows/session/LoginFlow.java @@ -12,32 +12,33 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.session; +package google.registry.flows.session; import static com.google.common.collect.Sets.difference; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppException.AuthenticationErrorClosingConnectionException; -import com.google.domain.registry.flows.EppException.AuthenticationErrorException; -import com.google.domain.registry.flows.EppException.AuthorizationErrorException; -import com.google.domain.registry.flows.EppException.CommandUseErrorException; -import com.google.domain.registry.flows.EppException.ParameterValuePolicyErrorException; -import com.google.domain.registry.flows.EppException.UnimplementedExtensionException; -import com.google.domain.registry.flows.EppException.UnimplementedObjectServiceException; -import com.google.domain.registry.flows.EppException.UnimplementedOptionException; -import com.google.domain.registry.flows.Flow; -import com.google.domain.registry.flows.TransportCredentials; -import com.google.domain.registry.model.eppcommon.ProtocolDefinition; -import com.google.domain.registry.model.eppcommon.ProtocolDefinition.ServiceExtension; -import com.google.domain.registry.model.eppinput.EppInput.Login; -import com.google.domain.registry.model.eppinput.EppInput.Options; -import com.google.domain.registry.model.eppinput.EppInput.Services; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Result.Code; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.flows.EppException; +import google.registry.flows.EppException.AuthenticationErrorClosingConnectionException; +import google.registry.flows.EppException.AuthenticationErrorException; +import google.registry.flows.EppException.AuthorizationErrorException; +import google.registry.flows.EppException.CommandUseErrorException; +import google.registry.flows.EppException.ParameterValuePolicyErrorException; +import google.registry.flows.EppException.UnimplementedExtensionException; +import google.registry.flows.EppException.UnimplementedObjectServiceException; +import google.registry.flows.EppException.UnimplementedOptionException; +import google.registry.flows.Flow; +import google.registry.flows.TransportCredentials; +import google.registry.model.eppcommon.ProtocolDefinition; +import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension; +import google.registry.model.eppinput.EppInput.Login; +import google.registry.model.eppinput.EppInput.Options; +import google.registry.model.eppinput.EppInput.Services; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Result.Code; +import google.registry.model.registrar.Registrar; +import google.registry.util.FormattingLogger; import java.util.Objects; import java.util.Set; @@ -45,15 +46,15 @@ import java.util.Set; /** * An EPP flow for login. * - * @error {@link com.google.domain.registry.flows.EppConsoleServlet.GaeUserCredentials.BadGaeUserIdException} - * @error {@link com.google.domain.registry.flows.EppConsoleServlet.GaeUserCredentials.UserNotLoggedInException} - * @error {@link com.google.domain.registry.flows.EppException.UnimplementedExtensionException} - * @error {@link com.google.domain.registry.flows.EppException.UnimplementedObjectServiceException} - * @error {@link com.google.domain.registry.flows.EppException.UnimplementedProtocolVersionException} - * @error {@link com.google.domain.registry.flows.TlsCredentials.BadRegistrarCertificateException} - * @error {@link com.google.domain.registry.flows.TlsCredentials.BadRegistrarIpAddressException} - * @error {@link com.google.domain.registry.flows.TlsCredentials.MissingRegistrarCertificateException} - * @error {@link com.google.domain.registry.flows.TlsCredentials.NoSniException} + * @error {@link google.registry.flows.EppConsoleServlet.GaeUserCredentials.BadGaeUserIdException} + * @error {@link google.registry.flows.EppConsoleServlet.GaeUserCredentials.UserNotLoggedInException} + * @error {@link google.registry.flows.EppException.UnimplementedExtensionException} + * @error {@link google.registry.flows.EppException.UnimplementedObjectServiceException} + * @error {@link google.registry.flows.EppException.UnimplementedProtocolVersionException} + * @error {@link google.registry.flows.TlsCredentials.BadRegistrarCertificateException} + * @error {@link google.registry.flows.TlsCredentials.BadRegistrarIpAddressException} + * @error {@link google.registry.flows.TlsCredentials.MissingRegistrarCertificateException} + * @error {@link google.registry.flows.TlsCredentials.NoSniException} * @error {@link LoginFlow.AlreadyLoggedInException} * @error {@link LoginFlow.BadRegistrarClientIdException} * @error {@link LoginFlow.BadRegistrarPasswordException} diff --git a/java/google/registry/flows/session/LogoutFlow.java b/java/google/registry/flows/session/LogoutFlow.java index 5b29418cf..44bbc6206 100644 --- a/java/google/registry/flows/session/LogoutFlow.java +++ b/java/google/registry/flows/session/LogoutFlow.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.flows.session; +package google.registry.flows.session; -import static com.google.domain.registry.model.eppoutput.Result.Code.SuccessAndClose; +import static google.registry.model.eppoutput.Result.Code.SuccessAndClose; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.LoggedInFlow; -import com.google.domain.registry.model.eppoutput.EppOutput; +import google.registry.flows.EppException; +import google.registry.flows.LoggedInFlow; +import google.registry.model.eppoutput.EppOutput; /** * An EPP flow for logout. * - * @error {@link com.google.domain.registry.flows.LoggedInFlow.NotLoggedInException} + * @error {@link google.registry.flows.LoggedInFlow.NotLoggedInException} */ public class LogoutFlow extends LoggedInFlow { @Override diff --git a/java/google/registry/gcs/BUILD b/java/google/registry/gcs/BUILD index ff26fa940..e60584ee6 100644 --- a/java/google/registry/gcs/BUILD +++ b/java/google/registry/gcs/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 java_library( @@ -9,11 +11,11 @@ java_library( "//java/com/google/common/base", "//java/com/google/common/collect", "//java/com/google/common/net", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/util", "//third_party/java/appengine_gcs_client", "//third_party/java/dagger", "//third_party/java/jsr305_annotations", "//third_party/java/jsr330_inject", + "//java/google/registry/config", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/gcs/GcsServiceModule.java b/java/google/registry/gcs/GcsServiceModule.java index 008da724f..e7ebc9deb 100644 --- a/java/google/registry/gcs/GcsServiceModule.java +++ b/java/google/registry/gcs/GcsServiceModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.gcs; +package google.registry.gcs; import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.GcsServiceFactory; diff --git a/java/google/registry/gcs/GcsUtils.java b/java/google/registry/gcs/GcsUtils.java index a77f94052..9c5271913 100644 --- a/java/google/registry/gcs/GcsUtils.java +++ b/java/google/registry/gcs/GcsUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.gcs; +package google.registry.gcs; import static com.google.common.collect.Iterables.getLast; @@ -24,8 +24,9 @@ import com.google.appengine.tools.cloudstorage.GcsService; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.config.ConfigModule.Config; +import google.registry.util.FormattingLogger; import java.io.IOException; import java.io.InputStream; diff --git a/java/google/registry/groups/BUILD b/java/google/registry/groups/BUILD index bbcb0b5d3..7c4616408 100644 --- a/java/google/registry/groups/BUILD +++ b/java/google/registry/groups/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "groups", @@ -14,12 +16,12 @@ java_library( "//java/com/google/common/annotations", "//java/com/google/common/base", "//java/com/google/common/collect", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", "//third_party/java/dagger", "//third_party/java/joda_time", "//third_party/java/jsr305_annotations", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/request", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/groups/DirectoryGroupsConnection.java b/java/google/registry/groups/DirectoryGroupsConnection.java index e229f0b18..5141b1446 100644 --- a/java/google/registry/groups/DirectoryGroupsConnection.java +++ b/java/google/registry/groups/DirectoryGroupsConnection.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.groups; +package google.registry.groups; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.CollectionUtils.nullToEmpty; import static javax.servlet.http.HttpServletResponse.SC_CONFLICT; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; @@ -29,8 +29,9 @@ import com.google.api.services.groupssettings.model.Groups; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.config.ConfigModule.Config; +import google.registry.util.FormattingLogger; import java.io.IOException; import java.util.Set; diff --git a/java/google/registry/groups/DirectoryModule.java b/java/google/registry/groups/DirectoryModule.java index cad3abe71..d3742f9b1 100644 --- a/java/google/registry/groups/DirectoryModule.java +++ b/java/google/registry/groups/DirectoryModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.groups; +package google.registry.groups; import static dagger.Provides.Type.SET_VALUES; @@ -20,12 +20,13 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; import com.google.api.services.admin.directory.Directory; import com.google.api.services.admin.directory.DirectoryScopes; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.request.DelegatedOAuthScopes; import dagger.Module; import dagger.Provides; +import google.registry.config.ConfigModule.Config; +import google.registry.request.DelegatedOAuthScopes; + import java.util.Set; import javax.inject.Named; @@ -33,11 +34,11 @@ import javax.inject.Named; /** * Dagger module for the Google {@link Directory} service. * - * @see com.google.domain.registry.config.ConfigModule - * @see com.google.domain.registry.request.Modules.UrlFetchTransportModule - * @see com.google.domain.registry.request.Modules.Jackson2Module - * @see com.google.domain.registry.request.Modules.AppIdentityCredentialModule - * @see com.google.domain.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule + * @see google.registry.config.ConfigModule + * @see google.registry.request.Modules.UrlFetchTransportModule + * @see google.registry.request.Modules.Jackson2Module + * @see google.registry.request.Modules.AppIdentityCredentialModule + * @see google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule */ @Module public final class DirectoryModule { diff --git a/java/google/registry/groups/GroupsConnection.java b/java/google/registry/groups/GroupsConnection.java index 9dc4a382e..8354ab861 100644 --- a/java/google/registry/groups/GroupsConnection.java +++ b/java/google/registry/groups/GroupsConnection.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.groups; +package google.registry.groups; import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.google.api.services.admin.directory.model.Group; diff --git a/java/google/registry/groups/GroupsModule.java b/java/google/registry/groups/GroupsModule.java index e41bc867f..970914cb8 100644 --- a/java/google/registry/groups/GroupsModule.java +++ b/java/google/registry/groups/GroupsModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.groups; +package google.registry.groups; import dagger.Module; import dagger.Provides; diff --git a/java/google/registry/groups/GroupssettingsModule.java b/java/google/registry/groups/GroupssettingsModule.java index f24747ede..8937c8e60 100644 --- a/java/google/registry/groups/GroupssettingsModule.java +++ b/java/google/registry/groups/GroupssettingsModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.groups; +package google.registry.groups; import static dagger.Provides.Type.SET_VALUES; @@ -20,12 +20,13 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; import com.google.api.services.groupssettings.Groupssettings; import com.google.api.services.groupssettings.GroupssettingsScopes; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.request.DelegatedOAuthScopes; import dagger.Module; import dagger.Provides; +import google.registry.config.ConfigModule.Config; +import google.registry.request.DelegatedOAuthScopes; + import java.util.Set; import javax.inject.Named; @@ -33,11 +34,11 @@ import javax.inject.Named; /** * Dagger module for the Google {@link Groupssettings} service. * - * @see com.google.domain.registry.config.ConfigModule - * @see com.google.domain.registry.request.Modules.UrlFetchTransportModule - * @see com.google.domain.registry.request.Modules.Jackson2Module - * @see com.google.domain.registry.request.Modules.AppIdentityCredentialModule - * @see com.google.domain.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule + * @see google.registry.config.ConfigModule + * @see google.registry.request.Modules.UrlFetchTransportModule + * @see google.registry.request.Modules.Jackson2Module + * @see google.registry.request.Modules.AppIdentityCredentialModule + * @see google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule */ @Module public final class GroupssettingsModule { diff --git a/java/google/registry/idn/BUILD b/java/google/registry/idn/BUILD index 17f9f5013..17ccbda7c 100644 --- a/java/google/registry/idn/BUILD +++ b/java/google/registry/idn/BUILD @@ -1,4 +1,6 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + diff --git a/java/google/registry/keyring/api/BUILD b/java/google/registry/keyring/api/BUILD index 9df2d5e72..cea1a5f86 100644 --- a/java/google/registry/keyring/api/BUILD +++ b/java/google/registry/keyring/api/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "api", diff --git a/java/google/registry/keyring/api/KeyModule.java b/java/google/registry/keyring/api/KeyModule.java index 2621b3197..d1b271a32 100644 --- a/java/google/registry/keyring/api/KeyModule.java +++ b/java/google/registry/keyring/api/KeyModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.keyring.api; +package google.registry.keyring.api; import static com.google.common.base.Strings.emptyToNull; diff --git a/java/google/registry/keyring/api/Keyring.java b/java/google/registry/keyring/api/Keyring.java index 1beb12e0b..695f7c188 100644 --- a/java/google/registry/keyring/api/Keyring.java +++ b/java/google/registry/keyring/api/Keyring.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.keyring.api; +package google.registry.keyring.api; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; @@ -38,7 +38,7 @@ public interface Keyring extends AutoCloseable { *

This keypair should only be known to the domain registry shared * registry system. * - * @see com.google.domain.registry.rde.RdeUploadAction + * @see google.registry.rde.RdeUploadAction */ PGPKeyPair getRdeSigningKey(); @@ -65,28 +65,28 @@ public interface Keyring extends AutoCloseable { * invocation of the RDE upload thing. * * @see #getRdeStagingEncryptionKey() - * @see com.google.domain.registry.rde.RdeUploadAction + * @see google.registry.rde.RdeUploadAction */ PGPPrivateKey getRdeStagingDecryptionKey(); /** * Returns public key of escrow agent for encrypting deposits as they're uploaded. * - * @see com.google.domain.registry.rde.RdeUploadAction + * @see google.registry.rde.RdeUploadAction */ PGPPublicKey getRdeReceiverKey(); /** * Returns the PGP key we use to sign Bulk Registration Data Access (BRDA) deposits. * - * @see com.google.domain.registry.rde.BrdaCopyAction + * @see google.registry.rde.BrdaCopyAction */ PGPKeyPair getBrdaSigningKey(); /** * Returns public key of receiver of Bulk Registration Data Access (BRDA) deposits. * - * @see com.google.domain.registry.rde.BrdaCopyAction + * @see google.registry.rde.BrdaCopyAction */ PGPPublicKey getBrdaReceiverKey(); @@ -97,7 +97,7 @@ public interface Keyring extends AutoCloseable { * {@code ~/.ssh/id_rsa.pub} file. It's usually a single line with the name of * the algorithm, the base64 key, and the email address of the owner. * - * @see com.google.domain.registry.rde.RdeUploadAction + * @see google.registry.rde.RdeUploadAction */ String getRdeSshClientPublicKey(); @@ -112,35 +112,35 @@ public interface Keyring extends AutoCloseable { * admin console. The request should originate from a backend task queue servlet * invocation of the RDE upload thing. * - * @see com.google.domain.registry.rde.RdeUploadAction + * @see google.registry.rde.RdeUploadAction */ String getRdeSshClientPrivateKey(); /** * Returns password to be used when uploading reports to ICANN. * - * @see com.google.domain.registry.rde.RdeReportAction + * @see google.registry.rde.RdeReportAction */ String getIcannReportingPassword(); /** * Returns {@code user:password} login for TMCH MarksDB HTTP server DNL interface. * - * @see com.google.domain.registry.tmch.TmchDnlAction + * @see google.registry.tmch.TmchDnlAction */ String getMarksdbDnlLogin(); /** * Returns password for TMCH MarksDB HTTP server LORDN interface. * - * @see "com.google.domain.registry.tmch.LordnRequestInitializer" + * @see "google.registry.tmch.LordnRequestInitializer" */ String getMarksdbLordnPassword(); /** * Returns {@code user:password} login for TMCH MarksDB HTTP server SMDRL interface. * - * @see com.google.domain.registry.tmch.TmchSmdrlAction + * @see google.registry.tmch.TmchSmdrlAction */ String getMarksdbSmdrlLogin(); @@ -155,7 +155,7 @@ public interface Keyring extends AutoCloseable { * *

This is a base32 value copied from the Braintree website. * - * @see com.google.domain.registry.config.ConfigModule#provideBraintreePublicKey + * @see google.registry.config.ConfigModule#provideBraintreePublicKey */ String getBraintreePrivateKey(); diff --git a/java/google/registry/keyring/api/PgpHelper.java b/java/google/registry/keyring/api/PgpHelper.java index 2753f9039..5a3330ab7 100644 --- a/java/google/registry/keyring/api/PgpHelper.java +++ b/java/google/registry/keyring/api/PgpHelper.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.keyring.api; +package google.registry.keyring.api; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Verify.verify; diff --git a/java/google/registry/keyring/api/VoidKeyring.java b/java/google/registry/keyring/api/VoidKeyring.java index 6097cbbff..e7940febe 100644 --- a/java/google/registry/keyring/api/VoidKeyring.java +++ b/java/google/registry/keyring/api/VoidKeyring.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.keyring.api; +package google.registry.keyring.api; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; diff --git a/java/google/registry/keyring/api/VoidKeyringModule.java b/java/google/registry/keyring/api/VoidKeyringModule.java index 32f317cc2..a0b4d357b 100644 --- a/java/google/registry/keyring/api/VoidKeyringModule.java +++ b/java/google/registry/keyring/api/VoidKeyringModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.keyring.api; +package google.registry.keyring.api; import dagger.Module; import dagger.Provides; diff --git a/java/google/registry/keyring/api/package-info.java b/java/google/registry/keyring/api/package-info.java index 912d4e3ab..7d8feac51 100644 --- a/java/google/registry/keyring/api/package-info.java +++ b/java/google/registry/keyring/api/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.keyring.api; +package google.registry.keyring.api; diff --git a/java/google/registry/loadtest/BUILD b/java/google/registry/loadtest/BUILD index f16c41bef..bf61090f7 100644 --- a/java/google/registry/loadtest/BUILD +++ b/java/google/registry/loadtest/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + filegroup( name = "templates", @@ -15,16 +17,16 @@ java_library( deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/flows", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/dagger", "//third_party/java/joda_time", "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/flows", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/loadtest/LoadTask.java b/java/google/registry/loadtest/LoadTask.java index 39e27987d..3b9ecd7ea 100644 --- a/java/google/registry/loadtest/LoadTask.java +++ b/java/google/registry/loadtest/LoadTask.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.loadtest; +package google.registry.loadtest; import static com.google.cloud.sql.jdbc.internal.Charsets.UTF_8; -import static com.google.domain.registry.flows.EppController.handleEppCommand; +import static google.registry.flows.EppController.handleEppCommand; import com.google.appengine.api.taskqueue.DeferredTask; -import com.google.domain.registry.flows.SessionMetadata.SessionSource; -import com.google.domain.registry.flows.StatelessRequestSessionMetadata; -import com.google.domain.registry.model.eppcommon.ProtocolDefinition; + +import google.registry.flows.SessionMetadata.SessionSource; +import google.registry.flows.StatelessRequestSessionMetadata; +import google.registry.model.eppcommon.ProtocolDefinition; /** A task that executes a single EPP command. */ public class LoadTask implements DeferredTask { diff --git a/java/google/registry/loadtest/LoadTestAction.java b/java/google/registry/loadtest/LoadTestAction.java index 56c571d26..a47b0670d 100644 --- a/java/google/registry/loadtest/LoadTestAction.java +++ b/java/google/registry/loadtest/LoadTestAction.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.loadtest; +package google.registry.loadtest; import static com.google.appengine.api.taskqueue.QueueConstants.maxTasksPerAdd; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; @@ -20,7 +20,7 @@ import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withPayload import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Lists.partition; import static com.google.common.collect.Lists.transform; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.util.Arrays.asList; import static org.joda.time.DateTimeZone.UTC; @@ -29,10 +29,11 @@ import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.TaskEnqueuer; + +import google.registry.config.RegistryEnvironment; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.util.TaskEnqueuer; import org.joda.time.DateTime; diff --git a/java/google/registry/loadtest/LoadTestModule.java b/java/google/registry/loadtest/LoadTestModule.java index e9f16d423..50048705e 100644 --- a/java/google/registry/loadtest/LoadTestModule.java +++ b/java/google/registry/loadtest/LoadTestModule.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.loadtest; +package google.registry.loadtest; -import static com.google.domain.registry.request.RequestParameters.extractOptionalIntParameter; -import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter; - -import com.google.domain.registry.request.Parameter; +import static google.registry.request.RequestParameters.extractOptionalIntParameter; +import static google.registry.request.RequestParameters.extractRequiredParameter; import dagger.Module; import dagger.Provides; +import google.registry.request.Parameter; + import org.joda.time.Minutes; import javax.servlet.http.HttpServletRequest; @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; /** * Dagger module for loadtest package. * - * @see "com.google.domain.registry.module.backend.ToolsComponent" + * @see "google.registry.module.backend.ToolsComponent" */ @Module public final class LoadTestModule { diff --git a/java/google/registry/mapreduce/BUILD b/java/google/registry/mapreduce/BUILD index 250320961..a29762578 100644 --- a/java/google/registry/mapreduce/BUILD +++ b/java/google/registry/mapreduce/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "mapreduce", @@ -11,10 +13,6 @@ java_library( "//java/com/google/common/annotations", "//java/com/google/common/base", "//java/com/google/common/collect", - "//java/com/google/domain/registry/mapreduce/inputs", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/appengine_mapreduce2:appengine_mapreduce", "//third_party/java/appengine_pipeline", @@ -23,5 +21,9 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/mapreduce/inputs", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/mapreduce/MapreduceAction.java b/java/google/registry/mapreduce/MapreduceAction.java index 63f4f89fe..f9662db97 100644 --- a/java/google/registry/mapreduce/MapreduceAction.java +++ b/java/google/registry/mapreduce/MapreduceAction.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce; +package google.registry.mapreduce; -import com.google.domain.registry.request.Action; +import google.registry.request.Action; /** * Marker interface to denote an action intended for the Mapreduce queue. diff --git a/java/google/registry/mapreduce/MapreduceModule.java b/java/google/registry/mapreduce/MapreduceModule.java index 3438e5d8e..61f060d96 100644 --- a/java/google/registry/mapreduce/MapreduceModule.java +++ b/java/google/registry/mapreduce/MapreduceModule.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce; +package google.registry.mapreduce; -import static com.google.domain.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN; -import static com.google.domain.registry.mapreduce.MapreduceRunner.PARAM_MAP_SHARDS; -import static com.google.domain.registry.mapreduce.MapreduceRunner.PARAM_REDUCE_SHARDS; -import static com.google.domain.registry.request.RequestParameters.extractBooleanParameter; -import static com.google.domain.registry.request.RequestParameters.extractOptionalIntParameter; +import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN; +import static google.registry.mapreduce.MapreduceRunner.PARAM_MAP_SHARDS; +import static google.registry.mapreduce.MapreduceRunner.PARAM_REDUCE_SHARDS; +import static google.registry.request.RequestParameters.extractBooleanParameter; +import static google.registry.request.RequestParameters.extractOptionalIntParameter; import com.google.common.base.Optional; -import com.google.domain.registry.request.Parameter; import dagger.Module; import dagger.Provides; +import google.registry.request.Parameter; + import javax.servlet.http.HttpServletRequest; /** Dagger module for the mapreduce package. */ diff --git a/java/google/registry/mapreduce/MapreduceRunner.java b/java/google/registry/mapreduce/MapreduceRunner.java index f13f2f7ba..1043ec24d 100644 --- a/java/google/registry/mapreduce/MapreduceRunner.java +++ b/java/google/registry/mapreduce/MapreduceRunner.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce; +package google.registry.mapreduce; import static com.google.appengine.api.search.checkers.Preconditions.checkNotNull; import static com.google.appengine.tools.pipeline.PipelineServiceFactory.newPipelineService; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.MapJob; @@ -34,10 +34,11 @@ import com.google.appengine.tools.pipeline.Job0; import com.google.appengine.tools.pipeline.JobSetting; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; -import com.google.domain.registry.mapreduce.inputs.ConcatenatingInput; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.PipelineUtils; + +import google.registry.mapreduce.inputs.ConcatenatingInput; +import google.registry.request.Parameter; +import google.registry.util.FormattingLogger; +import google.registry.util.PipelineUtils; import org.joda.time.Duration; diff --git a/java/google/registry/mapreduce/inputs/BUILD b/java/google/registry/mapreduce/inputs/BUILD index ab79f2d20..9bf93c56b 100644 --- a/java/google/registry/mapreduce/inputs/BUILD +++ b/java/google/registry/mapreduce/inputs/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "inputs", @@ -11,8 +13,6 @@ java_library( "//java/com/google/common/annotations", "//java/com/google/common/base", "//java/com/google/common/collect", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/appengine_mapreduce2:appengine_mapreduce", "//third_party/java/appengine_pipeline", @@ -21,5 +21,7 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/model", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/mapreduce/inputs/ChildEntityInput.java b/java/google/registry/mapreduce/inputs/ChildEntityInput.java index 5544a19ec..8f0e11303 100644 --- a/java/google/registry/mapreduce/inputs/ChildEntityInput.java +++ b/java/google/registry/mapreduce/inputs/ChildEntityInput.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; -import static com.google.domain.registry.util.TypeUtils.checkNoInheritanceRelationships; +import static google.registry.util.TypeUtils.checkNoInheritanceRelationships; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.index.EppResourceIndexBucket; import com.googlecode.objectify.Key; +import google.registry.model.EppResource; +import google.registry.model.ImmutableObject; +import google.registry.model.index.EppResourceIndexBucket; + /** * A MapReduce {@link Input} that loads all child objects of a given set of types, that are children * of given {@link EppResource} types. diff --git a/java/google/registry/mapreduce/inputs/ChildEntityReader.java b/java/google/registry/mapreduce/inputs/ChildEntityReader.java index 6b9ccecf1..f4bb18cb7 100644 --- a/java/google/registry/mapreduce/inputs/ChildEntityReader.java +++ b/java/google/registry/mapreduce/inputs/ChildEntityReader.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; -import static com.google.domain.registry.model.EntityClasses.ALL_CLASSES; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.EntityClasses.ALL_CLASSES; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.api.datastore.Cursor; import com.google.appengine.api.datastore.QueryResultIterator; @@ -23,16 +23,17 @@ import com.google.appengine.tools.mapreduce.InputReader; import com.google.appengine.tools.mapreduce.ShardContext; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.EppResourceIndexBucket; -import com.google.domain.registry.util.FormattingLogger; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.cmd.Query; +import google.registry.model.EppResource; +import google.registry.model.ImmutableObject; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.EppResourceIndexBucket; +import google.registry.util.FormattingLogger; + import java.io.IOException; import java.util.NoSuchElementException; diff --git a/java/google/registry/mapreduce/inputs/ChunkingKeyInput.java b/java/google/registry/mapreduce/inputs/ChunkingKeyInput.java index 80960496f..302d19e6c 100644 --- a/java/google/registry/mapreduce/inputs/ChunkingKeyInput.java +++ b/java/google/registry/mapreduce/inputs/ChunkingKeyInput.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; import com.google.appengine.api.datastore.Key; import com.google.appengine.tools.mapreduce.Input; diff --git a/java/google/registry/mapreduce/inputs/ConcatenatingInput.java b/java/google/registry/mapreduce/inputs/ConcatenatingInput.java index 122e2d8f7..25149780a 100644 --- a/java/google/registry/mapreduce/inputs/ConcatenatingInput.java +++ b/java/google/registry/mapreduce/inputs/ConcatenatingInput.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; diff --git a/java/google/registry/mapreduce/inputs/EppResourceBaseInput.java b/java/google/registry/mapreduce/inputs/EppResourceBaseInput.java index cb12a234a..5833cbdd7 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceBaseInput.java +++ b/java/google/registry/mapreduce/inputs/EppResourceBaseInput.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.EppResourceIndexBucket; import com.googlecode.objectify.Key; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.EppResourceIndexBucket; + import java.util.List; /** Base class for {@link Input} classes that map over {@link EppResourceIndex}. */ diff --git a/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java b/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java index c77d46b96..eada5a78b 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java +++ b/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; -import static com.google.domain.registry.model.EntityClasses.CLASS_TO_KIND_FUNCTION; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.EntityClasses.CLASS_TO_KIND_FUNCTION; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.api.datastore.Cursor; import com.google.appengine.api.datastore.QueryResultIterator; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.EppResourceIndexBucket; -import com.google.domain.registry.util.FormattingLogger; import com.googlecode.objectify.Key; import com.googlecode.objectify.cmd.Query; +import google.registry.model.EppResource; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.EppResourceIndexBucket; +import google.registry.util.FormattingLogger; + import java.util.NoSuchElementException; /** Base class for {@link InputReader} classes that map over {@link EppResourceIndex}. */ diff --git a/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java b/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java index 122162d14..f7ca87548 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java +++ b/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; -import static com.google.domain.registry.util.TypeUtils.checkNoInheritanceRelationships; +import static google.registry.util.TypeUtils.checkNoInheritanceRelationships; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.index.EppResourceIndexBucket; import com.googlecode.objectify.Key; +import google.registry.model.EppResource; +import google.registry.model.index.EppResourceIndexBucket; + /** A MapReduce {@link Input} that loads all {@link EppResource} objects of a given type. */ class EppResourceEntityInput extends EppResourceBaseInput { diff --git a/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java b/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java index 1141e44e6..26091b1b8 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java +++ b/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.EppResourceIndexBucket; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.model.EppResource; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.EppResourceIndexBucket; + import java.util.NoSuchElementException; /** Reader that maps over {@link EppResourceIndex} and returns resources. */ diff --git a/java/google/registry/mapreduce/inputs/EppResourceIndexInput.java b/java/google/registry/mapreduce/inputs/EppResourceIndexInput.java index 4bce07896..7b6a6ded8 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceIndexInput.java +++ b/java/google/registry/mapreduce/inputs/EppResourceIndexInput.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.EppResourceIndexBucket; import com.googlecode.objectify.Key; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.EppResourceIndexBucket; + /** * A MapReduce {@link Input} that loads all {@link EppResourceIndex} entities. */ diff --git a/java/google/registry/mapreduce/inputs/EppResourceIndexReader.java b/java/google/registry/mapreduce/inputs/EppResourceIndexReader.java index b3f9ad845..05d7f1638 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceIndexReader.java +++ b/java/google/registry/mapreduce/inputs/EppResourceIndexReader.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.EppResourceIndexBucket; import com.googlecode.objectify.Key; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.EppResourceIndexBucket; + import java.util.NoSuchElementException; /** Reader that maps over {@link EppResourceIndex} and returns the index objects themselves. */ diff --git a/java/google/registry/mapreduce/inputs/EppResourceInputs.java b/java/google/registry/mapreduce/inputs/EppResourceInputs.java index ea7038222..cb3c8ff1a 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceInputs.java +++ b/java/google/registry/mapreduce/inputs/EppResourceInputs.java @@ -12,23 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Predicates.not; import static com.google.common.collect.Iterables.all; import static com.google.common.collect.Lists.asList; -import static com.google.domain.registry.util.TypeUtils.hasAnnotation; +import static google.registry.util.TypeUtils.hasAnnotation; import com.google.appengine.tools.mapreduce.Input; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.index.EppResourceIndex; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.EntitySubclass; +import google.registry.model.EppResource; +import google.registry.model.ImmutableObject; +import google.registry.model.index.EppResourceIndex; + /** * Mapreduce helpers for {@link EppResource} keys and objects. * diff --git a/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java b/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java index d85a791f4..e829a9c43 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java +++ b/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; -import static com.google.domain.registry.util.TypeUtils.checkNoInheritanceRelationships; +import static google.registry.util.TypeUtils.checkNoInheritanceRelationships; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.index.EppResourceIndexBucket; import com.googlecode.objectify.Key; +import google.registry.model.EppResource; +import google.registry.model.index.EppResourceIndexBucket; + /** * A MapReduce {@link Input} that loads keys to all {@link EppResource} objects of a given type. * diff --git a/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java b/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java index 982c8a26c..1f1ecc2db 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java +++ b/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.EppResourceIndexBucket; import com.googlecode.objectify.Key; +import google.registry.model.EppResource; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.EppResourceIndexBucket; + import java.util.NoSuchElementException; /** diff --git a/java/google/registry/mapreduce/inputs/NullInput.java b/java/google/registry/mapreduce/inputs/NullInput.java index da40a1525..03e8cfd92 100644 --- a/java/google/registry/mapreduce/inputs/NullInput.java +++ b/java/google/registry/mapreduce/inputs/NullInput.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.mapreduce.inputs; +package google.registry.mapreduce.inputs; import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.InputReader; diff --git a/java/google/registry/model/AbstractFieldExposer.java b/java/google/registry/model/AbstractFieldExposer.java index 3987b35f6..c2e2ccf59 100644 --- a/java/google/registry/model/AbstractFieldExposer.java +++ b/java/google/registry/model/AbstractFieldExposer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import java.lang.reflect.Field; diff --git a/java/google/registry/model/BUILD b/java/google/registry/model/BUILD index 873804b54..4d260235d 100644 --- a/java/google/registry/model/BUILD +++ b/java/google/registry/model/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + FIELD_EXPOSERS = [ "FieldExposer.java", "billing/FieldExposer.java", @@ -80,9 +82,6 @@ java_library( "//java/com/google/common/primitives", "//java/com/google/common/reflect", "//java/com/google/common/util/concurrent", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/xml", "//third_party/java/appengine:appengine-api", "//third_party/java/dagger", "//third_party/java/joda_money", @@ -91,5 +90,8 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/util", + "//java/google/registry/xml", ], ) diff --git a/java/google/registry/model/BackupGroupRoot.java b/java/google/registry/model/BackupGroupRoot.java index db2528baa..58bd21c26 100644 --- a/java/google/registry/model/BackupGroupRoot.java +++ b/java/google/registry/model/BackupGroupRoot.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import javax.xml.bind.annotation.XmlTransient; diff --git a/java/google/registry/model/Buildable.java b/java/google/registry/model/Buildable.java index 7399e5680..8d6d7e572 100644 --- a/java/google/registry/model/Buildable.java +++ b/java/google/registry/model/Buildable.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.base.Optional; -import com.google.domain.registry.model.ofy.ObjectifyService; -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; + +import google.registry.model.ofy.ObjectifyService; +import google.registry.util.TypeUtils.TypeInstantiator; import java.lang.reflect.Field; diff --git a/java/google/registry/model/CreateAutoTimestamp.java b/java/google/registry/model/CreateAutoTimestamp.java index 58f26c608..bb4b10c03 100644 --- a/java/google/registry/model/CreateAutoTimestamp.java +++ b/java/google/registry/model/CreateAutoTimestamp.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; -import com.google.domain.registry.model.translators.CreateAutoTimestampTranslatorFactory; +import google.registry.model.translators.CreateAutoTimestampTranslatorFactory; import org.joda.time.DateTime; diff --git a/java/google/registry/model/EntityClasses.java b/java/google/registry/model/EntityClasses.java index c5c40b643..0566a9771 100644 --- a/java/google/registry/model/EntityClasses.java +++ b/java/google/registry/model/EntityClasses.java @@ -12,50 +12,51 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.RegistrarBillingEntry; -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCreditBalance; -import com.google.domain.registry.model.common.EntityGroupRoot; -import com.google.domain.registry.model.common.GaeUserIdConverter; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.export.LogsExportCursor; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.index.DomainApplicationIndex; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.EppResourceIndexBucket; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.model.ofy.CommitLogBucket; -import com.google.domain.registry.model.ofy.CommitLogCheckpoint; -import com.google.domain.registry.model.ofy.CommitLogCheckpointRoot; -import com.google.domain.registry.model.ofy.CommitLogManifest; -import com.google.domain.registry.model.ofy.CommitLogMutation; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.rde.RdeRevision; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.model.registry.label.ReservedList; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.server.Lock; -import com.google.domain.registry.model.server.ServerSecret; -import com.google.domain.registry.model.smd.SignedMarkRevocationList; -import com.google.domain.registry.model.tmch.ClaimsListShard; -import com.google.domain.registry.model.tmch.ClaimsListShard.ClaimsListRevision; -import com.google.domain.registry.model.tmch.ClaimsListShard.ClaimsListSingleton; -import com.google.domain.registry.model.tmch.TmchCrl; import com.googlecode.objectify.Key; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.RegistrarBillingEntry; +import google.registry.model.billing.RegistrarCredit; +import google.registry.model.billing.RegistrarCreditBalance; +import google.registry.model.common.EntityGroupRoot; +import google.registry.model.common.GaeUserIdConverter; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.DomainResource; +import google.registry.model.export.LogsExportCursor; +import google.registry.model.host.HostResource; +import google.registry.model.index.DomainApplicationIndex; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.EppResourceIndexBucket; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.model.ofy.CommitLogBucket; +import google.registry.model.ofy.CommitLogCheckpoint; +import google.registry.model.ofy.CommitLogCheckpointRoot; +import google.registry.model.ofy.CommitLogManifest; +import google.registry.model.ofy.CommitLogMutation; +import google.registry.model.poll.PollMessage; +import google.registry.model.rde.RdeRevision; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.label.PremiumList; +import google.registry.model.registry.label.ReservedList; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.server.Lock; +import google.registry.model.server.ServerSecret; +import google.registry.model.smd.SignedMarkRevocationList; +import google.registry.model.tmch.ClaimsListShard; +import google.registry.model.tmch.ClaimsListShard.ClaimsListRevision; +import google.registry.model.tmch.ClaimsListShard.ClaimsListSingleton; +import google.registry.model.tmch.TmchCrl; + /** Sets of classes of the Objectify-registered entities in use throughout the model. */ public final class EntityClasses { diff --git a/java/google/registry/model/EppResource.java b/java/google/registry/model/EppResource.java index f8d82553e..ce3fa8b6e 100644 --- a/java/google/registry/model/EppResource.java +++ b/java/google/registry/model/EppResource.java @@ -12,27 +12,28 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import static com.google.common.collect.Sets.difference; import static com.google.common.collect.Sets.union; -import static com.google.domain.registry.util.CollectionUtils.difference; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.CollectionUtils.difference; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppoutput.Response.ResponseData; -import com.google.domain.registry.model.ofy.CommitLogManifest; -import com.google.domain.registry.model.transfer.TransferData; import com.googlecode.objectify.Ref; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Index; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppoutput.Response.ResponseData; +import google.registry.model.ofy.CommitLogManifest; +import google.registry.model.transfer.TransferData; + import org.joda.time.DateTime; import java.util.Set; @@ -129,7 +130,7 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable, *

Note: Only the last revision on a given date is stored. The key is the transaction * timestamp, not midnight. * - * @see com.google.domain.registry.model.translators.CommitLogRevisionsTranslatorFactory + * @see google.registry.model.translators.CommitLogRevisionsTranslatorFactory */ @XmlTransient ImmutableSortedMap> revisions = ImmutableSortedMap.of(); diff --git a/java/google/registry/model/EppResourceUtils.java b/java/google/registry/model/EppResourceUtils.java index 83204314e..314ac7722 100644 --- a/java/google/registry/model/EppResourceUtils.java +++ b/java/google/registry/model/EppResourceUtils.java @@ -12,39 +12,40 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Iterables.transform; -import static com.google.domain.registry.model.RoidSuffixes.getRoidSuffixForTld; -import static com.google.domain.registry.model.index.ForeignKeyIndex.loadAndGetReference; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.isAtOrAfter; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; -import static com.google.domain.registry.util.DateTimeUtils.latestOf; +import static google.registry.model.RoidSuffixes.getRoidSuffixForTld; +import static google.registry.model.index.ForeignKeyIndex.loadAndGetReference; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.isAtOrAfter; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; +import static google.registry.util.DateTimeUtils.latestOf; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.EppResource.Builder; -import com.google.domain.registry.model.EppResource.ForeignKeyedEppResource; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.model.ofy.CommitLogManifest; -import com.google.domain.registry.model.ofy.CommitLogMutation; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferStatus; -import com.google.domain.registry.util.FormattingLogger; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; import com.googlecode.objectify.Result; import com.googlecode.objectify.util.ResultNow; +import google.registry.config.RegistryEnvironment; +import google.registry.model.EppResource.Builder; +import google.registry.model.EppResource.ForeignKeyedEppResource; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.host.HostResource; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.model.ofy.CommitLogManifest; +import google.registry.model.ofy.CommitLogMutation; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferStatus; +import google.registry.util.FormattingLogger; + import org.joda.time.DateTime; import org.joda.time.Interval; @@ -272,7 +273,7 @@ public final class EppResourceUtils { * certain circumstances, a resource might be restored to a revision on the previous day, even if * there were revisions made earlier on the same date as {@code timestamp}; however, a resource * will never be restored to a revision occuring after {@code timestamp}. This behavior is due to - * the way {@link com.google.domain.registry.model.translators.CommitLogRevisionsTranslatorFactory + * the way {@link google.registry.model.translators.CommitLogRevisionsTranslatorFactory * CommitLogRevisionsTranslatorFactory} manages the {@link EppResource#revisions} field. Please * note however that the creation and deletion times of a resource are granular to the * millisecond. diff --git a/java/google/registry/model/ImmutableObject.java b/java/google/registry/model/ImmutableObject.java index 9f0f27e6c..ebb51f27b 100644 --- a/java/google/registry/model/ImmutableObject.java +++ b/java/google/registry/model/ImmutableObject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import static com.google.common.base.Functions.identity; import static com.google.common.collect.Iterables.transform; @@ -22,11 +22,12 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.FluentIterable; import com.google.common.collect.Maps; -import com.google.domain.registry.model.domain.ReferenceUnion; import com.googlecode.objectify.Ref; import com.googlecode.objectify.annotation.Ignore; +import google.registry.model.domain.ReferenceUnion; + import java.util.Arrays; import java.util.Collection; import java.util.Map; diff --git a/java/google/registry/model/JsonMapBuilder.java b/java/google/registry/model/JsonMapBuilder.java index 377a615c1..b91926e2a 100644 --- a/java/google/registry/model/JsonMapBuilder.java +++ b/java/google/registry/model/JsonMapBuilder.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import com.google.common.base.Function; import com.google.common.base.Functions; diff --git a/java/google/registry/model/Jsonifiable.java b/java/google/registry/model/Jsonifiable.java index 9b1e7587c..6d962cac6 100644 --- a/java/google/registry/model/Jsonifiable.java +++ b/java/google/registry/model/Jsonifiable.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import java.util.Map; diff --git a/java/google/registry/model/ModelUtils.java b/java/google/registry/model/ModelUtils.java index d24a50446..2b724cec3 100644 --- a/java/google/registry/model/ModelUtils.java +++ b/java/google/registry/model/ModelUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Predicates.instanceOf; diff --git a/java/google/registry/model/RoidSuffixes.java b/java/google/registry/model/RoidSuffixes.java index b98b36996..38795ade2 100644 --- a/java/google/registry/model/RoidSuffixes.java +++ b/java/google/registry/model/RoidSuffixes.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CacheUtils.memoizeWithShortExpiration; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CacheUtils.memoizeWithShortExpiration; import com.google.common.base.Supplier; import com.google.common.collect.HashBiMap; -import com.google.domain.registry.model.registry.Registry; import com.googlecode.objectify.Work; +import google.registry.model.registry.Registry; + /** Utility class for dealing with EPP ROID suffixes. */ public final class RoidSuffixes { diff --git a/java/google/registry/model/SchemaVersion.java b/java/google/registry/model/SchemaVersion.java index ea75d5483..a6d90e33c 100644 --- a/java/google/registry/model/SchemaVersion.java +++ b/java/google/registry/model/SchemaVersion.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import static com.google.common.base.Predicates.assignableFrom; import static com.google.common.base.Predicates.or; diff --git a/java/google/registry/model/UpdateAutoTimestamp.java b/java/google/registry/model/UpdateAutoTimestamp.java index f530cc993..feedae152 100644 --- a/java/google/registry/model/UpdateAutoTimestamp.java +++ b/java/google/registry/model/UpdateAutoTimestamp.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.base.Optional; -import com.google.domain.registry.model.translators.UpdateAutoTimestampTranslatorFactory; + +import google.registry.model.translators.UpdateAutoTimestampTranslatorFactory; import org.joda.time.DateTime; diff --git a/java/google/registry/model/annotations/ExternalMessagingName.java b/java/google/registry/model/annotations/ExternalMessagingName.java index 93b0ea884..60f683ba1 100644 --- a/java/google/registry/model/annotations/ExternalMessagingName.java +++ b/java/google/registry/model/annotations/ExternalMessagingName.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.annotations; +package google.registry.model.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java/google/registry/model/annotations/NotBackedUp.java b/java/google/registry/model/annotations/NotBackedUp.java index 038593a75..a437ba328 100644 --- a/java/google/registry/model/annotations/NotBackedUp.java +++ b/java/google/registry/model/annotations/NotBackedUp.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.annotations; +package google.registry.model.annotations; import com.googlecode.objectify.annotation.Entity; diff --git a/java/google/registry/model/annotations/VirtualEntity.java b/java/google/registry/model/annotations/VirtualEntity.java index c5d9950c1..d5f12dd23 100644 --- a/java/google/registry/model/annotations/VirtualEntity.java +++ b/java/google/registry/model/annotations/VirtualEntity.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.annotations; +package google.registry.model.annotations; import com.googlecode.objectify.annotation.Entity; diff --git a/java/google/registry/model/billing/BillingEvent.java b/java/google/registry/model/billing/BillingEvent.java index 6ffecd9bd..ca099c898 100644 --- a/java/google/registry/model/billing/BillingEvent.java +++ b/java/google/registry/model/billing/BillingEvent.java @@ -12,27 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.billing; +package google.registry.model.billing; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; -import static com.google.domain.registry.util.CollectionUtils.union; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.union; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.common.TimeOfYear; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; @@ -44,6 +37,14 @@ import com.googlecode.objectify.annotation.OnLoad; import com.googlecode.objectify.annotation.Parent; import com.googlecode.objectify.condition.IfNull; +import google.registry.model.Buildable; +import google.registry.model.ImmutableObject; +import google.registry.model.common.TimeOfYear; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; + import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/model/billing/RegistrarBillingEntry.java b/java/google/registry/model/billing/RegistrarBillingEntry.java index 45053c28b..3c9fd8b22 100644 --- a/java/google/registry/model/billing/RegistrarBillingEntry.java +++ b/java/google/registry/model/billing/RegistrarBillingEntry.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.billing; +package google.registry.model.billing; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -20,18 +20,18 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Strings.emptyToNull; import static com.google.common.base.Verify.verifyNotNull; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.JsonMapBuilder; -import com.google.domain.registry.model.Jsonifiable; -import com.google.domain.registry.model.registrar.Registrar; - import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Index; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.Buildable; +import google.registry.model.ImmutableObject; +import google.registry.model.JsonMapBuilder; +import google.registry.model.Jsonifiable; +import google.registry.model.registrar.Registrar; + import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/model/billing/RegistrarBillingUtils.java b/java/google/registry/model/billing/RegistrarBillingUtils.java index a26024897..d5ee459f4 100644 --- a/java/google/registry/model/billing/RegistrarBillingUtils.java +++ b/java/google/registry/model/billing/RegistrarBillingUtils.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.billing; +package google.registry.model.billing; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -24,13 +24,14 @@ import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Maps; import com.google.common.collect.Maps.EntryTransformer; import com.google.common.collect.Ordering; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registries; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.util.CacheUtils; import com.googlecode.objectify.cmd.Query; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registries; +import google.registry.model.registry.Registry; +import google.registry.util.CacheUtils; + import org.joda.money.CurrencyUnit; import org.joda.money.Money; diff --git a/java/google/registry/model/billing/RegistrarCredit.java b/java/google/registry/model/billing/RegistrarCredit.java index bec3377aa..61ee94d3a 100644 --- a/java/google/registry/model/billing/RegistrarCredit.java +++ b/java/google/registry/model/billing/RegistrarCredit.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.billing; +package google.registry.model.billing; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.Registries.assertTldExists; import com.google.common.base.Joiner; import com.google.common.base.Optional; @@ -25,16 +25,17 @@ import com.google.common.collect.ComparisonChain; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Ordering; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; import com.googlecode.objectify.Ref; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.Buildable; +import google.registry.model.ImmutableObject; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; + import org.joda.money.CurrencyUnit; import org.joda.time.DateTime; diff --git a/java/google/registry/model/billing/RegistrarCreditBalance.java b/java/google/registry/model/billing/RegistrarCreditBalance.java index e196b8004..5436a3f13 100644 --- a/java/google/registry/model/billing/RegistrarCreditBalance.java +++ b/java/google/registry/model/billing/RegistrarCreditBalance.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.billing; +package google.registry.model.billing; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -26,8 +26,6 @@ import com.google.common.collect.ForwardingNavigableMap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.ImmutableObject; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; @@ -36,6 +34,9 @@ import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Parent; import com.googlecode.objectify.impl.ref.DeadRef; +import google.registry.model.Buildable; +import google.registry.model.ImmutableObject; + import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/model/common/CrossTldSingleton.java b/java/google/registry/model/common/CrossTldSingleton.java index b68a282e5..000a71212 100644 --- a/java/google/registry/model/common/CrossTldSingleton.java +++ b/java/google/registry/model/common/CrossTldSingleton.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.common; +package google.registry.model.common; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; - -import com.google.domain.registry.model.ImmutableObject; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.ImmutableObject; + /** A singleton entity in the datastore. */ public abstract class CrossTldSingleton extends ImmutableObject { diff --git a/java/google/registry/model/common/EntityGroupRoot.java b/java/google/registry/model/common/EntityGroupRoot.java index 7473a7761..e48d66b16 100644 --- a/java/google/registry/model/common/EntityGroupRoot.java +++ b/java/google/registry/model/common/EntityGroupRoot.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.common; - -import com.google.domain.registry.model.BackupGroupRoot; +package google.registry.model.common; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; +import google.registry.model.BackupGroupRoot; + /** * The root key for the entity group which is known as the cross-tld entity group for historical * reasons. diff --git a/java/google/registry/model/common/GaeUserIdConverter.java b/java/google/registry/model/common/GaeUserIdConverter.java index ba07f81f7..524da0bd9 100644 --- a/java/google/registry/model/common/GaeUserIdConverter.java +++ b/java/google/registry/model/common/GaeUserIdConverter.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.common; +package google.registry.model.common; -import static com.google.domain.registry.model.ofy.ObjectifyService.allocateId; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.allocateId; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.api.users.User; import com.google.common.base.Splitter; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.NotBackedUp.Reason; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.NotBackedUp.Reason; + /** * A helper class to convert email addresses to GAE user ids. It does so by persisting a User * object with the email address to datastore, and then immediately reading it back. diff --git a/java/google/registry/model/common/PersistedRangeLong.java b/java/google/registry/model/common/PersistedRangeLong.java index e588034c7..5c008d2d5 100644 --- a/java/google/registry/model/common/PersistedRangeLong.java +++ b/java/google/registry/model/common/PersistedRangeLong.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.common; +package google.registry.model.common; import com.google.common.collect.BoundType; import com.google.common.collect.Range; -import com.google.domain.registry.model.ImmutableObject; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.ImmutableObject; + /** An object that's equivalent to a {@code Range} that can be persisted to datastore. */ @Embed public class PersistedRangeLong extends ImmutableObject { diff --git a/java/google/registry/model/common/TimeOfYear.java b/java/google/registry/model/common/TimeOfYear.java index 0772a1bd7..e318d6980 100644 --- a/java/google/registry/model/common/TimeOfYear.java +++ b/java/google/registry/model/common/TimeOfYear.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.common; +package google.registry.model.common; -import static com.google.domain.registry.util.DateTimeUtils.isAtOrAfter; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; +import static google.registry.util.DateTimeUtils.isAtOrAfter; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; import com.google.common.base.Splitter; -import com.google.domain.registry.model.ImmutableObject; import com.googlecode.objectify.annotation.Embed; import com.googlecode.objectify.annotation.Index; +import google.registry.model.ImmutableObject; + import org.joda.time.DateTime; import java.util.List; diff --git a/java/google/registry/model/common/TimedTransitionProperty.java b/java/google/registry/model/common/TimedTransitionProperty.java index 928b0d36a..72cdb40c9 100644 --- a/java/google/registry/model/common/TimedTransitionProperty.java +++ b/java/google/registry/model/common/TimedTransitionProperty.java @@ -12,23 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.common; +package google.registry.model.common; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.latestOf; +import static google.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.DateTimeUtils.latestOf; import com.google.common.base.Function; import com.google.common.collect.ForwardingMap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.util.TypeUtils; import com.googlecode.objectify.mapper.Mapper; +import google.registry.model.ImmutableObject; +import google.registry.util.TypeUtils; + import org.joda.time.DateTime; import java.util.NavigableMap; diff --git a/java/google/registry/model/contact/ContactAddress.java b/java/google/registry/model/contact/ContactAddress.java index bb745a9d0..33e57eaf4 100644 --- a/java/google/registry/model/contact/ContactAddress.java +++ b/java/google/registry/model/contact/ContactAddress.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.contact; - -import com.google.domain.registry.model.eppcommon.Address; +package google.registry.model.contact; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.eppcommon.Address; + /** * EPP Contact Address *

diff --git a/java/google/registry/model/contact/ContactAuthInfo.java b/java/google/registry/model/contact/ContactAuthInfo.java index 43015abbf..6c587dbd1 100644 --- a/java/google/registry/model/contact/ContactAuthInfo.java +++ b/java/google/registry/model/contact/ContactAuthInfo.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.contact; +package google.registry.model.contact; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppcommon.AuthInfo; - import com.googlecode.objectify.annotation.Embed; +import google.registry.model.EppResource; +import google.registry.model.eppcommon.AuthInfo; + import javax.xml.bind.annotation.XmlType; /** A version of authInfo specifically for contacts. */ diff --git a/java/google/registry/model/contact/ContactCommand.java b/java/google/registry/model/contact/ContactCommand.java index bcbe4c986..a52f2cc92 100644 --- a/java/google/registry/model/contact/ContactCommand.java +++ b/java/google/registry/model/contact/ContactCommand.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.contact; +package google.registry.model.contact; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.base.Function; import com.google.common.collect.Maps; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.contact.ContactResource.Builder; -import com.google.domain.registry.model.contact.PostalInfo.Type; -import com.google.domain.registry.model.eppinput.ResourceCommand.AbstractSingleResourceCommand; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceCheck; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceUpdate; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; + +import google.registry.model.ImmutableObject; +import google.registry.model.contact.ContactResource.Builder; +import google.registry.model.contact.PostalInfo.Type; +import google.registry.model.eppinput.ResourceCommand.AbstractSingleResourceCommand; +import google.registry.model.eppinput.ResourceCommand.ResourceCheck; +import google.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange; +import google.registry.model.eppinput.ResourceCommand.ResourceUpdate; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; import java.util.List; import java.util.Map; diff --git a/java/google/registry/model/contact/ContactPhoneNumber.java b/java/google/registry/model/contact/ContactPhoneNumber.java index 0b0a634f0..8a7dfbc89 100644 --- a/java/google/registry/model/contact/ContactPhoneNumber.java +++ b/java/google/registry/model/contact/ContactPhoneNumber.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.contact; - -import com.google.domain.registry.model.eppcommon.PhoneNumber; +package google.registry.model.contact; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.eppcommon.PhoneNumber; + /** * EPP Contact Phone Number *

diff --git a/java/google/registry/model/contact/ContactResource.java b/java/google/registry/model/contact/ContactResource.java index fb02bc02c..9d385819d 100644 --- a/java/google/registry/model/contact/ContactResource.java +++ b/java/google/registry/model/contact/ContactResource.java @@ -12,26 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.contact; +package google.registry.model.contact; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.model.EppResourceUtils.projectResourceOntoBuilderAtTime; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; +import static google.registry.model.EppResourceUtils.projectResourceOntoBuilderAtTime; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; import com.google.common.base.Predicates; import com.google.common.collect.FluentIterable; import com.google.common.collect.Lists; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.ForeignKeyedEppResource; -import com.google.domain.registry.model.annotations.ExternalMessagingName; -import com.google.domain.registry.model.contact.PostalInfo.Type; -import com.google.domain.registry.model.eppcommon.AuthInfo; import com.googlecode.objectify.annotation.Cache; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.IgnoreSave; import com.googlecode.objectify.condition.IfNull; +import google.registry.model.EppResource; +import google.registry.model.EppResource.ForeignKeyedEppResource; +import google.registry.model.annotations.ExternalMessagingName; +import google.registry.model.contact.PostalInfo.Type; +import google.registry.model.eppcommon.AuthInfo; + import org.joda.time.DateTime; import java.util.List; diff --git a/java/google/registry/model/contact/Disclose.java b/java/google/registry/model/contact/Disclose.java index a742a6955..32bb8a966 100644 --- a/java/google/registry/model/contact/Disclose.java +++ b/java/google/registry/model/contact/Disclose.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.contact; +package google.registry.model.contact; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppcommon.PresenceMarker; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.Buildable; +import google.registry.model.ImmutableObject; +import google.registry.model.eppcommon.PresenceMarker; + import java.util.List; import javax.xml.bind.annotation.XmlAttribute; diff --git a/java/google/registry/model/contact/PostalInfo.java b/java/google/registry/model/contact/PostalInfo.java index f998cb57d..657d4e3fb 100644 --- a/java/google/registry/model/contact/PostalInfo.java +++ b/java/google/registry/model/contact/PostalInfo.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.contact; +package google.registry.model.contact; import static com.google.common.base.Preconditions.checkState; import com.google.common.base.Optional; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.Buildable.Overlayable; -import com.google.domain.registry.model.ImmutableObject; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.Buildable; +import google.registry.model.Buildable.Overlayable; +import google.registry.model.ImmutableObject; + import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/java/google/registry/model/contact/package-info.java b/java/google/registry/model/contact/package-info.java index 03fcba07b..ffc8564fd 100644 --- a/java/google/registry/model/contact/package-info.java +++ b/java/google/registry/model/contact/package-info.java @@ -18,9 +18,9 @@ elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) @XmlJavaTypeAdapter(UtcDateTimeAdapter.class) -package com.google.domain.registry.model.contact; +package google.registry.model.contact; -import com.google.domain.registry.xml.UtcDateTimeAdapter; +import google.registry.xml.UtcDateTimeAdapter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/domain/DesignatedContact.java b/java/google/registry/model/domain/DesignatedContact.java index 9e42b85ca..782ac025c 100644 --- a/java/google/registry/model/domain/DesignatedContact.java +++ b/java/google/registry/model/domain/DesignatedContact.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; import com.google.common.annotations.VisibleForTesting; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.contact.ContactResource; import com.googlecode.objectify.annotation.Embed; import com.googlecode.objectify.annotation.Index; +import google.registry.model.ImmutableObject; +import google.registry.model.contact.ContactResource; + import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlValue; diff --git a/java/google/registry/model/domain/DomainApplication.java b/java/google/registry/model/domain/DomainApplication.java index 890ab48e6..1a215b45b 100644 --- a/java/google/registry/model/domain/DomainApplication.java +++ b/java/google/registry/model/domain/DomainApplication.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.annotations.ExternalMessagingName; -import com.google.domain.registry.model.domain.launch.ApplicationStatus; -import com.google.domain.registry.model.domain.launch.LaunchPhase; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.smd.EncodedSignedMark; import com.googlecode.objectify.annotation.Cache; import com.googlecode.objectify.annotation.EntitySubclass; +import google.registry.model.annotations.ExternalMessagingName; +import google.registry.model.domain.launch.ApplicationStatus; +import google.registry.model.domain.launch.LaunchPhase; +import google.registry.model.eppcommon.Trid; +import google.registry.model.smd.EncodedSignedMark; + import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/model/domain/DomainAuthInfo.java b/java/google/registry/model/domain/DomainAuthInfo.java index 963c09f9d..35b40f1e7 100644 --- a/java/google/registry/model/domain/DomainAuthInfo.java +++ b/java/google/registry/model/domain/DomainAuthInfo.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.eppcommon.AuthInfo; - import com.googlecode.objectify.annotation.Embed; +import google.registry.model.EppResource; +import google.registry.model.contact.ContactResource; +import google.registry.model.eppcommon.AuthInfo; + /** A version of authInfo specifically for domains. */ @Embed public class DomainAuthInfo extends AuthInfo { diff --git a/java/google/registry/model/domain/DomainBase.java b/java/google/registry/model/domain/DomainBase.java index 87fa557eb..ecfe0fad1 100644 --- a/java/google/registry/model/domain/DomainBase.java +++ b/java/google/registry/model/domain/DomainBase.java @@ -12,27 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.collect.Sets.difference; import static com.google.common.collect.Sets.union; -import static com.google.domain.registry.model.domain.DesignatedContact.Type.REGISTRANT; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableSortedCopy; -import static com.google.domain.registry.util.CollectionUtils.union; -import static com.google.domain.registry.util.DomainNameUtils.getTldFromDomainName; +import static google.registry.model.domain.DesignatedContact.Type.REGISTRANT; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableSortedCopy; +import static google.registry.util.CollectionUtils.union; +import static google.registry.util.DomainNameUtils.getTldFromDomainName; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResourceUtils; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.launch.LaunchNotice; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppcommon.AuthInfo; -import com.google.domain.registry.model.host.HostResource; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Ignore; @@ -41,6 +34,14 @@ import com.googlecode.objectify.annotation.Index; import com.googlecode.objectify.annotation.OnLoad; import com.googlecode.objectify.condition.IfNull; +import google.registry.model.EppResource; +import google.registry.model.EppResourceUtils; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.launch.LaunchNotice; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppcommon.AuthInfo; +import google.registry.model.host.HostResource; + import java.util.Set; import javax.xml.bind.annotation.XmlElement; @@ -126,7 +127,7 @@ public abstract class DomainBase extends EppResource { /** * Name of first IDN table associated with TLD that matched the characters in this domain label. * - * @see com.google.domain.registry.tldconfig.idn.IdnLabelValidator#findValidIdnTableForTld + * @see google.registry.tldconfig.idn.IdnLabelValidator#findValidIdnTableForTld */ @IgnoreSave(IfNull.class) @XmlTransient diff --git a/java/google/registry/model/domain/DomainCommand.java b/java/google/registry/model/domain/DomainCommand.java index 8f6741997..172ce537d 100644 --- a/java/google/registry/model/domain/DomainCommand.java +++ b/java/google/registry/model/domain/DomainCommand.java @@ -12,32 +12,33 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Sets.intersection; -import static com.google.domain.registry.model.index.ForeignKeyIndex.loadAndGetReference; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CollectionUtils.nullSafeImmutableCopy; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.model.index.ForeignKeyIndex.loadAndGetReference; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CollectionUtils.nullSafeImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.eppcommon.AuthInfo; -import com.google.domain.registry.model.eppinput.ResourceCommand.AbstractSingleResourceCommand; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceCheck; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceUpdate; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.host.HostResource; import com.googlecode.objectify.Ref; import com.googlecode.objectify.Work; +import google.registry.model.EppResource; +import google.registry.model.ImmutableObject; +import google.registry.model.contact.ContactResource; +import google.registry.model.eppcommon.AuthInfo; +import google.registry.model.eppinput.ResourceCommand.AbstractSingleResourceCommand; +import google.registry.model.eppinput.ResourceCommand.ResourceCheck; +import google.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange; +import google.registry.model.eppinput.ResourceCommand.ResourceUpdate; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.host.HostResource; + import org.joda.time.DateTime; import org.joda.time.LocalDate; diff --git a/java/google/registry/model/domain/DomainRenewData.java b/java/google/registry/model/domain/DomainRenewData.java index ec168cc56..df3d2d9ee 100644 --- a/java/google/registry/model/domain/DomainRenewData.java +++ b/java/google/registry/model/domain/DomainRenewData.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; -import com.google.domain.registry.model.eppoutput.Response.ResponseData; +import google.registry.model.eppoutput.Response.ResponseData; import org.joda.time.DateTime; diff --git a/java/google/registry/model/domain/DomainResource.java b/java/google/registry/model/domain/DomainResource.java index a574195c8..a6de03c43 100644 --- a/java/google/registry/model/domain/DomainResource.java +++ b/java/google/registry/model/domain/DomainResource.java @@ -12,30 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; import static com.google.common.collect.Sets.intersection; -import static com.google.domain.registry.model.EppResourceUtils.projectResourceOntoBuilderAtTime; -import static com.google.domain.registry.model.EppResourceUtils.setAutomaticTransferSuccessProperties; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; -import static com.google.domain.registry.util.CollectionUtils.difference; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; -import static com.google.domain.registry.util.CollectionUtils.union; -import static com.google.domain.registry.util.DateTimeUtils.earliestOf; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; -import static com.google.domain.registry.util.DateTimeUtils.leapSafeAddYears; +import static google.registry.model.EppResourceUtils.projectResourceOntoBuilderAtTime; +import static google.registry.model.EppResourceUtils.setAutomaticTransferSuccessProperties; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; +import static google.registry.util.CollectionUtils.difference; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.union; +import static google.registry.util.DateTimeUtils.earliestOf; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; +import static google.registry.util.DateTimeUtils.leapSafeAddYears; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResource.ForeignKeyedEppResource; -import com.google.domain.registry.model.annotations.ExternalMessagingName; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferStatus; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; @@ -44,6 +35,16 @@ import com.googlecode.objectify.annotation.EntitySubclass; import com.googlecode.objectify.annotation.IgnoreSave; import com.googlecode.objectify.condition.IfNull; +import google.registry.model.EppResource.ForeignKeyedEppResource; +import google.registry.model.annotations.ExternalMessagingName; +import google.registry.model.billing.BillingEvent; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.poll.PollMessage; +import google.registry.model.registry.Registry; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferStatus; + import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/java/google/registry/model/domain/GracePeriod.java b/java/google/registry/model/domain/GracePeriod.java index f351f8110..a76ec5e8a 100644 --- a/java/google/registry/model/domain/GracePeriod.java +++ b/java/google/registry/model/domain/GracePeriod.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; - -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.googlecode.objectify.Ref; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.ImmutableObject; +import google.registry.model.billing.BillingEvent; +import google.registry.model.domain.rgp.GracePeriodStatus; + import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/java/google/registry/model/domain/Period.java b/java/google/registry/model/domain/Period.java index 47eb7353a..c67b2d410 100644 --- a/java/google/registry/model/domain/Period.java +++ b/java/google/registry/model/domain/Period.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; -import com.google.domain.registry.model.ImmutableObject; - import com.googlecode.objectify.annotation.Embed; +import google.registry.model.ImmutableObject; + import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlValue; diff --git a/java/google/registry/model/domain/ReferenceUnion.java b/java/google/registry/model/domain/ReferenceUnion.java index ccff2acf9..50caed2e0 100644 --- a/java/google/registry/model/domain/ReferenceUnion.java +++ b/java/google/registry/model/domain/ReferenceUnion.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; - -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.host.HostResource; +package google.registry.model.domain; import com.googlecode.objectify.Ref; import com.googlecode.objectify.annotation.Embed; import com.googlecode.objectify.annotation.Ignore; import com.googlecode.objectify.annotation.Index; +import google.registry.model.EppResource; +import google.registry.model.ImmutableObject; +import google.registry.model.contact.ContactResource; +import google.registry.model.host.HostResource; + import java.io.Serializable; import javax.xml.bind.annotation.adapters.XmlAdapter; diff --git a/java/google/registry/model/domain/allocate/AllocateCreateExtension.java b/java/google/registry/model/domain/allocate/AllocateCreateExtension.java index eec7b2f09..91e7d6623 100644 --- a/java/google/registry/model/domain/allocate/AllocateCreateExtension.java +++ b/java/google/registry/model/domain/allocate/AllocateCreateExtension.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.allocate; +package google.registry.model.domain.allocate; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.domain.launch.LaunchNotice; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.ImmutableObject; +import google.registry.model.domain.launch.LaunchNotice; +import google.registry.model.eppinput.EppInput.CommandExtension; import org.joda.time.DateTime; diff --git a/java/google/registry/model/domain/allocate/package-info.java b/java/google/registry/model/domain/allocate/package-info.java index 4306a8f9b..59a6360fe 100644 --- a/java/google/registry/model/domain/allocate/package-info.java +++ b/java/google/registry/model/domain/allocate/package-info.java @@ -18,9 +18,9 @@ elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) @XmlJavaTypeAdapter(UtcDateTimeAdapter.class) -package com.google.domain.registry.model.domain.allocate; +package google.registry.model.domain.allocate; -import com.google.domain.registry.xml.UtcDateTimeAdapter; +import google.registry.xml.UtcDateTimeAdapter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/domain/fee/BaseFee.java b/java/google/registry/model/domain/fee/BaseFee.java index af2b81b5f..fe0014a27 100644 --- a/java/google/registry/model/domain/fee/BaseFee.java +++ b/java/google/registry/model/domain/fee/BaseFee.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; import static com.google.common.base.MoreObjects.firstNonNull; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.xml.PeriodAdapter; +import google.registry.model.ImmutableObject; +import google.registry.xml.PeriodAdapter; import org.joda.time.Period; diff --git a/java/google/registry/model/domain/fee/BaseFeeCommand.java b/java/google/registry/model/domain/fee/BaseFeeCommand.java index ea65983f2..363c6852b 100644 --- a/java/google/registry/model/domain/fee/BaseFeeCommand.java +++ b/java/google/registry/model/domain/fee/BaseFeeCommand.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import com.google.domain.registry.model.ImmutableObject; +import google.registry.model.ImmutableObject; import org.joda.money.CurrencyUnit; diff --git a/java/google/registry/model/domain/fee/BaseFeeCommandResponse.java b/java/google/registry/model/domain/fee/BaseFeeCommandResponse.java index 459f28cd9..61bb6172d 100644 --- a/java/google/registry/model/domain/fee/BaseFeeCommandResponse.java +++ b/java/google/registry/model/domain/fee/BaseFeeCommandResponse.java @@ -12,11 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.Buildable.GenericBuilder; -import com.google.domain.registry.model.ImmutableObject; + +import google.registry.model.Buildable.GenericBuilder; +import google.registry.model.ImmutableObject; import org.joda.money.CurrencyUnit; diff --git a/java/google/registry/model/domain/fee/BaseFeeRequest.java b/java/google/registry/model/domain/fee/BaseFeeRequest.java index 50a5e2eeb..4d345427c 100644 --- a/java/google/registry/model/domain/fee/BaseFeeRequest.java +++ b/java/google/registry/model/domain/fee/BaseFeeRequest.java @@ -12,11 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; import com.google.common.base.Optional; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.domain.Period; + +import google.registry.model.ImmutableObject; +import google.registry.model.domain.Period; import org.joda.money.CurrencyUnit; diff --git a/java/google/registry/model/domain/fee/BaseFeeResponse.java b/java/google/registry/model/domain/fee/BaseFeeResponse.java index 81c10d65e..912c81778 100644 --- a/java/google/registry/model/domain/fee/BaseFeeResponse.java +++ b/java/google/registry/model/domain/fee/BaseFeeResponse.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import static com.google.domain.registry.util.CollectionUtils.forceEmptyToNull; +import static google.registry.util.CollectionUtils.forceEmptyToNull; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.Buildable.GenericBuilder; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.domain.Period; + +import google.registry.model.Buildable.GenericBuilder; +import google.registry.model.ImmutableObject; +import google.registry.model.domain.Period; import org.joda.money.CurrencyUnit; diff --git a/java/google/registry/model/domain/fee/Credit.java b/java/google/registry/model/domain/fee/Credit.java index d313c2ebd..1e34d3c36 100644 --- a/java/google/registry/model/domain/fee/Credit.java +++ b/java/google/registry/model/domain/fee/Credit.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/model/domain/fee/Fee.java b/java/google/registry/model/domain/fee/Fee.java index 47f2fca96..40b5cfde3 100644 --- a/java/google/registry/model/domain/fee/Fee.java +++ b/java/google/registry/model/domain/fee/Fee.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/model/domain/fee/FeeCheckExtension.java b/java/google/registry/model/domain/fee/FeeCheckExtension.java index 1ac19f559..eb1e2e01a 100644 --- a/java/google/registry/model/domain/fee/FeeCheckExtension.java +++ b/java/google/registry/model/domain/fee/FeeCheckExtension.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; + +import google.registry.model.ImmutableObject; +import google.registry.model.domain.Period; +import google.registry.model.eppinput.EppInput.CommandExtension; import java.util.Set; diff --git a/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java b/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java index 9cf19edd4..123450808 100644 --- a/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java +++ b/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; + +import google.registry.model.ImmutableObject; +import google.registry.model.eppoutput.Response.ResponseExtension; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/java/google/registry/model/domain/fee/FeeCommandDescriptor.java b/java/google/registry/model/domain/fee/FeeCommandDescriptor.java index 0849b0b24..cb9e4bf8f 100644 --- a/java/google/registry/model/domain/fee/FeeCommandDescriptor.java +++ b/java/google/registry/model/domain/fee/FeeCommandDescriptor.java @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; import com.google.common.base.CharMatcher; -import com.google.domain.registry.model.ImmutableObject; + +import google.registry.model.ImmutableObject; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlValue; diff --git a/java/google/registry/model/domain/fee/FeeCreateExtension.java b/java/google/registry/model/domain/fee/FeeCreateExtension.java index ececbee51..a06b14424 100644 --- a/java/google/registry/model/domain/fee/FeeCreateExtension.java +++ b/java/google/registry/model/domain/fee/FeeCreateExtension.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.eppinput.EppInput.CommandExtension; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/domain/fee/FeeCreateResponseExtension.java b/java/google/registry/model/domain/fee/FeeCreateResponseExtension.java index b67f3a746..eb884121d 100644 --- a/java/google/registry/model/domain/fee/FeeCreateResponseExtension.java +++ b/java/google/registry/model/domain/fee/FeeCreateResponseExtension.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.eppoutput.Response.ResponseExtension; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java b/java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java index e8e9d5afd..072972532 100644 --- a/java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java +++ b/java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.Buildable.GenericBuilder; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; + +import google.registry.model.Buildable.GenericBuilder; +import google.registry.model.ImmutableObject; +import google.registry.model.eppoutput.Response.ResponseExtension; import org.joda.money.CurrencyUnit; diff --git a/java/google/registry/model/domain/fee/FeeInfoExtension.java b/java/google/registry/model/domain/fee/FeeInfoExtension.java index eea44ba40..7c6ed852d 100644 --- a/java/google/registry/model/domain/fee/FeeInfoExtension.java +++ b/java/google/registry/model/domain/fee/FeeInfoExtension.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.eppinput.EppInput.CommandExtension; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/domain/fee/FeeInfoResponseExtension.java b/java/google/registry/model/domain/fee/FeeInfoResponseExtension.java index 5c464275b..e2627dae8 100644 --- a/java/google/registry/model/domain/fee/FeeInfoResponseExtension.java +++ b/java/google/registry/model/domain/fee/FeeInfoResponseExtension.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.eppoutput.Response.ResponseExtension; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/domain/fee/FeeRenewExtension.java b/java/google/registry/model/domain/fee/FeeRenewExtension.java index 8a6dafee5..782134bae 100644 --- a/java/google/registry/model/domain/fee/FeeRenewExtension.java +++ b/java/google/registry/model/domain/fee/FeeRenewExtension.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.eppinput.EppInput.CommandExtension; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/domain/fee/FeeRenewResponseExtension.java b/java/google/registry/model/domain/fee/FeeRenewResponseExtension.java index 475aa7004..c50e3e57f 100644 --- a/java/google/registry/model/domain/fee/FeeRenewResponseExtension.java +++ b/java/google/registry/model/domain/fee/FeeRenewResponseExtension.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.eppoutput.Response.ResponseExtension; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/domain/fee/FeeTransferExtension.java b/java/google/registry/model/domain/fee/FeeTransferExtension.java index f7b333bd3..c7f936691 100644 --- a/java/google/registry/model/domain/fee/FeeTransferExtension.java +++ b/java/google/registry/model/domain/fee/FeeTransferExtension.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.eppinput.EppInput.CommandExtension; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/domain/fee/FeeTransferResponseExtension.java b/java/google/registry/model/domain/fee/FeeTransferResponseExtension.java index e6891aa93..8bb652bb7 100644 --- a/java/google/registry/model/domain/fee/FeeTransferResponseExtension.java +++ b/java/google/registry/model/domain/fee/FeeTransferResponseExtension.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.eppoutput.Response.ResponseExtension; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/domain/fee/FeeUpdateExtension.java b/java/google/registry/model/domain/fee/FeeUpdateExtension.java index 2471acf8d..2e1a3867c 100644 --- a/java/google/registry/model/domain/fee/FeeUpdateExtension.java +++ b/java/google/registry/model/domain/fee/FeeUpdateExtension.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.eppinput.EppInput.CommandExtension; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java b/java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java index b7f7fc899..55001cf46 100644 --- a/java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java +++ b/java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.eppoutput.Response.ResponseExtension; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/domain/fee/package-info.java b/java/google/registry/model/domain/fee/package-info.java index f8384b501..5015790f3 100644 --- a/java/google/registry/model/domain/fee/package-info.java +++ b/java/google/registry/model/domain/fee/package-info.java @@ -18,9 +18,9 @@ elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) @XmlJavaTypeAdapter(CurrencyUnitAdapter.class) -package com.google.domain.registry.model.domain.fee; +package google.registry.model.domain.fee; -import com.google.domain.registry.model.translators.CurrencyUnitAdapter; +import google.registry.model.translators.CurrencyUnitAdapter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/domain/launch/ApplicationIdTargetExtension.java b/java/google/registry/model/domain/launch/ApplicationIdTargetExtension.java index 6b869e0fe..455af99ad 100644 --- a/java/google/registry/model/domain/launch/ApplicationIdTargetExtension.java +++ b/java/google/registry/model/domain/launch/ApplicationIdTargetExtension.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.eppinput.EppInput.CommandExtension; /** Marker interface for EPP extensions which override the EPP notion of id with their own. */ public interface ApplicationIdTargetExtension extends CommandExtension { diff --git a/java/google/registry/model/domain/launch/ApplicationStatus.java b/java/google/registry/model/domain/launch/ApplicationStatus.java index 0613250fe..893b7cb38 100644 --- a/java/google/registry/model/domain/launch/ApplicationStatus.java +++ b/java/google/registry/model/domain/launch/ApplicationStatus.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; import static com.google.common.base.CaseFormat.LOWER_CAMEL; import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; -import com.google.domain.registry.model.translators.EnumToAttributeAdapter; -import com.google.domain.registry.model.translators.EnumToAttributeAdapter.EppEnum; +import google.registry.model.translators.EnumToAttributeAdapter; +import google.registry.model.translators.EnumToAttributeAdapter.EppEnum; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; diff --git a/java/google/registry/model/domain/launch/LaunchCheckExtension.java b/java/google/registry/model/domain/launch/LaunchCheckExtension.java index eea49dcc1..6ffe74abf 100644 --- a/java/google/registry/model/domain/launch/LaunchCheckExtension.java +++ b/java/google/registry/model/domain/launch/LaunchCheckExtension.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; import static com.google.common.base.MoreObjects.firstNonNull; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.ImmutableObject; +import google.registry.model.eppinput.EppInput.CommandExtension; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java b/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java index eb7b67ad9..179069fef 100644 --- a/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java +++ b/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; + +import google.registry.model.ImmutableObject; +import google.registry.model.eppoutput.Response.ResponseExtension; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/java/google/registry/model/domain/launch/LaunchCreateExtension.java b/java/google/registry/model/domain/launch/LaunchCreateExtension.java index 61b0ff396..8befca779 100644 --- a/java/google/registry/model/domain/launch/LaunchCreateExtension.java +++ b/java/google/registry/model/domain/launch/LaunchCreateExtension.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; -import com.google.domain.registry.model.smd.AbstractSignedMark; -import com.google.domain.registry.model.smd.EncodedSignedMark; -import com.google.domain.registry.model.smd.SignedMark; + +import google.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.smd.AbstractSignedMark; +import google.registry.model.smd.EncodedSignedMark; +import google.registry.model.smd.SignedMark; import java.util.List; diff --git a/java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java b/java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java index 6f7b1deac..3324a77f3 100644 --- a/java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java +++ b/java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.eppoutput.Response.ResponseExtension; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/domain/launch/LaunchDeleteExtension.java b/java/google/registry/model/domain/launch/LaunchDeleteExtension.java index 1457f0c5f..9c354c4c6 100644 --- a/java/google/registry/model/domain/launch/LaunchDeleteExtension.java +++ b/java/google/registry/model/domain/launch/LaunchDeleteExtension.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; import javax.xml.bind.annotation.XmlRootElement; diff --git a/java/google/registry/model/domain/launch/LaunchExtension.java b/java/google/registry/model/domain/launch/LaunchExtension.java index d1d8910fc..ec154f565 100644 --- a/java/google/registry/model/domain/launch/LaunchExtension.java +++ b/java/google/registry/model/domain/launch/LaunchExtension.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; -import com.google.domain.registry.model.Buildable.GenericBuilder; -import com.google.domain.registry.model.ImmutableObject; +import google.registry.model.Buildable.GenericBuilder; +import google.registry.model.ImmutableObject; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; diff --git a/java/google/registry/model/domain/launch/LaunchInfoExtension.java b/java/google/registry/model/domain/launch/LaunchInfoExtension.java index be4c66ba1..6028093bd 100644 --- a/java/google/registry/model/domain/launch/LaunchInfoExtension.java +++ b/java/google/registry/model/domain/launch/LaunchInfoExtension.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; diff --git a/java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java b/java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java index b6993563e..f4482783b 100644 --- a/java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java +++ b/java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; -import com.google.domain.registry.model.mark.Mark; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.mark.Mark; + import java.util.List; import javax.xml.bind.annotation.XmlElement; diff --git a/java/google/registry/model/domain/launch/LaunchNotice.java b/java/google/registry/model/domain/launch/LaunchNotice.java index a6f5c7a11..4497b550d 100644 --- a/java/google/registry/model/domain/launch/LaunchNotice.java +++ b/java/google/registry/model/domain/launch/LaunchNotice.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.hash.Hashing.crc32; @@ -23,12 +23,13 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import com.google.common.base.CharMatcher; import com.google.common.base.Optional; import com.google.common.primitives.Ints; -import com.google.domain.registry.model.ImmutableObject; import com.googlecode.objectify.annotation.Embed; import com.googlecode.objectify.annotation.IgnoreSave; import com.googlecode.objectify.condition.IfNull; +import google.registry.model.ImmutableObject; + import org.joda.time.DateTime; import javax.xml.bind.annotation.XmlAttribute; diff --git a/java/google/registry/model/domain/launch/LaunchPhase.java b/java/google/registry/model/domain/launch/LaunchPhase.java index e5051905e..266ce50aa 100644 --- a/java/google/registry/model/domain/launch/LaunchPhase.java +++ b/java/google/registry/model/domain/launch/LaunchPhase.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; import static com.google.common.base.CaseFormat.LOWER_CAMEL; import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; -import static com.google.domain.registry.util.TypeUtils.getTypesafeEnumMapping; +import static google.registry.util.TypeUtils.getTypesafeEnumMapping; import static java.util.Objects.hash; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.ImmutableObject; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.ImmutableObject; + import java.util.Map; import java.util.Map.Entry; import java.util.Objects; diff --git a/java/google/registry/model/domain/launch/LaunchUpdateExtension.java b/java/google/registry/model/domain/launch/LaunchUpdateExtension.java index 9309a13cc..fe9a181b2 100644 --- a/java/google/registry/model/domain/launch/LaunchUpdateExtension.java +++ b/java/google/registry/model/domain/launch/LaunchUpdateExtension.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; import javax.xml.bind.annotation.XmlRootElement; diff --git a/java/google/registry/model/domain/launch/package-info.java b/java/google/registry/model/domain/launch/package-info.java index 4bef78c24..868c053da 100644 --- a/java/google/registry/model/domain/launch/package-info.java +++ b/java/google/registry/model/domain/launch/package-info.java @@ -18,9 +18,9 @@ elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) @XmlJavaTypeAdapter(UtcDateTimeAdapter.class) -package com.google.domain.registry.model.domain.launch; +package google.registry.model.domain.launch; -import com.google.domain.registry.xml.UtcDateTimeAdapter; +import google.registry.xml.UtcDateTimeAdapter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/domain/metadata/MetadataExtension.java b/java/google/registry/model/domain/metadata/MetadataExtension.java index 1c4fbb76a..6a04975ef 100644 --- a/java/google/registry/model/domain/metadata/MetadataExtension.java +++ b/java/google/registry/model/domain/metadata/MetadataExtension.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.metadata; +package google.registry.model.domain.metadata; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.ImmutableObject; +import google.registry.model.eppinput.EppInput.CommandExtension; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/java/google/registry/model/domain/metadata/package-info.java b/java/google/registry/model/domain/metadata/package-info.java index 98785e37d..ced64f681 100644 --- a/java/google/registry/model/domain/metadata/package-info.java +++ b/java/google/registry/model/domain/metadata/package-info.java @@ -17,7 +17,7 @@ xmlns = @XmlNs(prefix = "metadata", namespaceURI = "urn:google:params:xml:ns:metadata-1.0"), elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) -package com.google.domain.registry.model.domain.metadata; +package google.registry.model.domain.metadata; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/domain/package-info.java b/java/google/registry/model/domain/package-info.java index 4e3a32ae9..c1e8960f4 100644 --- a/java/google/registry/model/domain/package-info.java +++ b/java/google/registry/model/domain/package-info.java @@ -22,12 +22,12 @@ @XmlJavaTypeAdapter(ContactReferenceUnionAdapter.class), @XmlJavaTypeAdapter(HostReferenceUnionAdapter.class), @XmlJavaTypeAdapter(DateAdapter.class)}) -package com.google.domain.registry.model.domain; +package google.registry.model.domain; -import com.google.domain.registry.model.domain.ReferenceUnion.ContactReferenceUnionAdapter; -import com.google.domain.registry.model.domain.ReferenceUnion.HostReferenceUnionAdapter; -import com.google.domain.registry.xml.DateAdapter; -import com.google.domain.registry.xml.UtcDateTimeAdapter; +import google.registry.model.domain.ReferenceUnion.ContactReferenceUnionAdapter; +import google.registry.model.domain.ReferenceUnion.HostReferenceUnionAdapter; +import google.registry.xml.DateAdapter; +import google.registry.xml.UtcDateTimeAdapter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/domain/rgp/GracePeriodStatus.java b/java/google/registry/model/domain/rgp/GracePeriodStatus.java index 4377226ec..f36574622 100644 --- a/java/google/registry/model/domain/rgp/GracePeriodStatus.java +++ b/java/google/registry/model/domain/rgp/GracePeriodStatus.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.rgp; +package google.registry.model.domain.rgp; -import com.google.domain.registry.model.translators.EnumToAttributeAdapter; -import com.google.domain.registry.model.translators.EnumToAttributeAdapter.EppEnum; +import google.registry.model.translators.EnumToAttributeAdapter; +import google.registry.model.translators.EnumToAttributeAdapter.EppEnum; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; diff --git a/java/google/registry/model/domain/rgp/RestoreCommand.java b/java/google/registry/model/domain/rgp/RestoreCommand.java index e8fc8a2bd..6887f1fc4 100644 --- a/java/google/registry/model/domain/rgp/RestoreCommand.java +++ b/java/google/registry/model/domain/rgp/RestoreCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.rgp; +package google.registry.model.domain.rgp; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlEnum; diff --git a/java/google/registry/model/domain/rgp/RgpInfoExtension.java b/java/google/registry/model/domain/rgp/RgpInfoExtension.java index d063f433a..170ac1abe 100644 --- a/java/google/registry/model/domain/rgp/RgpInfoExtension.java +++ b/java/google/registry/model/domain/rgp/RgpInfoExtension.java @@ -12,11 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.rgp; +package google.registry.model.domain.rgp; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; + +import google.registry.model.ImmutableObject; +import google.registry.model.eppoutput.Response.ResponseExtension; import javax.xml.bind.annotation.XmlRootElement; diff --git a/java/google/registry/model/domain/rgp/RgpUpdateExtension.java b/java/google/registry/model/domain/rgp/RgpUpdateExtension.java index 9bd99073e..83a07bb7c 100644 --- a/java/google/registry/model/domain/rgp/RgpUpdateExtension.java +++ b/java/google/registry/model/domain/rgp/RgpUpdateExtension.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.rgp; +package google.registry.model.domain.rgp; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; +import google.registry.model.ImmutableObject; +import google.registry.model.eppinput.EppInput.CommandExtension; import javax.xml.bind.annotation.XmlRootElement; diff --git a/java/google/registry/model/domain/rgp/package-info.java b/java/google/registry/model/domain/rgp/package-info.java index a5a7ecd20..c44e40173 100644 --- a/java/google/registry/model/domain/rgp/package-info.java +++ b/java/google/registry/model/domain/rgp/package-info.java @@ -17,7 +17,7 @@ xmlns = @XmlNs(prefix = "rgp", namespaceURI = "urn:ietf:params:xml:ns:rgp-1.0"), elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) -package com.google.domain.registry.model.domain.rgp; +package google.registry.model.domain.rgp; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/domain/secdns/DelegationSignerData.java b/java/google/registry/model/domain/secdns/DelegationSignerData.java index 56e221330..5007019df 100644 --- a/java/google/registry/model/domain/secdns/DelegationSignerData.java +++ b/java/google/registry/model/domain/secdns/DelegationSignerData.java @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.secdns; +package google.registry.model.domain.secdns; import com.google.common.annotations.VisibleForTesting; -import com.google.domain.registry.model.ImmutableObject; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.ImmutableObject; + import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.HexBinaryAdapter; diff --git a/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java b/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java index 03b7b6aaf..441943b85 100644 --- a/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java +++ b/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.secdns; +package google.registry.model.domain.secdns; -import static com.google.domain.registry.util.CollectionUtils.nullSafeImmutableCopy; +import static google.registry.util.CollectionUtils.nullSafeImmutableCopy; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; + +import google.registry.model.ImmutableObject; +import google.registry.model.eppinput.EppInput.CommandExtension; import java.util.Set; diff --git a/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java b/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java index 4b0386014..70d43b697 100644 --- a/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java +++ b/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.secdns; +package google.registry.model.domain.secdns; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.ImmutableObject; +import google.registry.model.eppoutput.Response.ResponseExtension; + import javax.xml.bind.annotation.XmlRootElement; /** The EPP secDNS extension to be returned with domain info commands. */ diff --git a/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java b/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java index 6d65f5cbf..a72e15c3a 100644 --- a/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java +++ b/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain.secdns; +package google.registry.model.domain.secdns; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; + +import google.registry.model.ImmutableObject; +import google.registry.model.eppinput.EppInput.CommandExtension; import java.util.Set; diff --git a/java/google/registry/model/domain/secdns/package-info.java b/java/google/registry/model/domain/secdns/package-info.java index bfff96a06..402e82b26 100644 --- a/java/google/registry/model/domain/secdns/package-info.java +++ b/java/google/registry/model/domain/secdns/package-info.java @@ -17,7 +17,7 @@ xmlns = @XmlNs(prefix = "secDNS", namespaceURI = "urn:ietf:params:xml:ns:secDNS-1.1"), elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) -package com.google.domain.registry.model.domain.secdns; +package google.registry.model.domain.secdns; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/eppcommon/Address.java b/java/google/registry/model/eppcommon/Address.java index 8794db589..618c756e8 100644 --- a/java/google/registry/model/eppcommon/Address.java +++ b/java/google/registry/model/eppcommon/Address.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppcommon; +package google.registry.model.eppcommon; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.JsonMapBuilder; -import com.google.domain.registry.model.Jsonifiable; + +import google.registry.model.Buildable; +import google.registry.model.ImmutableObject; +import google.registry.model.JsonMapBuilder; +import google.registry.model.Jsonifiable; import java.util.List; import java.util.Map; @@ -39,9 +40,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; * This is the "addrType" type from {@link "http://tools.ietf.org/html/rfc5733"}. It also matches * the "addrType" type from {@link "http://tools.ietf.org/html/draft-lozano-tmch-smd"}. * - * @see com.google.domain.registry.model.contact.ContactAddress - * @see com.google.domain.registry.model.mark.MarkAddress - * @see com.google.domain.registry.model.registrar.RegistrarAddress + * @see google.registry.model.contact.ContactAddress + * @see google.registry.model.mark.MarkAddress + * @see google.registry.model.registrar.RegistrarAddress */ @XmlTransient public class Address extends ImmutableObject implements Jsonifiable { diff --git a/java/google/registry/model/eppcommon/AuthInfo.java b/java/google/registry/model/eppcommon/AuthInfo.java index 60f660884..f8fd3a253 100644 --- a/java/google/registry/model/eppcommon/AuthInfo.java +++ b/java/google/registry/model/eppcommon/AuthInfo.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppcommon; - -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.ImmutableObject; +package google.registry.model.eppcommon; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.EppResource; +import google.registry.model.ImmutableObject; + import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; diff --git a/java/google/registry/model/eppcommon/PhoneNumber.java b/java/google/registry/model/eppcommon/PhoneNumber.java index 9f21b1038..5b75d9c2d 100644 --- a/java/google/registry/model/eppcommon/PhoneNumber.java +++ b/java/google/registry/model/eppcommon/PhoneNumber.java @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppcommon; +package google.registry.model.eppcommon; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.annotations.VisibleForTesting; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.ImmutableObject; + +import google.registry.model.Buildable; +import google.registry.model.ImmutableObject; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlTransient; @@ -40,8 +41,8 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; * number. An optional "x" attribute is provided to note telephone extension information." * * - * @see com.google.domain.registry.model.contact.ContactPhoneNumber - * @see com.google.domain.registry.model.mark.MarkPhoneNumber + * @see google.registry.model.contact.ContactPhoneNumber + * @see google.registry.model.mark.MarkPhoneNumber */ @XmlTransient public class PhoneNumber extends ImmutableObject { diff --git a/java/google/registry/model/eppcommon/PresenceMarker.java b/java/google/registry/model/eppcommon/PresenceMarker.java index 478204c4c..a4a949fb1 100644 --- a/java/google/registry/model/eppcommon/PresenceMarker.java +++ b/java/google/registry/model/eppcommon/PresenceMarker.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppcommon; - -import com.google.domain.registry.model.ImmutableObject; +package google.registry.model.eppcommon; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.ImmutableObject; + import java.io.Serializable; import javax.xml.bind.annotation.XmlTransient; diff --git a/java/google/registry/model/eppcommon/ProtocolDefinition.java b/java/google/registry/model/eppcommon/ProtocolDefinition.java index 348305b94..a905b8cba 100644 --- a/java/google/registry/model/eppcommon/ProtocolDefinition.java +++ b/java/google/registry/model/eppcommon/ProtocolDefinition.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppcommon; +package google.registry.model.eppcommon; import static com.google.common.collect.Maps.uniqueIndex; @@ -21,13 +21,14 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.domain.allocate.AllocateCreateExtension; -import com.google.domain.registry.model.domain.fee.FeeCheckExtension; -import com.google.domain.registry.model.domain.launch.LaunchCreateExtension; -import com.google.domain.registry.model.domain.metadata.MetadataExtension; -import com.google.domain.registry.model.domain.rgp.RgpUpdateExtension; -import com.google.domain.registry.model.domain.secdns.SecDnsCreateExtension; -import com.google.domain.registry.model.eppinput.EppInput.CommandExtension; + +import google.registry.model.domain.allocate.AllocateCreateExtension; +import google.registry.model.domain.fee.FeeCheckExtension; +import google.registry.model.domain.launch.LaunchCreateExtension; +import google.registry.model.domain.metadata.MetadataExtension; +import google.registry.model.domain.rgp.RgpUpdateExtension; +import google.registry.model.domain.secdns.SecDnsCreateExtension; +import google.registry.model.eppinput.EppInput.CommandExtension; import java.util.EnumSet; import java.util.Set; diff --git a/java/google/registry/model/eppcommon/StatusValue.java b/java/google/registry/model/eppcommon/StatusValue.java index 0ef9c6e03..eea1cfd89 100644 --- a/java/google/registry/model/eppcommon/StatusValue.java +++ b/java/google/registry/model/eppcommon/StatusValue.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppcommon; +package google.registry.model.eppcommon; import static com.google.common.base.CaseFormat.LOWER_CAMEL; import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; import static com.google.common.base.Strings.nullToEmpty; -import com.google.domain.registry.model.translators.EnumToAttributeAdapter.EppEnum; -import com.google.domain.registry.model.translators.StatusValueAdapter; +import google.registry.model.translators.EnumToAttributeAdapter.EppEnum; +import google.registry.model.translators.StatusValueAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; diff --git a/java/google/registry/model/eppcommon/Trid.java b/java/google/registry/model/eppcommon/Trid.java index 20309e98b..19e069762 100644 --- a/java/google/registry/model/eppcommon/Trid.java +++ b/java/google/registry/model/eppcommon/Trid.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppcommon; +package google.registry.model.eppcommon; import com.google.common.annotations.VisibleForTesting; import com.google.common.io.BaseEncoding; -import com.google.domain.registry.model.ImmutableObject; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.ImmutableObject; + import java.nio.ByteBuffer; import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; diff --git a/java/google/registry/model/eppcommon/package-info.java b/java/google/registry/model/eppcommon/package-info.java index 3b53bb617..e5a1f42e2 100644 --- a/java/google/registry/model/eppcommon/package-info.java +++ b/java/google/registry/model/eppcommon/package-info.java @@ -19,4 +19,4 @@ * such, no default namespace is declared in this package, and all objects in this package should be * declared XmlTransient. */ -package com.google.domain.registry.model.eppcommon; +package google.registry.model.eppcommon; diff --git a/java/google/registry/model/eppinput/EppInput.java b/java/google/registry/model/eppinput/EppInput.java index 427cdd675..61a8b160f 100644 --- a/java/google/registry/model/eppinput/EppInput.java +++ b/java/google/registry/model/eppinput/EppInput.java @@ -12,36 +12,37 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppinput; +package google.registry.model.eppinput; -import static com.google.domain.registry.util.CollectionUtils.nullSafeImmutableCopy; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullSafeImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.contact.ContactCommand; -import com.google.domain.registry.model.domain.DomainCommand; -import com.google.domain.registry.model.domain.allocate.AllocateCreateExtension; -import com.google.domain.registry.model.domain.fee.FeeCheckExtension; -import com.google.domain.registry.model.domain.fee.FeeCreateExtension; -import com.google.domain.registry.model.domain.fee.FeeInfoExtension; -import com.google.domain.registry.model.domain.fee.FeeRenewExtension; -import com.google.domain.registry.model.domain.fee.FeeTransferExtension; -import com.google.domain.registry.model.domain.fee.FeeUpdateExtension; -import com.google.domain.registry.model.domain.launch.LaunchCheckExtension; -import com.google.domain.registry.model.domain.launch.LaunchCreateExtension; -import com.google.domain.registry.model.domain.launch.LaunchDeleteExtension; -import com.google.domain.registry.model.domain.launch.LaunchInfoExtension; -import com.google.domain.registry.model.domain.launch.LaunchUpdateExtension; -import com.google.domain.registry.model.domain.metadata.MetadataExtension; -import com.google.domain.registry.model.domain.rgp.RgpUpdateExtension; -import com.google.domain.registry.model.domain.secdns.SecDnsCreateExtension; -import com.google.domain.registry.model.domain.secdns.SecDnsUpdateExtension; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceCheck; -import com.google.domain.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import com.google.domain.registry.model.host.HostCommand; + +import google.registry.model.ImmutableObject; +import google.registry.model.contact.ContactCommand; +import google.registry.model.domain.DomainCommand; +import google.registry.model.domain.allocate.AllocateCreateExtension; +import google.registry.model.domain.fee.FeeCheckExtension; +import google.registry.model.domain.fee.FeeCreateExtension; +import google.registry.model.domain.fee.FeeInfoExtension; +import google.registry.model.domain.fee.FeeRenewExtension; +import google.registry.model.domain.fee.FeeTransferExtension; +import google.registry.model.domain.fee.FeeUpdateExtension; +import google.registry.model.domain.launch.LaunchCheckExtension; +import google.registry.model.domain.launch.LaunchCreateExtension; +import google.registry.model.domain.launch.LaunchDeleteExtension; +import google.registry.model.domain.launch.LaunchInfoExtension; +import google.registry.model.domain.launch.LaunchUpdateExtension; +import google.registry.model.domain.metadata.MetadataExtension; +import google.registry.model.domain.rgp.RgpUpdateExtension; +import google.registry.model.domain.secdns.SecDnsCreateExtension; +import google.registry.model.domain.secdns.SecDnsUpdateExtension; +import google.registry.model.eppinput.ResourceCommand.ResourceCheck; +import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import google.registry.model.host.HostCommand; import java.util.List; import java.util.Set; diff --git a/java/google/registry/model/eppinput/ResourceCommand.java b/java/google/registry/model/eppinput/ResourceCommand.java index 8dfb35c43..63fbf840a 100644 --- a/java/google/registry/model/eppinput/ResourceCommand.java +++ b/java/google/registry/model/eppinput/ResourceCommand.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppinput; +package google.registry.model.eppinput; import static com.google.common.collect.Sets.intersection; -import static com.google.domain.registry.util.CollectionUtils.nullSafeImmutableCopy; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullSafeImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.Buildable.Builder; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppcommon.AuthInfo; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; + +import google.registry.model.Buildable.Builder; +import google.registry.model.EppResource; +import google.registry.model.ImmutableObject; +import google.registry.model.eppcommon.AuthInfo; +import google.registry.model.eppcommon.StatusValue; +import google.registry.util.TypeUtils.TypeInstantiator; import java.util.List; import java.util.Set; diff --git a/java/google/registry/model/eppinput/package-info.java b/java/google/registry/model/eppinput/package-info.java index f68e4615e..100b99149 100644 --- a/java/google/registry/model/eppinput/package-info.java +++ b/java/google/registry/model/eppinput/package-info.java @@ -17,7 +17,7 @@ xmlns = @XmlNs(prefix = "", namespaceURI = "urn:ietf:params:xml:ns:epp-1.0"), elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) -package com.google.domain.registry.model.eppinput; +package google.registry.model.eppinput; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/eppoutput/CheckData.java b/java/google/registry/model/eppoutput/CheckData.java index 86d77af23..ba6debf0d 100644 --- a/java/google/registry/model/eppoutput/CheckData.java +++ b/java/google/registry/model/eppoutput/CheckData.java @@ -12,11 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppoutput; +package google.registry.model.eppoutput; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppoutput.Response.ResponseData; + +import google.registry.model.ImmutableObject; +import google.registry.model.eppoutput.Response.ResponseData; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/java/google/registry/model/eppoutput/CreateData.java b/java/google/registry/model/eppoutput/CreateData.java index a6334d2b6..f79b202f5 100644 --- a/java/google/registry/model/eppoutput/CreateData.java +++ b/java/google/registry/model/eppoutput/CreateData.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppoutput; +package google.registry.model.eppoutput; -import com.google.domain.registry.model.eppoutput.Response.ResponseData; +import google.registry.model.eppoutput.Response.ResponseData; import org.joda.time.DateTime; diff --git a/java/google/registry/model/eppoutput/EppOutput.java b/java/google/registry/model/eppoutput/EppOutput.java index ee80b8958..f80200ea2 100644 --- a/java/google/registry/model/eppoutput/EppOutput.java +++ b/java/google/registry/model/eppoutput/EppOutput.java @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppoutput; +package google.registry.model.eppoutput; import com.google.common.annotations.VisibleForTesting; -import com.google.domain.registry.model.ImmutableObject; + +import google.registry.model.ImmutableObject; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; diff --git a/java/google/registry/model/eppoutput/Greeting.java b/java/google/registry/model/eppoutput/Greeting.java index 0316a97ac..fbc6fa18e 100644 --- a/java/google/registry/model/eppoutput/Greeting.java +++ b/java/google/registry/model/eppoutput/Greeting.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppoutput; +package google.registry.model.eppoutput; import static org.joda.time.DateTimeZone.UTC; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppcommon.PresenceMarker; -import com.google.domain.registry.model.eppcommon.ProtocolDefinition; -import com.google.domain.registry.model.eppoutput.EppOutput.ResponseOrGreeting; +import google.registry.model.ImmutableObject; +import google.registry.model.eppcommon.PresenceMarker; +import google.registry.model.eppcommon.ProtocolDefinition; +import google.registry.model.eppoutput.EppOutput.ResponseOrGreeting; import org.joda.time.DateTime; diff --git a/java/google/registry/model/eppoutput/Response.java b/java/google/registry/model/eppoutput/Response.java index 24234ddb4..069727e6e 100644 --- a/java/google/registry/model/eppoutput/Response.java +++ b/java/google/registry/model/eppoutput/Response.java @@ -12,41 +12,42 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppoutput; +package google.registry.model.eppoutput; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainRenewData; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.fee.FeeCheckResponseExtension; -import com.google.domain.registry.model.domain.fee.FeeCreateResponseExtension; -import com.google.domain.registry.model.domain.fee.FeeDeleteResponseExtension; -import com.google.domain.registry.model.domain.fee.FeeInfoResponseExtension; -import com.google.domain.registry.model.domain.fee.FeeRenewResponseExtension; -import com.google.domain.registry.model.domain.fee.FeeTransferResponseExtension; -import com.google.domain.registry.model.domain.fee.FeeUpdateResponseExtension; -import com.google.domain.registry.model.domain.launch.LaunchCheckResponseExtension; -import com.google.domain.registry.model.domain.launch.LaunchCreateResponseExtension; -import com.google.domain.registry.model.domain.launch.LaunchInfoResponseExtension; -import com.google.domain.registry.model.domain.rgp.RgpInfoExtension; -import com.google.domain.registry.model.domain.secdns.SecDnsInfoExtension; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.eppoutput.CheckData.ContactCheckData; -import com.google.domain.registry.model.eppoutput.CheckData.DomainCheckData; -import com.google.domain.registry.model.eppoutput.CheckData.HostCheckData; -import com.google.domain.registry.model.eppoutput.CreateData.ContactCreateData; -import com.google.domain.registry.model.eppoutput.CreateData.DomainCreateData; -import com.google.domain.registry.model.eppoutput.CreateData.HostCreateData; -import com.google.domain.registry.model.eppoutput.EppOutput.ResponseOrGreeting; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.poll.MessageQueueInfo; -import com.google.domain.registry.model.poll.PendingActionNotificationResponse.ContactPendingActionNotificationResponse; -import com.google.domain.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; -import com.google.domain.registry.model.transfer.TransferResponse.ContactTransferResponse; -import com.google.domain.registry.model.transfer.TransferResponse.DomainTransferResponse; + +import google.registry.model.Buildable; +import google.registry.model.ImmutableObject; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainRenewData; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.fee.FeeCheckResponseExtension; +import google.registry.model.domain.fee.FeeCreateResponseExtension; +import google.registry.model.domain.fee.FeeDeleteResponseExtension; +import google.registry.model.domain.fee.FeeInfoResponseExtension; +import google.registry.model.domain.fee.FeeRenewResponseExtension; +import google.registry.model.domain.fee.FeeTransferResponseExtension; +import google.registry.model.domain.fee.FeeUpdateResponseExtension; +import google.registry.model.domain.launch.LaunchCheckResponseExtension; +import google.registry.model.domain.launch.LaunchCreateResponseExtension; +import google.registry.model.domain.launch.LaunchInfoResponseExtension; +import google.registry.model.domain.rgp.RgpInfoExtension; +import google.registry.model.domain.secdns.SecDnsInfoExtension; +import google.registry.model.eppcommon.Trid; +import google.registry.model.eppoutput.CheckData.ContactCheckData; +import google.registry.model.eppoutput.CheckData.DomainCheckData; +import google.registry.model.eppoutput.CheckData.HostCheckData; +import google.registry.model.eppoutput.CreateData.ContactCreateData; +import google.registry.model.eppoutput.CreateData.DomainCreateData; +import google.registry.model.eppoutput.CreateData.HostCreateData; +import google.registry.model.eppoutput.EppOutput.ResponseOrGreeting; +import google.registry.model.host.HostResource; +import google.registry.model.poll.MessageQueueInfo; +import google.registry.model.poll.PendingActionNotificationResponse.ContactPendingActionNotificationResponse; +import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; +import google.registry.model.transfer.TransferResponse.ContactTransferResponse; +import google.registry.model.transfer.TransferResponse.DomainTransferResponse; import org.joda.time.DateTime; diff --git a/java/google/registry/model/eppoutput/Result.java b/java/google/registry/model/eppoutput/Result.java index 38d116207..8c0c751ce 100644 --- a/java/google/registry/model/eppoutput/Result.java +++ b/java/google/registry/model/eppoutput/Result.java @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppoutput; +package google.registry.model.eppoutput; -import static com.google.domain.registry.util.XmlEnumUtils.enumToXml; +import static google.registry.util.XmlEnumUtils.enumToXml; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; -import com.google.domain.registry.model.ImmutableObject; + +import google.registry.model.ImmutableObject; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/java/google/registry/model/eppoutput/package-info.java b/java/google/registry/model/eppoutput/package-info.java index 1a2bbcb5b..dead9c57b 100644 --- a/java/google/registry/model/eppoutput/package-info.java +++ b/java/google/registry/model/eppoutput/package-info.java @@ -18,9 +18,9 @@ elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) @XmlJavaTypeAdapter(UtcDateTimeAdapter.class) -package com.google.domain.registry.model.eppoutput; +package google.registry.model.eppoutput; -import com.google.domain.registry.xml.UtcDateTimeAdapter; +import google.registry.xml.UtcDateTimeAdapter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/export/LogsExportCursor.java b/java/google/registry/model/export/LogsExportCursor.java index 0f9098eec..c9753abc1 100644 --- a/java/google/registry/model/export/LogsExportCursor.java +++ b/java/google/registry/model/export/LogsExportCursor.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.export; +package google.registry.model.export; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.common.CrossTldSingleton; -import com.google.domain.registry.model.common.PersistedRangeLong; import com.googlecode.objectify.annotation.Entity; +import google.registry.model.Buildable; +import google.registry.model.common.CrossTldSingleton; +import google.registry.model.common.PersistedRangeLong; + import java.util.List; import java.util.Set; diff --git a/java/google/registry/model/generate_field_exposer.sh b/java/google/registry/model/generate_field_exposer.sh index dadad8134..8e240b34d 100755 --- a/java/google/registry/model/generate_field_exposer.sh +++ b/java/google/registry/model/generate_field_exposer.sh @@ -16,10 +16,10 @@ # Generate a FieldExposer for a given package -printf "package com.google.domain.registry.model"\ +printf "package google.registry.model"\ `echo $1 | sed -e 's/.*\/model\(.*\).FieldExposer\.java/\1/' -e 's/\//./g'`";\ \n\n\ -import com.google.domain.registry.model.AbstractFieldExposer;\n\n\ +import google.registry.model.AbstractFieldExposer;\n\n\ import java.lang.reflect.Field;\n\n\ /** A helper that exposes package-private fields in this package for reflective lookup. */\n\ public class FieldExposer extends AbstractFieldExposer {\n\ diff --git a/java/google/registry/model/generate_field_exposer_registry.sh b/java/google/registry/model/generate_field_exposer_registry.sh index a3947dcbd..d081fc0be 100755 --- a/java/google/registry/model/generate_field_exposer_registry.sh +++ b/java/google/registry/model/generate_field_exposer_registry.sh @@ -16,8 +16,8 @@ # Generate a FieldExposer for a given package -printf "package com.google.domain.registry.model;\n\n\ -import com.google.domain.registry.model.AbstractFieldExposer;\n\n\ +printf "package google.registry.model;\n\n\ +import google.registry.model.AbstractFieldExposer;\n\n\ import com.google.common.collect.ImmutableList;\n\n\ /** A registry of all {@link AbstractFieldExposer} impls. */\n\ class FieldExposerRegistry {\n\ @@ -25,7 +25,7 @@ class FieldExposerRegistry {\n\ return ImmutableList.of(\n" for FILE in $@; do echo $FILE | sed \ - -e 's/\(.*\).java/ new com.google.domain.registry.model.\1()/' \ + -e 's/\(.*\).java/ new google.registry.model.\1()/' \ -e 's/\//./g' done printf " }\n}\n" diff --git a/java/google/registry/model/host/HostCommand.java b/java/google/registry/model/host/HostCommand.java index 65c769ba7..5654c7011 100644 --- a/java/google/registry/model/host/HostCommand.java +++ b/java/google/registry/model/host/HostCommand.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.host; +package google.registry.model.host; import static com.google.common.collect.Sets.intersection; -import static com.google.domain.registry.util.CollectionUtils.nullSafeImmutableCopy; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullSafeImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.eppinput.ResourceCommand.AbstractSingleResourceCommand; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceCheck; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange; -import com.google.domain.registry.model.eppinput.ResourceCommand.ResourceUpdate; + +import google.registry.model.eppinput.ResourceCommand.AbstractSingleResourceCommand; +import google.registry.model.eppinput.ResourceCommand.ResourceCheck; +import google.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange; +import google.registry.model.eppinput.ResourceCommand.ResourceUpdate; import java.net.InetAddress; import java.util.Set; diff --git a/java/google/registry/model/host/HostResource.java b/java/google/registry/model/host/HostResource.java index 46797d466..1e2052bf9 100644 --- a/java/google/registry/model/host/HostResource.java +++ b/java/google/registry/model/host/HostResource.java @@ -12,24 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.host; +package google.registry.model.host; import static com.google.common.collect.Sets.difference; import static com.google.common.collect.Sets.union; -import static com.google.domain.registry.model.EppResourceUtils.projectResourceOntoBuilderAtTime; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.EppResourceUtils.projectResourceOntoBuilderAtTime; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.ForeignKeyedEppResource; -import com.google.domain.registry.model.annotations.ExternalMessagingName; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferStatus; import com.googlecode.objectify.Ref; import com.googlecode.objectify.annotation.Cache; @@ -38,6 +31,14 @@ import com.googlecode.objectify.annotation.IgnoreSave; import com.googlecode.objectify.annotation.Index; import com.googlecode.objectify.condition.IfNull; +import google.registry.model.EppResource; +import google.registry.model.EppResource.ForeignKeyedEppResource; +import google.registry.model.annotations.ExternalMessagingName; +import google.registry.model.domain.DomainResource; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferStatus; + import org.joda.time.DateTime; import java.net.InetAddress; diff --git a/java/google/registry/model/host/InetAddressAdapter.java b/java/google/registry/model/host/InetAddressAdapter.java index 308ec560b..682dec5e6 100644 --- a/java/google/registry/model/host/InetAddressAdapter.java +++ b/java/google/registry/model/host/InetAddressAdapter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.host; +package google.registry.model.host; import com.google.common.net.InetAddresses; diff --git a/java/google/registry/model/host/package-info.java b/java/google/registry/model/host/package-info.java index 0e069b91b..2a16c16d3 100644 --- a/java/google/registry/model/host/package-info.java +++ b/java/google/registry/model/host/package-info.java @@ -20,9 +20,9 @@ @XmlJavaTypeAdapters({ @XmlJavaTypeAdapter(UtcDateTimeAdapter.class), @XmlJavaTypeAdapter(InetAddressAdapter.class)}) -package com.google.domain.registry.model.host; +package google.registry.model.host; -import com.google.domain.registry.xml.UtcDateTimeAdapter; +import google.registry.xml.UtcDateTimeAdapter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/index/DomainApplicationIndex.java b/java/google/registry/model/index/DomainApplicationIndex.java index 4dcf3ae5e..07355527f 100644 --- a/java/google/registry/model/index/DomainApplicationIndex.java +++ b/java/google/registry/model/index/DomainApplicationIndex.java @@ -12,19 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.index; +package google.registry.model.index; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; -import static com.google.domain.registry.util.CollectionUtils.isNullOrEmpty; -import static com.google.domain.registry.util.DateTimeUtils.latestOf; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; +import static google.registry.util.CollectionUtils.isNullOrEmpty; +import static google.registry.util.DateTimeUtils.latestOf; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.BackupGroupRoot; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.util.CollectionUtils; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; @@ -32,6 +29,10 @@ import com.googlecode.objectify.annotation.Cache; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; +import google.registry.model.BackupGroupRoot; +import google.registry.model.domain.DomainApplication; +import google.registry.util.CollectionUtils; + import org.joda.time.DateTime; import java.util.Set; diff --git a/java/google/registry/model/index/EppResourceIndex.java b/java/google/registry/model/index/EppResourceIndex.java index 6be40c09e..fc1fc710e 100644 --- a/java/google/registry/model/index/EppResourceIndex.java +++ b/java/google/registry/model/index/EppResourceIndex.java @@ -12,13 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.index; +package google.registry.model.index; -import static com.google.domain.registry.util.TypeUtils.instantiate; +import static google.registry.util.TypeUtils.instantiate; import com.google.common.annotations.VisibleForTesting; -import com.google.domain.registry.model.BackupGroupRoot; -import com.google.domain.registry.model.EppResource; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; @@ -27,6 +25,9 @@ import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Index; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.BackupGroupRoot; +import google.registry.model.EppResource; + /** An index that allows for quick enumeration of all EppResource entities (e.g. via map reduce). */ @Entity public class EppResourceIndex extends BackupGroupRoot { diff --git a/java/google/registry/model/index/EppResourceIndexBucket.java b/java/google/registry/model/index/EppResourceIndexBucket.java index 3dccb6db9..c703511fe 100644 --- a/java/google/registry/model/index/EppResourceIndexBucket.java +++ b/java/google/registry/model/index/EppResourceIndexBucket.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.index; +package google.registry.model.index; import com.google.common.collect.ImmutableList; import com.google.common.hash.Hashing; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.VirtualEntity; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; +import google.registry.config.RegistryEnvironment; +import google.registry.model.EppResource; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.VirtualEntity; + /** A virtual entity to represent buckets to which EppResourceIndex objects are randomly added. */ @Entity @VirtualEntity diff --git a/java/google/registry/model/index/ForeignKeyIndex.java b/java/google/registry/model/index/ForeignKeyIndex.java index bde7c3635..5f0475008 100644 --- a/java/google/registry/model/index/ForeignKeyIndex.java +++ b/java/google/registry/model/index/ForeignKeyIndex.java @@ -12,21 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.index; +package google.registry.model.index; import static com.google.common.collect.Maps.filterValues; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; -import static com.google.domain.registry.util.TypeUtils.instantiate; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; +import static google.registry.util.TypeUtils.instantiate; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.BackupGroupRoot; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.host.HostResource; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; @@ -35,6 +30,12 @@ import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Index; +import google.registry.model.BackupGroupRoot; +import google.registry.model.EppResource; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainResource; +import google.registry.model.host.HostResource; + import org.joda.time.DateTime; import java.util.Map; diff --git a/java/google/registry/model/mark/CommonMarkContactFields.java b/java/google/registry/model/mark/CommonMarkContactFields.java index fcc4ee9a6..75eb34f71 100644 --- a/java/google/registry/model/mark/CommonMarkContactFields.java +++ b/java/google/registry/model/mark/CommonMarkContactFields.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; -import com.google.domain.registry.model.ImmutableObject; +import google.registry.model.ImmutableObject; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; diff --git a/java/google/registry/model/mark/CommonMarkFields.java b/java/google/registry/model/mark/CommonMarkFields.java index 5bdd2960e..4341d25c8 100644 --- a/java/google/registry/model/mark/CommonMarkFields.java +++ b/java/google/registry/model/mark/CommonMarkFields.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.ImmutableObject; + +import google.registry.model.ImmutableObject; import java.util.List; diff --git a/java/google/registry/model/mark/CourtMark.java b/java/google/registry/model/mark/CourtMark.java index 508865f4f..5911f9cbf 100644 --- a/java/google/registry/model/mark/CourtMark.java +++ b/java/google/registry/model/mark/CourtMark.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; diff --git a/java/google/registry/model/mark/Mark.java b/java/google/registry/model/mark/Mark.java index a23d5d9e3..77f0269f4 100644 --- a/java/google/registry/model/mark/Mark.java +++ b/java/google/registry/model/mark/Mark.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.ImmutableObject; + +import google.registry.model.ImmutableObject; import java.util.List; diff --git a/java/google/registry/model/mark/MarkAddress.java b/java/google/registry/model/mark/MarkAddress.java index e9f103e60..2900bea58 100644 --- a/java/google/registry/model/mark/MarkAddress.java +++ b/java/google/registry/model/mark/MarkAddress.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; -import com.google.domain.registry.model.eppcommon.Address; +import google.registry.model.eppcommon.Address; /** * Mark Holder/Owner Address diff --git a/java/google/registry/model/mark/MarkContact.java b/java/google/registry/model/mark/MarkContact.java index 363b84a06..369b5ed2c 100644 --- a/java/google/registry/model/mark/MarkContact.java +++ b/java/google/registry/model/mark/MarkContact.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlEnum; diff --git a/java/google/registry/model/mark/MarkHolder.java b/java/google/registry/model/mark/MarkHolder.java index ff349f937..d1a6509a9 100644 --- a/java/google/registry/model/mark/MarkHolder.java +++ b/java/google/registry/model/mark/MarkHolder.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlEnum; diff --git a/java/google/registry/model/mark/MarkPhoneNumber.java b/java/google/registry/model/mark/MarkPhoneNumber.java index 0a96ebc35..e78e008b1 100644 --- a/java/google/registry/model/mark/MarkPhoneNumber.java +++ b/java/google/registry/model/mark/MarkPhoneNumber.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; -import com.google.domain.registry.model.eppcommon.PhoneNumber; +import google.registry.model.eppcommon.PhoneNumber; /** * Mark Holder/Owner Phone Number diff --git a/java/google/registry/model/mark/MarkProtection.java b/java/google/registry/model/mark/MarkProtection.java index 24824d975..d61512d20 100644 --- a/java/google/registry/model/mark/MarkProtection.java +++ b/java/google/registry/model/mark/MarkProtection.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.ImmutableObject; + +import google.registry.model.ImmutableObject; import java.util.List; diff --git a/java/google/registry/model/mark/ProtectedMark.java b/java/google/registry/model/mark/ProtectedMark.java index dfddb6a9b..78f9fbda4 100644 --- a/java/google/registry/model/mark/ProtectedMark.java +++ b/java/google/registry/model/mark/ProtectedMark.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; import org.joda.time.DateTime; diff --git a/java/google/registry/model/mark/Trademark.java b/java/google/registry/model/mark/Trademark.java index 5ab74f1d2..b8047d59a 100644 --- a/java/google/registry/model/mark/Trademark.java +++ b/java/google/registry/model/mark/Trademark.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; diff --git a/java/google/registry/model/mark/TreatyOrStatuteMark.java b/java/google/registry/model/mark/TreatyOrStatuteMark.java index ea205f28f..e43ec8953 100644 --- a/java/google/registry/model/mark/TreatyOrStatuteMark.java +++ b/java/google/registry/model/mark/TreatyOrStatuteMark.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; diff --git a/java/google/registry/model/mark/package-info.java b/java/google/registry/model/mark/package-info.java index 45469707f..1e1d2b054 100644 --- a/java/google/registry/model/mark/package-info.java +++ b/java/google/registry/model/mark/package-info.java @@ -18,9 +18,9 @@ elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) @XmlJavaTypeAdapter(UtcDateTimeAdapter.class) -package com.google.domain.registry.model.mark; +package google.registry.model.mark; -import com.google.domain.registry.xml.UtcDateTimeAdapter; +import google.registry.xml.UtcDateTimeAdapter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/ofy/AugmentedDeleter.java b/java/google/registry/model/ofy/AugmentedDeleter.java index 0c83725c8..2848ede10 100644 --- a/java/google/registry/model/ofy/AugmentedDeleter.java +++ b/java/google/registry/model/ofy/AugmentedDeleter.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; -import static com.google.domain.registry.util.ObjectifyUtils.OBJECTS_TO_KEYS; import static com.googlecode.objectify.ObjectifyService.ofy; +import static google.registry.util.ObjectifyUtils.OBJECTS_TO_KEYS; import static java.util.Arrays.asList; import com.google.common.base.Functions; diff --git a/java/google/registry/model/ofy/AugmentedSaver.java b/java/google/registry/model/ofy/AugmentedSaver.java index f17b06c22..5e8e99eff 100644 --- a/java/google/registry/model/ofy/AugmentedSaver.java +++ b/java/google/registry/model/ofy/AugmentedSaver.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.googlecode.objectify.ObjectifyService.ofy; diff --git a/java/google/registry/model/ofy/CommitLogBucket.java b/java/google/registry/model/ofy/CommitLogBucket.java index 9dcba559e..5d306666e 100644 --- a/java/google/registry/model/ofy/CommitLogBucket.java +++ b/java/google/registry/model/ofy/CommitLogBucket.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.DiscreteDomain.integers; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; import static com.googlecode.objectify.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -26,17 +26,18 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Range; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.NotBackedUp.Reason; -import com.google.domain.registry.util.NonFinalForTesting; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; +import google.registry.config.RegistryEnvironment; +import google.registry.model.Buildable; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.NotBackedUp.Reason; +import google.registry.util.NonFinalForTesting; + import org.joda.time.DateTime; import java.util.Random; @@ -45,7 +46,7 @@ import java.util.Random; * Root for a random commit log bucket. * *

This is used to shard {@link CommitLogManifest} objects into - * {@link com.google.domain.registry.config.RegistryConfig#getCommitLogBucketCount() N} entity + * {@link google.registry.config.RegistryConfig#getCommitLogBucketCount() N} entity * groups. This increases transaction throughput, while maintaining the ability to perform * strongly-consistent ancestor queries. * diff --git a/java/google/registry/model/ofy/CommitLogCheckpoint.java b/java/google/registry/model/ofy/CommitLogCheckpoint.java index c29a397d5..97b95bb09 100644 --- a/java/google/registry/model/ofy/CommitLogCheckpoint.java +++ b/java/google/registry/model/ofy/CommitLogCheckpoint.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.common.base.Preconditions.checkArgument; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.NotBackedUp.Reason; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.NotBackedUp.Reason; + import org.joda.time.DateTime; import java.util.ArrayList; diff --git a/java/google/registry/model/ofy/CommitLogCheckpointRoot.java b/java/google/registry/model/ofy/CommitLogCheckpointRoot.java index 471c17f66..59ccac86f 100644 --- a/java/google/registry/model/ofy/CommitLogCheckpointRoot.java +++ b/java/google/registry/model/ofy/CommitLogCheckpointRoot.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; import static com.googlecode.objectify.ObjectifyService.ofy; - -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.NotBackedUp.Reason; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.NotBackedUp.Reason; + import org.joda.time.DateTime; /** diff --git a/java/google/registry/model/ofy/CommitLogManifest.java b/java/google/registry/model/ofy/CommitLogManifest.java index a6c6f462a..40ef2b227 100644 --- a/java/google/registry/model/ofy/CommitLogManifest.java +++ b/java/google/registry/model/ofy/CommitLogManifest.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.NotBackedUp.Reason; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.NotBackedUp.Reason; + import org.joda.time.DateTime; import java.util.LinkedHashSet; diff --git a/java/google/registry/model/ofy/CommitLogMutation.java b/java/google/registry/model/ofy/CommitLogMutation.java index 7b249e0d7..09ed981af 100644 --- a/java/google/registry/model/ofy/CommitLogMutation.java +++ b/java/google/registry/model/ofy/CommitLogMutation.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.appengine.api.datastore.EntityTranslator.convertToPb; import static com.google.appengine.api.datastore.EntityTranslator.createFromPbBytes; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.api.datastore.KeyFactory; import com.google.common.annotations.VisibleForTesting; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.NotBackedUp.Reason; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.NotBackedUp.Reason; + /** Representation of a saved entity in a {@link CommitLogManifest} (not deletes). */ @Entity @NotBackedUp(reason = Reason.COMMIT_LOGS) diff --git a/java/google/registry/model/ofy/CommitLoggedWork.java b/java/google/registry/model/ofy/CommitLoggedWork.java index a0e63078d..d6b07237b 100644 --- a/java/google/registry/model/ofy/CommitLoggedWork.java +++ b/java/google/registry/model/ofy/CommitLoggedWork.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Predicates.in; @@ -20,22 +20,23 @@ import static com.google.common.base.Predicates.not; import static com.google.common.collect.Maps.filterKeys; import static com.google.common.collect.Sets.difference; import static com.google.common.collect.Sets.union; -import static com.google.domain.registry.model.ofy.CommitLogBucket.loadBucket; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; import static com.googlecode.objectify.ObjectifyService.ofy; +import static google.registry.model.ofy.CommitLogBucket.loadBucket; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.BackupGroupRoot; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.util.Clock; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; +import google.registry.model.BackupGroupRoot; +import google.registry.model.ImmutableObject; +import google.registry.util.Clock; + import org.joda.time.DateTime; import java.util.HashSet; diff --git a/java/google/registry/model/ofy/ObjectifyService.java b/java/google/registry/model/ofy/ObjectifyService.java index 148a3d9f4..138997eb0 100644 --- a/java/google/registry/model/ofy/ObjectifyService.java +++ b/java/google/registry/model/ofy/ObjectifyService.java @@ -12,28 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.appengine.api.memcache.ErrorHandlers.getConsistentLogAndContinue; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Predicates.not; -import static com.google.domain.registry.util.TypeUtils.hasAnnotation; import static com.googlecode.objectify.ObjectifyService.factory; +import static google.registry.util.TypeUtils.hasAnnotation; import com.google.appengine.api.datastore.DatastoreServiceFactory; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterables; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.EntityClasses; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.translators.CidrAddressBlockTranslatorFactory; -import com.google.domain.registry.model.translators.CommitLogRevisionsTranslatorFactory; -import com.google.domain.registry.model.translators.CreateAutoTimestampTranslatorFactory; -import com.google.domain.registry.model.translators.CurrencyUnitTranslatorFactory; -import com.google.domain.registry.model.translators.DurationTranslatorFactory; -import com.google.domain.registry.model.translators.InetAddressTranslatorFactory; -import com.google.domain.registry.model.translators.ReadableInstantUtcTranslatorFactory; -import com.google.domain.registry.model.translators.UpdateAutoTimestampTranslatorFactory; import com.googlecode.objectify.Key; import com.googlecode.objectify.Objectify; @@ -43,6 +32,18 @@ import com.googlecode.objectify.annotation.EntitySubclass; import com.googlecode.objectify.impl.translate.TranslatorFactory; import com.googlecode.objectify.impl.translate.opt.joda.MoneyStringTranslatorFactory; +import google.registry.config.RegistryEnvironment; +import google.registry.model.EntityClasses; +import google.registry.model.ImmutableObject; +import google.registry.model.translators.CidrAddressBlockTranslatorFactory; +import google.registry.model.translators.CommitLogRevisionsTranslatorFactory; +import google.registry.model.translators.CreateAutoTimestampTranslatorFactory; +import google.registry.model.translators.CurrencyUnitTranslatorFactory; +import google.registry.model.translators.DurationTranslatorFactory; +import google.registry.model.translators.InetAddressTranslatorFactory; +import google.registry.model.translators.ReadableInstantUtcTranslatorFactory; +import google.registry.model.translators.UpdateAutoTimestampTranslatorFactory; + import java.util.Arrays; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Level; diff --git a/java/google/registry/model/ofy/Ofy.java b/java/google/registry/model/ofy/Ofy.java index f814c9275..cc573352f 100644 --- a/java/google/registry/model/ofy/Ofy.java +++ b/java/google/registry/model/ofy/Ofy.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.Maps.uniqueIndex; -import static com.google.domain.registry.util.CollectionUtils.union; -import static com.google.domain.registry.util.ObjectifyUtils.OBJECTS_TO_KEYS; import static com.googlecode.objectify.ObjectifyService.ofy; +import static google.registry.util.CollectionUtils.union; +import static google.registry.util.ObjectifyUtils.OBJECTS_TO_KEYS; import com.google.appengine.api.datastore.DatastoreFailureException; import com.google.appengine.api.datastore.DatastoreTimeoutException; @@ -30,16 +30,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.VirtualEntity; -import com.google.domain.registry.model.ofy.ReadOnlyWork.KillTransactionException; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.NonFinalForTesting; -import com.google.domain.registry.util.Sleeper; -import com.google.domain.registry.util.SystemClock; -import com.google.domain.registry.util.SystemSleeper; import com.googlecode.objectify.Key; import com.googlecode.objectify.Objectify; @@ -49,6 +39,17 @@ import com.googlecode.objectify.cmd.Deleter; import com.googlecode.objectify.cmd.Loader; import com.googlecode.objectify.cmd.Saver; +import google.registry.config.RegistryEnvironment; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.VirtualEntity; +import google.registry.model.ofy.ReadOnlyWork.KillTransactionException; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; +import google.registry.util.NonFinalForTesting; +import google.registry.util.Sleeper; +import google.registry.util.SystemClock; +import google.registry.util.SystemSleeper; + import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/model/ofy/OfyFilter.java b/java/google/registry/model/ofy/OfyFilter.java index 32f53eeed..ba837c7db 100644 --- a/java/google/registry/model/ofy/OfyFilter.java +++ b/java/google/registry/model/ofy/OfyFilter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import java.io.IOException; diff --git a/java/google/registry/model/ofy/ReadOnlyWork.java b/java/google/registry/model/ofy/ReadOnlyWork.java index 0b2b6efe6..86db82d75 100644 --- a/java/google/registry/model/ofy/ReadOnlyWork.java +++ b/java/google/registry/model/ofy/ReadOnlyWork.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; - -import com.google.domain.registry.util.Clock; +package google.registry.model.ofy; import com.googlecode.objectify.Work; +import google.registry.util.Clock; + /** Wrapper for {@link Work} that disallows mutations and fails the transaction at the end. */ class ReadOnlyWork extends CommitLoggedWork { diff --git a/java/google/registry/model/ofy/SessionKeyExposingObjectify.java b/java/google/registry/model/ofy/SessionKeyExposingObjectify.java index cb0abe3f1..2beb94832 100644 --- a/java/google/registry/model/ofy/SessionKeyExposingObjectify.java +++ b/java/google/registry/model/ofy/SessionKeyExposingObjectify.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import com.google.common.collect.ImmutableSet; diff --git a/java/google/registry/model/ofy/TimestampInversionException.java b/java/google/registry/model/ofy/TimestampInversionException.java index 9e2e2a21d..7057dc6b1 100644 --- a/java/google/registry/model/ofy/TimestampInversionException.java +++ b/java/google/registry/model/ofy/TimestampInversionException.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static java.util.Arrays.asList; import com.google.common.base.Joiner; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; -import com.google.domain.registry.model.BackupGroupRoot; import com.googlecode.objectify.Key; import com.googlecode.objectify.Objectify; +import google.registry.model.BackupGroupRoot; + import org.joda.time.DateTime; import java.util.Map; diff --git a/java/google/registry/model/ofy/TransactionInfo.java b/java/google/registry/model/ofy/TransactionInfo.java index 3a77af5d8..9828e0d18 100644 --- a/java/google/registry/model/ofy/TransactionInfo.java +++ b/java/google/registry/model/ofy/TransactionInfo.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.common.base.Functions.constant; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Maps.filterValues; import static com.google.common.collect.Maps.toMap; -import static com.google.domain.registry.model.ofy.CommitLogBucket.getArbitraryBucketId; import static com.googlecode.objectify.ObjectifyService.ofy; +import static google.registry.model.ofy.CommitLogBucket.getArbitraryBucketId; import com.google.common.base.Predicate; import com.google.common.base.Predicates; diff --git a/java/google/registry/model/package-info.java b/java/google/registry/model/package-info.java index e5be9e00d..e61f490e6 100644 --- a/java/google/registry/model/package-info.java +++ b/java/google/registry/model/package-info.java @@ -18,9 +18,9 @@ elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) @XmlJavaTypeAdapter(UtcDateTimeAdapter.class) -package com.google.domain.registry.model; +package google.registry.model; -import com.google.domain.registry.xml.UtcDateTimeAdapter; +import google.registry.xml.UtcDateTimeAdapter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/poll/MessageQueueInfo.java b/java/google/registry/model/poll/MessageQueueInfo.java index f9bd3dc25..7b3adbde0 100644 --- a/java/google/registry/model/poll/MessageQueueInfo.java +++ b/java/google/registry/model/poll/MessageQueueInfo.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.poll; +package google.registry.model.poll; -import com.google.domain.registry.model.ImmutableObject; +import google.registry.model.ImmutableObject; import org.joda.time.DateTime; diff --git a/java/google/registry/model/poll/PendingActionNotificationResponse.java b/java/google/registry/model/poll/PendingActionNotificationResponse.java index 24c119c56..7cea113a2 100644 --- a/java/google/registry/model/poll/PendingActionNotificationResponse.java +++ b/java/google/registry/model/poll/PendingActionNotificationResponse.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.poll; +package google.registry.model.poll; import com.google.common.annotations.VisibleForTesting; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.eppoutput.Response.ResponseData; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.ImmutableObject; +import google.registry.model.eppcommon.Trid; +import google.registry.model.eppoutput.Response.ResponseData; + import org.joda.time.DateTime; import javax.xml.bind.annotation.XmlAttribute; diff --git a/java/google/registry/model/poll/PollMessage.java b/java/google/registry/model/poll/PollMessage.java index 072f9e8a4..7584cdc67 100644 --- a/java/google/registry/model/poll/PollMessage.java +++ b/java/google/registry/model/poll/PollMessage.java @@ -12,35 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.poll; +package google.registry.model.poll; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.util.CollectionUtils.forceEmptyToNull; -import static com.google.domain.registry.util.CollectionUtils.isNullOrEmpty; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.CollectionUtils.forceEmptyToNull; +import static google.registry.util.CollectionUtils.isNullOrEmpty; +import static google.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Converter; import com.google.common.base.Optional; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.ExternalMessagingName; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.DomainRenewData; -import com.google.domain.registry.model.domain.launch.LaunchInfoResponseExtension; -import com.google.domain.registry.model.eppoutput.Response.ResponseData; -import com.google.domain.registry.model.eppoutput.Response.ResponseExtension; -import com.google.domain.registry.model.poll.PendingActionNotificationResponse.ContactPendingActionNotificationResponse; -import com.google.domain.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; -import com.google.domain.registry.model.transfer.TransferResponse.ContactTransferResponse; -import com.google.domain.registry.model.transfer.TransferResponse.DomainTransferResponse; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; @@ -49,6 +33,23 @@ import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Index; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.Buildable; +import google.registry.model.EppResource; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.ExternalMessagingName; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.DomainRenewData; +import google.registry.model.domain.launch.LaunchInfoResponseExtension; +import google.registry.model.eppoutput.Response.ResponseData; +import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.poll.PendingActionNotificationResponse.ContactPendingActionNotificationResponse; +import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; +import google.registry.model.transfer.TransferResponse.ContactTransferResponse; +import google.registry.model.transfer.TransferResponse.DomainTransferResponse; + import org.joda.time.DateTime; import java.util.List; diff --git a/java/google/registry/model/poll/PollMessageExternalKeyConverter.java b/java/google/registry/model/poll/PollMessageExternalKeyConverter.java index 342a4ba73..fee39b3c1 100644 --- a/java/google/registry/model/poll/PollMessageExternalKeyConverter.java +++ b/java/google/registry/model/poll/PollMessageExternalKeyConverter.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.poll; +package google.registry.model.poll; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.base.Converter; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableBiMap; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.reporting.HistoryEntry; import com.googlecode.objectify.Key; +import google.registry.model.EppResource; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainBase; +import google.registry.model.host.HostResource; +import google.registry.model.reporting.HistoryEntry; + import java.util.List; /** diff --git a/java/google/registry/model/poll/package-info.java b/java/google/registry/model/poll/package-info.java index 002f3cbe4..f3f0d34ee 100644 --- a/java/google/registry/model/poll/package-info.java +++ b/java/google/registry/model/poll/package-info.java @@ -18,9 +18,9 @@ elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) @XmlJavaTypeAdapter(UtcDateTimeAdapter.class) -package com.google.domain.registry.model.poll; +package google.registry.model.poll; -import com.google.domain.registry.xml.UtcDateTimeAdapter; +import google.registry.xml.UtcDateTimeAdapter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/rde/RdeMode.java b/java/google/registry/model/rde/RdeMode.java index 124b7b86b..72fd51d24 100644 --- a/java/google/registry/model/rde/RdeMode.java +++ b/java/google/registry/model/rde/RdeMode.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.rde; +package google.registry.model.rde; import com.google.common.base.Ascii; diff --git a/java/google/registry/model/rde/RdeNamingUtils.java b/java/google/registry/model/rde/RdeNamingUtils.java index 5d60bb755..10c7bfb23 100644 --- a/java/google/registry/model/rde/RdeNamingUtils.java +++ b/java/google/registry/model/rde/RdeNamingUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.rde; +package google.registry.model.rde; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/model/rde/RdeRevision.java b/java/google/registry/model/rde/RdeRevision.java index 72e9a02bb..b3c2062db 100644 --- a/java/google/registry/model/rde/RdeRevision.java +++ b/java/google/registry/model/rde/RdeRevision.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.rde; +package google.registry.model.rde; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Verify.verify; import static com.google.common.base.Verify.verifyNotNull; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.rde.RdeNamingUtils.makePartialName; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.rde.RdeNamingUtils.makePartialName; import com.google.common.base.VerifyException; -import com.google.domain.registry.model.ImmutableObject; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; +import google.registry.model.ImmutableObject; + import org.joda.time.DateTime; /** diff --git a/java/google/registry/model/registrar/Registrar.java b/java/google/registry/model/registrar/Registrar.java index 445ec9b52..23ad35cc9 100644 --- a/java/google/registry/model/registrar/Registrar.java +++ b/java/google/registry/model/registrar/Registrar.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registrar; +package google.registry.model.registrar; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; @@ -25,14 +25,14 @@ import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.base.Strings.nullToEmpty; import static com.google.common.collect.Sets.immutableEnumSet; import static com.google.common.io.BaseEncoding.base64; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableSortedCopy; -import static com.google.domain.registry.util.X509Utils.getCertificateHash; -import static com.google.domain.registry.util.X509Utils.loadCertificate; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; +import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableSortedCopy; +import static google.registry.util.X509Utils.getCertificateHash; +import static google.registry.util.X509Utils.loadCertificate; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Predicate; @@ -43,16 +43,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Sets; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.CreateAutoTimestamp; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.JsonMapBuilder; -import com.google.domain.registry.model.Jsonifiable; -import com.google.domain.registry.model.UpdateAutoTimestamp; -import com.google.domain.registry.model.common.EntityGroupRoot; -import com.google.domain.registry.util.CidrAddressBlock; -import com.google.domain.registry.util.NonFinalForTesting; import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; @@ -64,6 +54,17 @@ import com.googlecode.objectify.annotation.Index; import com.googlecode.objectify.annotation.Parent; import com.googlecode.objectify.condition.IfNull; +import google.registry.config.RegistryEnvironment; +import google.registry.model.Buildable; +import google.registry.model.CreateAutoTimestamp; +import google.registry.model.ImmutableObject; +import google.registry.model.JsonMapBuilder; +import google.registry.model.Jsonifiable; +import google.registry.model.UpdateAutoTimestamp; +import google.registry.model.common.EntityGroupRoot; +import google.registry.util.CidrAddressBlock; +import google.registry.util.NonFinalForTesting; + import org.joda.time.DateTime; import java.security.MessageDigest; diff --git a/java/google/registry/model/registrar/RegistrarAddress.java b/java/google/registry/model/registrar/RegistrarAddress.java index ab8ad963f..9f533f6df 100644 --- a/java/google/registry/model/registrar/RegistrarAddress.java +++ b/java/google/registry/model/registrar/RegistrarAddress.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registrar; +package google.registry.model.registrar; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.util.CollectionUtils.forceEmptyToNull; - -import com.google.domain.registry.model.eppcommon.Address; +import static google.registry.util.CollectionUtils.forceEmptyToNull; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.eppcommon.Address; + /** * Registrar Address *

diff --git a/java/google/registry/model/registrar/RegistrarContact.java b/java/google/registry/model/registrar/RegistrarContact.java index fc8030f4e..81905a32b 100644 --- a/java/google/registry/model/registrar/RegistrarContact.java +++ b/java/google/registry/model/registrar/RegistrarContact.java @@ -12,26 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registrar; +package google.registry.model.registrar; import static com.google.common.base.Functions.toStringFunction; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Sets.difference; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableSortedCopy; -import static com.google.domain.registry.util.ObjectifyUtils.OBJECTS_TO_KEYS; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableSortedCopy; +import static google.registry.util.ObjectifyUtils.OBJECTS_TO_KEYS; import com.google.common.base.Enums; import com.google.common.base.Joiner; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.JsonMapBuilder; -import com.google.domain.registry.model.Jsonifiable; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; @@ -41,6 +37,11 @@ import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Index; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.Buildable; +import google.registry.model.ImmutableObject; +import google.registry.model.JsonMapBuilder; +import google.registry.model.Jsonifiable; + import java.util.Arrays; import java.util.Map; import java.util.Set; diff --git a/java/google/registry/model/registry/Registries.java b/java/google/registry/model/registry/Registries.java index 15fcb0905..63d76e61b 100644 --- a/java/google/registry/model/registry/Registries.java +++ b/java/google/registry/model/registry/Registries.java @@ -12,26 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry; +package google.registry.model.registry; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Predicates.equalTo; import static com.google.common.base.Strings.emptyToNull; import static com.google.common.collect.Maps.filterValues; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CacheUtils.memoizeWithShortExpiration; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CacheUtils.memoizeWithShortExpiration; import com.google.common.base.Optional; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.model.registry.Registry.TldType; import com.googlecode.objectify.Work; +import google.registry.model.registry.Registry.TldType; + /** Utilities for finding and listing {@link Registry} entities. */ public final class Registries { @@ -91,7 +92,7 @@ public final class Registries { * *

Note: This routine will only work on names under TLDs for which this registry is * authoritative. To extract TLDs from domains (not hosts) that other registries control, use - * {@link com.google.domain.registry.util.DomainNameUtils#getTldFromDomainName(String) + * {@link google.registry.util.DomainNameUtils#getTldFromDomainName(String) * DomainNameUtils#getTldFromDomainName}. * * @param domainName domain name or host name (but not TLD) under an authoritative TLD diff --git a/java/google/registry/model/registry/Registry.java b/java/google/registry/model/registry/Registry.java index 033595764..8fd7e7d09 100644 --- a/java/google/registry/model/registry/Registry.java +++ b/java/google/registry/model/registry/Registry.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry; +package google.registry.model.registry; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Predicates.equalTo; import static com.google.common.base.Predicates.not; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; -import static com.google.domain.registry.model.registry.label.PremiumList.getPremiumPrice; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; +import static google.registry.model.registry.label.PremiumList.getPremiumPrice; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.joda.money.CurrencyUnit.USD; @@ -40,16 +40,6 @@ import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.CreateAutoTimestamp; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.common.EntityGroupRoot; -import com.google.domain.registry.model.common.TimedTransitionProperty; -import com.google.domain.registry.model.common.TimedTransitionProperty.TimedTransition; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.model.registry.label.ReservedList; -import com.google.domain.registry.util.Idn; import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; @@ -61,6 +51,17 @@ import com.googlecode.objectify.annotation.Mapify; import com.googlecode.objectify.annotation.OnSave; import com.googlecode.objectify.annotation.Parent; +import google.registry.config.RegistryEnvironment; +import google.registry.model.Buildable; +import google.registry.model.CreateAutoTimestamp; +import google.registry.model.ImmutableObject; +import google.registry.model.common.EntityGroupRoot; +import google.registry.model.common.TimedTransitionProperty; +import google.registry.model.common.TimedTransitionProperty.TimedTransition; +import google.registry.model.registry.label.PremiumList; +import google.registry.model.registry.label.ReservedList; +import google.registry.util.Idn; + import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/model/registry/RegistryCursor.java b/java/google/registry/model/registry/RegistryCursor.java index b21393c4b..51006181a 100644 --- a/java/google/registry/model/registry/RegistryCursor.java +++ b/java/google/registry/model/registry/RegistryCursor.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry; +package google.registry.model.registry; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.base.Optional; -import com.google.domain.registry.model.ImmutableObject; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.ImmutableObject; + import org.joda.time.DateTime; /** Shared entity type for per-TLD date cursors. */ diff --git a/java/google/registry/model/registry/label/BaseDomainLabelList.java b/java/google/registry/model/registry/label/BaseDomainLabelList.java index 6ea4521ba..c41007bca 100644 --- a/java/google/registry/model/registry/label/BaseDomainLabelList.java +++ b/java/google/registry/model/registry/label/BaseDomainLabelList.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry.label; +package google.registry.model.registry.label; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.registry.Registries.getTlds; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.registry.Registries.getTlds; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; @@ -28,16 +28,17 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Ordering; import com.google.common.util.concurrent.UncheckedExecutionException; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.common.EntityGroupRoot; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.label.ReservedList.ReservedListEntry; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.Buildable; +import google.registry.model.ImmutableObject; +import google.registry.model.common.EntityGroupRoot; +import google.registry.model.registry.Registry; +import google.registry.model.registry.label.ReservedList.ReservedListEntry; + import org.joda.time.DateTime; import java.util.HashMap; diff --git a/java/google/registry/model/registry/label/DomainLabelEntry.java b/java/google/registry/model/registry/label/DomainLabelEntry.java index a1fc0b767..65587dc6b 100644 --- a/java/google/registry/model/registry/label/DomainLabelEntry.java +++ b/java/google/registry/model/registry/label/DomainLabelEntry.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry.label; +package google.registry.model.registry.label; import static com.google.common.base.Strings.emptyToNull; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; - -import com.google.domain.registry.model.Buildable.GenericBuilder; -import com.google.domain.registry.model.ImmutableObject; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.googlecode.objectify.annotation.Id; +import google.registry.model.Buildable.GenericBuilder; +import google.registry.model.ImmutableObject; + /** * Represents a label entry parsed from a line in a Reserved List txt file. * diff --git a/java/google/registry/model/registry/label/PremiumList.java b/java/google/registry/model/registry/label/PremiumList.java index 27e3363a0..6e715d02b 100644 --- a/java/google/registry/model/registry/label/PremiumList.java +++ b/java/google/registry/model/registry/label/PremiumList.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry.label; +package google.registry.model.registry.label; import static com.google.appengine.api.datastore.DatastoreServiceFactory.getDatastoreService; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.partition; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.allocateId; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.allocateId; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; +import static google.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import static java.util.concurrent.TimeUnit.MILLISECONDS; import com.google.appengine.api.datastore.EntityNotFoundException; @@ -38,11 +38,6 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.util.concurrent.UncheckedExecutionException; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.VirtualEntity; -import com.google.domain.registry.model.registry.Registry; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; @@ -55,6 +50,12 @@ import com.googlecode.objectify.annotation.OnLoad; import com.googlecode.objectify.annotation.Parent; import com.googlecode.objectify.cmd.Query; +import google.registry.config.RegistryEnvironment; +import google.registry.model.Buildable; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.VirtualEntity; +import google.registry.model.registry.Registry; + import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/model/registry/label/ReservationType.java b/java/google/registry/model/registry/label/ReservationType.java index d4c2e538a..2559cac17 100644 --- a/java/google/registry/model/registry/label/ReservationType.java +++ b/java/google/registry/model/registry/label/ReservationType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry.label; +package google.registry.model.registry.label; import static com.google.common.base.Preconditions.checkState; diff --git a/java/google/registry/model/registry/label/ReservedList.java b/java/google/registry/model/registry/label/ReservedList.java index 44eb9b4b0..4c154a1d1 100644 --- a/java/google/registry/model/registry/label/ReservedList.java +++ b/java/google/registry/model/registry/label/ReservedList.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry.label; +package google.registry.model.registry.label; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; -import static com.google.domain.registry.model.registry.label.ReservationType.FULLY_BLOCKED; -import static com.google.domain.registry.model.registry.label.ReservationType.RESERVED_FOR_ANCHOR_TENANT; -import static com.google.domain.registry.model.registry.label.ReservationType.UNRESERVED; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; +import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED; +import static google.registry.model.registry.label.ReservationType.RESERVED_FOR_ANCHOR_TENANT; +import static google.registry.model.registry.label.ReservationType.UNRESERVED; +import static google.registry.util.CollectionUtils.nullToEmpty; import static java.util.concurrent.TimeUnit.MILLISECONDS; import com.google.common.base.Optional; @@ -34,8 +34,6 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.UncheckedExecutionException; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.registry.Registry; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; @@ -45,6 +43,9 @@ import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Mapify; import com.googlecode.objectify.mapper.Mapper; +import google.registry.config.RegistryEnvironment; +import google.registry.model.registry.Registry; + import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/java/google/registry/model/registry/label/package-info.java b/java/google/registry/model/registry/label/package-info.java index 235fdab88..0d45c96e8 100644 --- a/java/google/registry/model/registry/label/package-info.java +++ b/java/google/registry/model/registry/label/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.model.registry.label; +package google.registry.model.registry.label; diff --git a/java/google/registry/model/reporting/HistoryEntry.java b/java/google/registry/model/reporting/HistoryEntry.java index 36c564a7d..21b28ca0b 100644 --- a/java/google/registry/model/reporting/HistoryEntry.java +++ b/java/google/registry/model/reporting/HistoryEntry.java @@ -12,13 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.reporting; - -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.eppcommon.Trid; +package google.registry.model.reporting; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; @@ -29,6 +23,12 @@ import com.googlecode.objectify.annotation.Index; import com.googlecode.objectify.annotation.Parent; import com.googlecode.objectify.condition.IfNull; +import google.registry.model.Buildable; +import google.registry.model.EppResource; +import google.registry.model.ImmutableObject; +import google.registry.model.domain.Period; +import google.registry.model.eppcommon.Trid; + import org.joda.time.DateTime; /** A record of an EPP command that mutated a resource. */ diff --git a/java/google/registry/model/server/Lock.java b/java/google/registry/model/server/Lock.java index 6995c0597..10ad1a6c9 100644 --- a/java/google/registry/model/server/Lock.java +++ b/java/google/registry/model/server/Lock.java @@ -12,32 +12,33 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.server; +package google.registry.model.server; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Iterables.getFirst; import static com.google.common.collect.Iterables.skip; import static com.google.common.collect.Sets.newLinkedHashSet; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.isAtOrAfter; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.DateTimeUtils.isAtOrAfter; import com.google.common.base.Strings; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedSet; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.NotBackedUp.Reason; -import com.google.domain.registry.util.AppEngineTimeLimiter; -import com.google.domain.registry.util.FormattingLogger; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.NotBackedUp.Reason; +import google.registry.util.AppEngineTimeLimiter; +import google.registry.util.FormattingLogger; + import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/model/server/ServerSecret.java b/java/google/registry/model/server/ServerSecret.java index 62a96b256..d8f7861f4 100644 --- a/java/google/registry/model/server/ServerSecret.java +++ b/java/google/registry/model/server/ServerSecret.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.server; +package google.registry.model.server; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; - -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.NotBackedUp.Reason; -import com.google.domain.registry.model.common.CrossTldSingleton; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.annotation.Cache; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Unindex; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.NotBackedUp.Reason; +import google.registry.model.common.CrossTldSingleton; + import java.util.UUID; /** A secret number used for generating tokens (such as XSRF tokens). */ diff --git a/java/google/registry/model/smd/AbstractSignedMark.java b/java/google/registry/model/smd/AbstractSignedMark.java index 3dd16c6fc..db061f540 100644 --- a/java/google/registry/model/smd/AbstractSignedMark.java +++ b/java/google/registry/model/smd/AbstractSignedMark.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.smd; +package google.registry.model.smd; /** * Marker interface for signed mark types. diff --git a/java/google/registry/model/smd/EncodedSignedMark.java b/java/google/registry/model/smd/EncodedSignedMark.java index 7c7cf6118..61959380a 100644 --- a/java/google/registry/model/smd/EncodedSignedMark.java +++ b/java/google/registry/model/smd/EncodedSignedMark.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.smd; +package google.registry.model.smd; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.io.BaseEncoding.base64; import com.google.appengine.api.datastore.Text; -import com.google.domain.registry.model.ImmutableObject; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.ImmutableObject; + import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlValue; diff --git a/java/google/registry/model/smd/IssuerInfo.java b/java/google/registry/model/smd/IssuerInfo.java index e8cdf1960..2ca2d2dd4 100644 --- a/java/google/registry/model/smd/IssuerInfo.java +++ b/java/google/registry/model/smd/IssuerInfo.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.smd; +package google.registry.model.smd; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.mark.MarkPhoneNumber; +import google.registry.model.ImmutableObject; +import google.registry.model.mark.MarkPhoneNumber; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java b/java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java index de7fcdd8a..8fc09b377 100644 --- a/java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java +++ b/java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.smd; +package google.registry.model.smd; import com.google.appengine.api.datastore.Text; import com.google.common.base.CharMatcher; diff --git a/java/google/registry/model/smd/SignedMark.java b/java/google/registry/model/smd/SignedMark.java index 888ba3e9d..86d748bd6 100644 --- a/java/google/registry/model/smd/SignedMark.java +++ b/java/google/registry/model/smd/SignedMark.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.smd; +package google.registry.model.smd; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.mark.Mark; +import google.registry.model.ImmutableObject; +import google.registry.model.mark.Mark; import org.joda.time.DateTime; diff --git a/java/google/registry/model/smd/SignedMarkRevocationList.java b/java/google/registry/model/smd/SignedMarkRevocationList.java index e90c2fbf8..18335a50a 100644 --- a/java/google/registry/model/smd/SignedMarkRevocationList.java +++ b/java/google/registry/model/smd/SignedMarkRevocationList.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.smd; +package google.registry.model.smd; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.isEmpty; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.allocateId; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CacheUtils.memoizeWithShortExpiration; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.allocateId; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CacheUtils.memoizeWithShortExpiration; +import static google.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -30,11 +30,6 @@ import com.google.common.base.Supplier; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.NotBackedUp.Reason; -import com.google.domain.registry.model.common.EntityGroupRoot; -import com.google.domain.registry.util.CollectionUtils; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; @@ -46,6 +41,12 @@ import com.googlecode.objectify.annotation.Ignore; import com.googlecode.objectify.annotation.OnSave; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.NotBackedUp.Reason; +import google.registry.model.common.EntityGroupRoot; +import google.registry.util.CollectionUtils; + import org.joda.time.DateTime; import java.util.Map; @@ -61,7 +62,7 @@ import java.util.Map; * to avoid exceeding the one megabyte max entity size limit, we'll also be sharding that entity * into multiple entities, each entity containing {@value #SHARD_SIZE} rows. * - * @see com.google.domain.registry.tmch.SmdrlCsvParser + * @see google.registry.tmch.SmdrlCsvParser * @see "http://tools.ietf.org/html/draft-lozano-tmch-func-spec-08#section-6.2" */ @Entity diff --git a/java/google/registry/model/smd/package-info.java b/java/google/registry/model/smd/package-info.java index d397be040..7de476d9c 100644 --- a/java/google/registry/model/smd/package-info.java +++ b/java/google/registry/model/smd/package-info.java @@ -18,9 +18,9 @@ elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) @XmlJavaTypeAdapter(UtcDateTimeAdapter.class) -package com.google.domain.registry.model.smd; +package google.registry.model.smd; -import com.google.domain.registry.xml.UtcDateTimeAdapter; +import google.registry.xml.UtcDateTimeAdapter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/tmch/ClaimsListShard.java b/java/google/registry/model/tmch/ClaimsListShard.java index 246aabdb1..a954693c5 100644 --- a/java/google/registry/model/tmch/ClaimsListShard.java +++ b/java/google/registry/model/tmch/ClaimsListShard.java @@ -12,28 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.tmch; +package google.registry.model.tmch; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Verify.verify; -import static com.google.domain.registry.model.ofy.ObjectifyService.allocateId; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; -import static com.google.domain.registry.util.CacheUtils.memoizeWithShortExpiration; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.ofy.ObjectifyService.allocateId; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; +import static google.registry.util.CacheUtils.memoizeWithShortExpiration; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.NotBackedUp.Reason; -import com.google.domain.registry.model.annotations.VirtualEntity; -import com.google.domain.registry.model.common.CrossTldSingleton; -import com.google.domain.registry.util.CollectionUtils; -import com.google.domain.registry.util.Concurrent; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; @@ -46,6 +39,14 @@ import com.googlecode.objectify.annotation.Ignore; import com.googlecode.objectify.annotation.OnSave; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.ImmutableObject; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.NotBackedUp.Reason; +import google.registry.model.annotations.VirtualEntity; +import google.registry.model.common.CrossTldSingleton; +import google.registry.util.CollectionUtils; +import google.registry.util.Concurrent; + import org.joda.time.DateTime; import java.util.HashMap; diff --git a/java/google/registry/model/tmch/TmchCrl.java b/java/google/registry/model/tmch/TmchCrl.java index 84d3dccc4..126c5efa1 100644 --- a/java/google/registry/model/tmch/TmchCrl.java +++ b/java/google/registry/model/tmch/TmchCrl.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.tmch; +package google.registry.model.tmch; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; - -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.NotBackedUp.Reason; -import com.google.domain.registry.model.common.CrossTldSingleton; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.annotation.Cache; import com.googlecode.objectify.annotation.Entity; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.NotBackedUp.Reason; +import google.registry.model.common.CrossTldSingleton; + import org.joda.time.DateTime; import javax.annotation.Nullable; diff --git a/java/google/registry/model/transfer/BaseTransferObject.java b/java/google/registry/model/transfer/BaseTransferObject.java index a41304f3b..461fb0b3c 100644 --- a/java/google/registry/model/transfer/BaseTransferObject.java +++ b/java/google/registry/model/transfer/BaseTransferObject.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.transfer; +package google.registry.model.transfer; -import com.google.domain.registry.model.Buildable.GenericBuilder; -import com.google.domain.registry.model.ImmutableObject; +import google.registry.model.Buildable.GenericBuilder; +import google.registry.model.ImmutableObject; import org.joda.time.DateTime; diff --git a/java/google/registry/model/transfer/TransferData.java b/java/google/registry/model/transfer/TransferData.java index f8fc8ce99..1fed90b24 100644 --- a/java/google/registry/model/transfer/TransferData.java +++ b/java/google/registry/model/transfer/TransferData.java @@ -12,16 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.transfer; +package google.registry.model.transfer; -import static com.google.domain.registry.util.CollectionUtils.nullToEmptyImmutableCopy; +import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.poll.PollMessage; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; @@ -30,6 +25,12 @@ import com.googlecode.objectify.annotation.IgnoreSave; import com.googlecode.objectify.annotation.Unindex; import com.googlecode.objectify.condition.IfNull; +import google.registry.model.Buildable; +import google.registry.model.EppResource; +import google.registry.model.billing.BillingEvent; +import google.registry.model.eppcommon.Trid; +import google.registry.model.poll.PollMessage; + import java.util.Set; /** diff --git a/java/google/registry/model/transfer/TransferResponse.java b/java/google/registry/model/transfer/TransferResponse.java index 428ed985b..3765f04bf 100644 --- a/java/google/registry/model/transfer/TransferResponse.java +++ b/java/google/registry/model/transfer/TransferResponse.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.transfer; - -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppoutput.Response.ResponseData; +package google.registry.model.transfer; import com.googlecode.objectify.annotation.Embed; +import google.registry.model.EppResource; +import google.registry.model.eppoutput.Response.ResponseData; + import org.joda.time.DateTime; import javax.xml.bind.annotation.XmlElement; diff --git a/java/google/registry/model/transfer/TransferStatus.java b/java/google/registry/model/transfer/TransferStatus.java index 6c2d771ed..d47205d83 100644 --- a/java/google/registry/model/transfer/TransferStatus.java +++ b/java/google/registry/model/transfer/TransferStatus.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.transfer; +package google.registry.model.transfer; import com.google.common.base.CaseFormat; diff --git a/java/google/registry/model/transfer/package-info.java b/java/google/registry/model/transfer/package-info.java index afac3b895..a04c87fc9 100644 --- a/java/google/registry/model/transfer/package-info.java +++ b/java/google/registry/model/transfer/package-info.java @@ -18,9 +18,9 @@ elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) @XmlJavaTypeAdapter(UtcDateTimeAdapter.class) -package com.google.domain.registry.model.transfer; +package google.registry.model.transfer; -import com.google.domain.registry.xml.UtcDateTimeAdapter; +import google.registry.xml.UtcDateTimeAdapter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java b/java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java index e984e2f56..774be343b 100644 --- a/java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java +++ b/java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java @@ -12,9 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; - -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; +package google.registry.model.translators; import com.googlecode.objectify.impl.Path; import com.googlecode.objectify.impl.Property; @@ -24,6 +22,8 @@ import com.googlecode.objectify.impl.translate.SaveContext; import com.googlecode.objectify.impl.translate.ValueTranslator; import com.googlecode.objectify.impl.translate.ValueTranslatorFactory; +import google.registry.util.TypeUtils.TypeInstantiator; + import java.lang.reflect.Type; /** Common boilerplate for translator factories. */ diff --git a/java/google/registry/model/translators/CidrAddressBlockTranslatorFactory.java b/java/google/registry/model/translators/CidrAddressBlockTranslatorFactory.java index 3ac3bba95..36b071d47 100644 --- a/java/google/registry/model/translators/CidrAddressBlockTranslatorFactory.java +++ b/java/google/registry/model/translators/CidrAddressBlockTranslatorFactory.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; -import com.google.domain.registry.util.CidrAddressBlock; +import google.registry.util.CidrAddressBlock; /** Stores {@link CidrAddressBlock} as a canonicalized string. */ public class CidrAddressBlockTranslatorFactory diff --git a/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java b/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java index cc6e07f0e..91916dcfa 100644 --- a/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java +++ b/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; import static com.google.common.base.MoreObjects.firstNonNull; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Ordering; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.ofy.CommitLogManifest; import com.googlecode.objectify.Ref; +import google.registry.config.RegistryEnvironment; +import google.registry.model.ofy.CommitLogManifest; + import org.joda.time.DateTime; /** @@ -44,7 +45,7 @@ import org.joda.time.DateTime; *

Warning: Fields of this type must not be {@code null}, or else new entries can't be * inserted. You must take care to initialize the field to empty. * - * @see com.google.domain.registry.model.EppResource + * @see google.registry.model.EppResource */ public final class CommitLogRevisionsTranslatorFactory extends ImmutableSortedMapTranslatorFactory> { @@ -61,7 +62,7 @@ public final class CommitLogRevisionsTranslatorFactory *

We store a maximum of one entry per day. It will be the last transaction that happened on * that day. * - * @see com.google.domain.registry.config.RegistryConfig#getCommitLogDatastoreRetention() + * @see google.registry.config.RegistryConfig#getCommitLogDatastoreRetention() */ @Override ImmutableSortedMap> transformBeforeSave( diff --git a/java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java b/java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java index 0f065d09d..6637dba82 100644 --- a/java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java +++ b/java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; import static com.google.common.base.MoreObjects.firstNonNull; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import static org.joda.time.DateTimeZone.UTC; -import com.google.domain.registry.model.CreateAutoTimestamp; +import google.registry.model.CreateAutoTimestamp; import org.joda.time.DateTime; diff --git a/java/google/registry/model/translators/CurrencyUnitAdapter.java b/java/google/registry/model/translators/CurrencyUnitAdapter.java index 64ce12c45..1dd161b38 100644 --- a/java/google/registry/model/translators/CurrencyUnitAdapter.java +++ b/java/google/registry/model/translators/CurrencyUnitAdapter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; import static com.google.common.base.Strings.nullToEmpty; diff --git a/java/google/registry/model/translators/CurrencyUnitTranslatorFactory.java b/java/google/registry/model/translators/CurrencyUnitTranslatorFactory.java index cd03220b4..96d9ac341 100644 --- a/java/google/registry/model/translators/CurrencyUnitTranslatorFactory.java +++ b/java/google/registry/model/translators/CurrencyUnitTranslatorFactory.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; import org.joda.money.CurrencyUnit; diff --git a/java/google/registry/model/translators/DurationTranslatorFactory.java b/java/google/registry/model/translators/DurationTranslatorFactory.java index 0d7fb8faf..b009f7566 100644 --- a/java/google/registry/model/translators/DurationTranslatorFactory.java +++ b/java/google/registry/model/translators/DurationTranslatorFactory.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; import org.joda.time.Duration; diff --git a/java/google/registry/model/translators/EnumToAttributeAdapter.java b/java/google/registry/model/translators/EnumToAttributeAdapter.java index ef4534a42..8437afbbb 100644 --- a/java/google/registry/model/translators/EnumToAttributeAdapter.java +++ b/java/google/registry/model/translators/EnumToAttributeAdapter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.adapters.XmlAdapter; diff --git a/java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java b/java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java index 0eb5f7152..4ca02de04 100644 --- a/java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java +++ b/java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; import static com.googlecode.objectify.repackaged.gentyref.GenericTypeReflector.erase; import static com.googlecode.objectify.repackaged.gentyref.GenericTypeReflector.getTypeParameter; +import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Ordering; diff --git a/java/google/registry/model/translators/InetAddressTranslatorFactory.java b/java/google/registry/model/translators/InetAddressTranslatorFactory.java index c568c9cbd..4448ea889 100644 --- a/java/google/registry/model/translators/InetAddressTranslatorFactory.java +++ b/java/google/registry/model/translators/InetAddressTranslatorFactory.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; import com.google.common.net.InetAddresses; diff --git a/java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java b/java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java index da684d043..06336e3fc 100644 --- a/java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java +++ b/java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; import com.googlecode.objectify.impl.Path; import com.googlecode.objectify.impl.Property; @@ -31,7 +31,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Type; import java.util.Date; - /** * Stores Joda {@link ReadableInstant} types ({@code DateTime}, etc) as a {@link java.util.Date}. *

diff --git a/java/google/registry/model/translators/StatusValueAdapter.java b/java/google/registry/model/translators/StatusValueAdapter.java index 855f78ba4..ade4b52c9 100644 --- a/java/google/registry/model/translators/StatusValueAdapter.java +++ b/java/google/registry/model/translators/StatusValueAdapter.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; -import com.google.domain.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.StatusValue; /** Adapter for {@link StatusValue}. */ public class StatusValueAdapter extends EnumToAttributeAdapter { diff --git a/java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java b/java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java index 4e21f2e36..e7ad586e4 100644 --- a/java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java +++ b/java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import static org.joda.time.DateTimeZone.UTC; -import com.google.domain.registry.model.UpdateAutoTimestamp; +import google.registry.model.UpdateAutoTimestamp; import org.joda.time.DateTime; diff --git a/java/google/registry/module/backend/BUILD b/java/google/registry/module/backend/BUILD index 7b7ad67e2..24b5ce0d3 100644 --- a/java/google/registry/module/backend/BUILD +++ b/java/google/registry/module/backend/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "backend", @@ -10,27 +12,27 @@ java_library( "//java/com/google/common/base", "//java/com/google/common/collect", "//java/com/google/common/net", - "//java/com/google/domain/registry/backup", - "//java/com/google/domain/registry/bigquery", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/cron", - "//java/com/google/domain/registry/dns", - "//java/com/google/domain/registry/dns/writer/api", - "//java/com/google/domain/registry/dns/writer/dnsupdate", - "//java/com/google/domain/registry/export", - "//java/com/google/domain/registry/export/sheet", - "//java/com/google/domain/registry/flows", - "//java/com/google/domain/registry/gcs", - "//java/com/google/domain/registry/groups", - "//java/com/google/domain/registry/keyring/api", - "//java/com/google/domain/registry/mapreduce", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/monitoring/whitebox", - "//java/com/google/domain/registry/rde", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/request:modules", - "//java/com/google/domain/registry/tmch", - "//java/com/google/domain/registry/util", + "//java/google/registry/backup", + "//java/google/registry/bigquery", + "//java/google/registry/config", + "//java/google/registry/cron", + "//java/google/registry/dns", + "//java/google/registry/dns/writer/api", + "//java/google/registry/dns/writer/dnsupdate", + "//java/google/registry/export", + "//java/google/registry/export/sheet", + "//java/google/registry/flows", + "//java/google/registry/gcs", + "//java/google/registry/groups", + "//java/google/registry/keyring/api", + "//java/google/registry/mapreduce", + "//java/google/registry/model", + "//java/google/registry/monitoring/whitebox", + "//java/google/registry/rde", + "//java/google/registry/request", + "//java/google/registry/request:modules", + "//java/google/registry/tmch", + "//java/google/registry/util", "//third_party/java/bouncycastle", "//third_party/java/dagger", "//third_party/java/jsr305_annotations", @@ -48,6 +50,6 @@ java_binary( create_executable = 0, runtime_deps = [ ":backend", - "//java/com/google/domain/registry/monitoring/whitebox", # MetricsTaskServlet + "//java/google/registry/monitoring/whitebox", # MetricsTaskServlet ], ) diff --git a/java/google/registry/module/backend/BackendComponent.java b/java/google/registry/module/backend/BackendComponent.java index 5ce9718e3..5680b1522 100644 --- a/java/google/registry/module/backend/BackendComponent.java +++ b/java/google/registry/module/backend/BackendComponent.java @@ -12,34 +12,34 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.backend; - -import com.google.domain.registry.bigquery.BigqueryModule; -import com.google.domain.registry.config.ConfigModule; -import com.google.domain.registry.dns.writer.api.VoidDnsWriterModule; -import com.google.domain.registry.export.DriveModule; -import com.google.domain.registry.export.sheet.SpreadsheetServiceModule; -import com.google.domain.registry.gcs.GcsServiceModule; -import com.google.domain.registry.groups.DirectoryModule; -import com.google.domain.registry.groups.GroupsModule; -import com.google.domain.registry.groups.GroupssettingsModule; -import com.google.domain.registry.keyring.api.KeyModule; -import com.google.domain.registry.keyring.api.VoidKeyringModule; -import com.google.domain.registry.rde.JSchModule; -import com.google.domain.registry.request.Modules.AppIdentityCredentialModule; -import com.google.domain.registry.request.Modules.DatastoreServiceModule; -import com.google.domain.registry.request.Modules.GoogleCredentialModule; -import com.google.domain.registry.request.Modules.Jackson2Module; -import com.google.domain.registry.request.Modules.ModulesServiceModule; -import com.google.domain.registry.request.Modules.URLFetchServiceModule; -import com.google.domain.registry.request.Modules.UrlFetchTransportModule; -import com.google.domain.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule; -import com.google.domain.registry.request.RequestModule; -import com.google.domain.registry.util.SystemClock.SystemClockModule; -import com.google.domain.registry.util.SystemSleeper.SystemSleeperModule; +package google.registry.module.backend; import dagger.Component; +import google.registry.bigquery.BigqueryModule; +import google.registry.config.ConfigModule; +import google.registry.dns.writer.api.VoidDnsWriterModule; +import google.registry.export.DriveModule; +import google.registry.export.sheet.SpreadsheetServiceModule; +import google.registry.gcs.GcsServiceModule; +import google.registry.groups.DirectoryModule; +import google.registry.groups.GroupsModule; +import google.registry.groups.GroupssettingsModule; +import google.registry.keyring.api.KeyModule; +import google.registry.keyring.api.VoidKeyringModule; +import google.registry.rde.JSchModule; +import google.registry.request.Modules.AppIdentityCredentialModule; +import google.registry.request.Modules.DatastoreServiceModule; +import google.registry.request.Modules.GoogleCredentialModule; +import google.registry.request.Modules.Jackson2Module; +import google.registry.request.Modules.ModulesServiceModule; +import google.registry.request.Modules.URLFetchServiceModule; +import google.registry.request.Modules.UrlFetchTransportModule; +import google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule; +import google.registry.request.RequestModule; +import google.registry.util.SystemClock.SystemClockModule; +import google.registry.util.SystemSleeper.SystemSleeperModule; + import javax.inject.Singleton; /** Dagger component with instance lifetime for "backend" App Engine module. */ diff --git a/java/google/registry/module/backend/BackendModule.java b/java/google/registry/module/backend/BackendModule.java index e52384590..cfa970d58 100644 --- a/java/google/registry/module/backend/BackendModule.java +++ b/java/google/registry/module/backend/BackendModule.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.backend; +package google.registry.module.backend; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; -import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter; - -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; +import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.request.RequestParameters.extractRequiredParameter; import dagger.Module; import dagger.Provides; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; + import javax.servlet.http.HttpServletRequest; /** diff --git a/java/google/registry/module/backend/BackendRequestComponent.java b/java/google/registry/module/backend/BackendRequestComponent.java index 6249bc825..fd15e3796 100644 --- a/java/google/registry/module/backend/BackendRequestComponent.java +++ b/java/google/registry/module/backend/BackendRequestComponent.java @@ -12,55 +12,55 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.backend; - -import com.google.domain.registry.backup.BackupModule; -import com.google.domain.registry.backup.CommitLogCheckpointAction; -import com.google.domain.registry.backup.DeleteOldCommitLogsAction; -import com.google.domain.registry.backup.ExportCommitLogDiffAction; -import com.google.domain.registry.backup.RestoreCommitLogsAction; -import com.google.domain.registry.cron.CommitLogFanoutAction; -import com.google.domain.registry.cron.CronModule; -import com.google.domain.registry.cron.TldFanoutAction; -import com.google.domain.registry.dns.DnsModule; -import com.google.domain.registry.dns.PublishDnsUpdatesAction; -import com.google.domain.registry.dns.ReadDnsQueueAction; -import com.google.domain.registry.dns.RefreshDnsAction; -import com.google.domain.registry.dns.WriteDnsAction; -import com.google.domain.registry.export.BigqueryPollJobAction; -import com.google.domain.registry.export.ExportDomainListsAction; -import com.google.domain.registry.export.ExportRequestModule; -import com.google.domain.registry.export.ExportReservedTermsAction; -import com.google.domain.registry.export.LoadSnapshotAction; -import com.google.domain.registry.export.SyncGroupMembersAction; -import com.google.domain.registry.export.UpdateSnapshotViewAction; -import com.google.domain.registry.export.sheet.SheetModule; -import com.google.domain.registry.export.sheet.SyncRegistrarsSheetAction; -import com.google.domain.registry.flows.async.AsyncFlowsModule; -import com.google.domain.registry.flows.async.DeleteContactResourceAction; -import com.google.domain.registry.flows.async.DeleteHostResourceAction; -import com.google.domain.registry.flows.async.DnsRefreshForHostRenameAction; -import com.google.domain.registry.mapreduce.MapreduceModule; -import com.google.domain.registry.monitoring.whitebox.MetricsExportAction; -import com.google.domain.registry.monitoring.whitebox.VerifyEntityIntegrityAction; -import com.google.domain.registry.monitoring.whitebox.WhiteboxModule; -import com.google.domain.registry.rde.BrdaCopyAction; -import com.google.domain.registry.rde.RdeModule; -import com.google.domain.registry.rde.RdeReportAction; -import com.google.domain.registry.rde.RdeReporter; -import com.google.domain.registry.rde.RdeStagingAction; -import com.google.domain.registry.rde.RdeUploadAction; -import com.google.domain.registry.request.RequestModule; -import com.google.domain.registry.request.RequestScope; -import com.google.domain.registry.tmch.NordnUploadAction; -import com.google.domain.registry.tmch.NordnVerifyAction; -import com.google.domain.registry.tmch.TmchCrlAction; -import com.google.domain.registry.tmch.TmchDnlAction; -import com.google.domain.registry.tmch.TmchModule; -import com.google.domain.registry.tmch.TmchSmdrlAction; +package google.registry.module.backend; import dagger.Subcomponent; +import google.registry.backup.BackupModule; +import google.registry.backup.CommitLogCheckpointAction; +import google.registry.backup.DeleteOldCommitLogsAction; +import google.registry.backup.ExportCommitLogDiffAction; +import google.registry.backup.RestoreCommitLogsAction; +import google.registry.cron.CommitLogFanoutAction; +import google.registry.cron.CronModule; +import google.registry.cron.TldFanoutAction; +import google.registry.dns.DnsModule; +import google.registry.dns.PublishDnsUpdatesAction; +import google.registry.dns.ReadDnsQueueAction; +import google.registry.dns.RefreshDnsAction; +import google.registry.dns.WriteDnsAction; +import google.registry.export.BigqueryPollJobAction; +import google.registry.export.ExportDomainListsAction; +import google.registry.export.ExportRequestModule; +import google.registry.export.ExportReservedTermsAction; +import google.registry.export.LoadSnapshotAction; +import google.registry.export.SyncGroupMembersAction; +import google.registry.export.UpdateSnapshotViewAction; +import google.registry.export.sheet.SheetModule; +import google.registry.export.sheet.SyncRegistrarsSheetAction; +import google.registry.flows.async.AsyncFlowsModule; +import google.registry.flows.async.DeleteContactResourceAction; +import google.registry.flows.async.DeleteHostResourceAction; +import google.registry.flows.async.DnsRefreshForHostRenameAction; +import google.registry.mapreduce.MapreduceModule; +import google.registry.monitoring.whitebox.MetricsExportAction; +import google.registry.monitoring.whitebox.VerifyEntityIntegrityAction; +import google.registry.monitoring.whitebox.WhiteboxModule; +import google.registry.rde.BrdaCopyAction; +import google.registry.rde.RdeModule; +import google.registry.rde.RdeReportAction; +import google.registry.rde.RdeReporter; +import google.registry.rde.RdeStagingAction; +import google.registry.rde.RdeUploadAction; +import google.registry.request.RequestModule; +import google.registry.request.RequestScope; +import google.registry.tmch.NordnUploadAction; +import google.registry.tmch.NordnVerifyAction; +import google.registry.tmch.TmchCrlAction; +import google.registry.tmch.TmchDnlAction; +import google.registry.tmch.TmchModule; +import google.registry.tmch.TmchSmdrlAction; + /** Dagger component with per-request lifetime for "backend" App Engine module. */ @RequestScope @Subcomponent( diff --git a/java/google/registry/module/backend/BackendServlet.java b/java/google/registry/module/backend/BackendServlet.java index 9476ea2b4..f4c29d053 100644 --- a/java/google/registry/module/backend/BackendServlet.java +++ b/java/google/registry/module/backend/BackendServlet.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.backend; +package google.registry.module.backend; import static java.util.Arrays.asList; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; -import com.google.domain.registry.request.RequestHandler; -import com.google.domain.registry.request.RequestModule; + +import google.registry.request.RequestHandler; +import google.registry.request.RequestModule; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/java/google/registry/module/backend/package-info.java b/java/google/registry/module/backend/package-info.java index f729cdaf5..fc37151bb 100644 --- a/java/google/registry/module/backend/package-info.java +++ b/java/google/registry/module/backend/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.module.backend; +package google.registry.module.backend; diff --git a/java/google/registry/module/frontend/BUILD b/java/google/registry/module/frontend/BUILD index 24e12000a..93fe2cc72 100644 --- a/java/google/registry/module/frontend/BUILD +++ b/java/google/registry/module/frontend/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "frontend", @@ -9,21 +11,21 @@ java_library( deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", - "//java/com/google/domain/registry/braintree", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/keyring/api", - "//java/com/google/domain/registry/rdap", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/request:modules", - "//java/com/google/domain/registry/ui", - "//java/com/google/domain/registry/ui/server/registrar", - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/whois", "//third_party/java/bouncycastle", "//third_party/java/dagger", "//third_party/java/jsr305_annotations", "//third_party/java/jsr330_inject", "//third_party/java/servlet/servlet_api", + "//java/google/registry/braintree", + "//java/google/registry/config", + "//java/google/registry/keyring/api", + "//java/google/registry/rdap", + "//java/google/registry/request", + "//java/google/registry/request:modules", + "//java/google/registry/ui", + "//java/google/registry/ui/server/registrar", + "//java/google/registry/util", + "//java/google/registry/whois", ], ) @@ -36,7 +38,7 @@ java_binary( create_executable = 0, runtime_deps = [ ":frontend", - "//java/com/google/domain/registry/ui/server/api", # CheckApiServlet - "//java/com/google/domain/registry/ui/server/registrar", # ResourceServlet + "//java/google/registry/ui/server/api", # CheckApiServlet + "//java/google/registry/ui/server/registrar", # ResourceServlet ], ) diff --git a/java/google/registry/module/frontend/FrontendComponent.java b/java/google/registry/module/frontend/FrontendComponent.java index 34841de31..b7c160bf8 100644 --- a/java/google/registry/module/frontend/FrontendComponent.java +++ b/java/google/registry/module/frontend/FrontendComponent.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.frontend; - -import com.google.domain.registry.braintree.BraintreeModule; -import com.google.domain.registry.config.ConfigModule; -import com.google.domain.registry.keyring.api.KeyModule; -import com.google.domain.registry.keyring.api.VoidKeyringModule; -import com.google.domain.registry.request.Modules.UserServiceModule; -import com.google.domain.registry.request.RequestModule; -import com.google.domain.registry.ui.ConsoleConfigModule; -import com.google.domain.registry.util.SystemClock.SystemClockModule; +package google.registry.module.frontend; import dagger.Component; +import google.registry.braintree.BraintreeModule; +import google.registry.config.ConfigModule; +import google.registry.keyring.api.KeyModule; +import google.registry.keyring.api.VoidKeyringModule; +import google.registry.request.Modules.UserServiceModule; +import google.registry.request.RequestModule; +import google.registry.ui.ConsoleConfigModule; +import google.registry.util.SystemClock.SystemClockModule; + import javax.inject.Singleton; /** Dagger component with instance lifetime for "default" App Engine module. */ diff --git a/java/google/registry/module/frontend/FrontendRequestComponent.java b/java/google/registry/module/frontend/FrontendRequestComponent.java index d748c3592..c471faff4 100644 --- a/java/google/registry/module/frontend/FrontendRequestComponent.java +++ b/java/google/registry/module/frontend/FrontendRequestComponent.java @@ -12,30 +12,30 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.frontend; - -import com.google.domain.registry.rdap.RdapAutnumAction; -import com.google.domain.registry.rdap.RdapDomainAction; -import com.google.domain.registry.rdap.RdapDomainSearchAction; -import com.google.domain.registry.rdap.RdapEntityAction; -import com.google.domain.registry.rdap.RdapEntitySearchAction; -import com.google.domain.registry.rdap.RdapHelpAction; -import com.google.domain.registry.rdap.RdapIpAction; -import com.google.domain.registry.rdap.RdapModule; -import com.google.domain.registry.rdap.RdapNameserverAction; -import com.google.domain.registry.rdap.RdapNameserverSearchAction; -import com.google.domain.registry.request.RequestModule; -import com.google.domain.registry.request.RequestScope; -import com.google.domain.registry.ui.server.registrar.ConsoleUiAction; -import com.google.domain.registry.ui.server.registrar.RegistrarPaymentAction; -import com.google.domain.registry.ui.server.registrar.RegistrarPaymentSetupAction; -import com.google.domain.registry.ui.server.registrar.RegistrarUserModule; -import com.google.domain.registry.whois.WhoisHttpServer; -import com.google.domain.registry.whois.WhoisModule; -import com.google.domain.registry.whois.WhoisServer; +package google.registry.module.frontend; import dagger.Subcomponent; +import google.registry.rdap.RdapAutnumAction; +import google.registry.rdap.RdapDomainAction; +import google.registry.rdap.RdapDomainSearchAction; +import google.registry.rdap.RdapEntityAction; +import google.registry.rdap.RdapEntitySearchAction; +import google.registry.rdap.RdapHelpAction; +import google.registry.rdap.RdapIpAction; +import google.registry.rdap.RdapModule; +import google.registry.rdap.RdapNameserverAction; +import google.registry.rdap.RdapNameserverSearchAction; +import google.registry.request.RequestModule; +import google.registry.request.RequestScope; +import google.registry.ui.server.registrar.ConsoleUiAction; +import google.registry.ui.server.registrar.RegistrarPaymentAction; +import google.registry.ui.server.registrar.RegistrarPaymentSetupAction; +import google.registry.ui.server.registrar.RegistrarUserModule; +import google.registry.whois.WhoisHttpServer; +import google.registry.whois.WhoisModule; +import google.registry.whois.WhoisServer; + /** Dagger component with per-request lifetime for "default" App Engine module. */ @RequestScope @Subcomponent( diff --git a/java/google/registry/module/frontend/FrontendServlet.java b/java/google/registry/module/frontend/FrontendServlet.java index 4a4d88025..1a889a30e 100644 --- a/java/google/registry/module/frontend/FrontendServlet.java +++ b/java/google/registry/module/frontend/FrontendServlet.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.frontend; +package google.registry.module.frontend; import static java.util.Arrays.asList; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; -import com.google.domain.registry.request.RequestHandler; -import com.google.domain.registry.request.RequestModule; + +import google.registry.request.RequestHandler; +import google.registry.request.RequestModule; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/java/google/registry/module/frontend/package-info.java b/java/google/registry/module/frontend/package-info.java index 4eb95e09e..234c16500 100644 --- a/java/google/registry/module/frontend/package-info.java +++ b/java/google/registry/module/frontend/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.module.frontend; +package google.registry.module.frontend; diff --git a/java/google/registry/module/tools/BUILD b/java/google/registry/module/tools/BUILD index 0e163ac87..8b07acdd3 100644 --- a/java/google/registry/module/tools/BUILD +++ b/java/google/registry/module/tools/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "tools", @@ -9,23 +11,23 @@ java_library( deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/export", - "//java/com/google/domain/registry/gcs", - "//java/com/google/domain/registry/groups", - "//java/com/google/domain/registry/keyring/api", - "//java/com/google/domain/registry/loadtest", - "//java/com/google/domain/registry/mapreduce", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/request:modules", - "//java/com/google/domain/registry/tools/server", - "//java/com/google/domain/registry/tools/server/javascrap", - "//java/com/google/domain/registry/util", "//third_party/java/bouncycastle", "//third_party/java/dagger", "//third_party/java/jsr305_annotations", "//third_party/java/jsr330_inject", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/export", + "//java/google/registry/gcs", + "//java/google/registry/groups", + "//java/google/registry/keyring/api", + "//java/google/registry/loadtest", + "//java/google/registry/mapreduce", + "//java/google/registry/request", + "//java/google/registry/request:modules", + "//java/google/registry/tools/server", + "//java/google/registry/tools/server/javascrap", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/module/tools/ToolsComponent.java b/java/google/registry/module/tools/ToolsComponent.java index 55528aa6a..fffc1434b 100644 --- a/java/google/registry/module/tools/ToolsComponent.java +++ b/java/google/registry/module/tools/ToolsComponent.java @@ -12,28 +12,28 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.tools; - -import com.google.domain.registry.config.ConfigModule; -import com.google.domain.registry.export.DriveModule; -import com.google.domain.registry.gcs.GcsServiceModule; -import com.google.domain.registry.groups.DirectoryModule; -import com.google.domain.registry.groups.GroupsModule; -import com.google.domain.registry.groups.GroupssettingsModule; -import com.google.domain.registry.keyring.api.KeyModule; -import com.google.domain.registry.keyring.api.VoidKeyringModule; -import com.google.domain.registry.request.Modules.AppIdentityCredentialModule; -import com.google.domain.registry.request.Modules.DatastoreServiceModule; -import com.google.domain.registry.request.Modules.GoogleCredentialModule; -import com.google.domain.registry.request.Modules.Jackson2Module; -import com.google.domain.registry.request.Modules.UrlFetchTransportModule; -import com.google.domain.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule; -import com.google.domain.registry.request.RequestModule; -import com.google.domain.registry.util.SystemClock.SystemClockModule; -import com.google.domain.registry.util.SystemSleeper.SystemSleeperModule; +package google.registry.module.tools; import dagger.Component; +import google.registry.config.ConfigModule; +import google.registry.export.DriveModule; +import google.registry.gcs.GcsServiceModule; +import google.registry.groups.DirectoryModule; +import google.registry.groups.GroupsModule; +import google.registry.groups.GroupssettingsModule; +import google.registry.keyring.api.KeyModule; +import google.registry.keyring.api.VoidKeyringModule; +import google.registry.request.Modules.AppIdentityCredentialModule; +import google.registry.request.Modules.DatastoreServiceModule; +import google.registry.request.Modules.GoogleCredentialModule; +import google.registry.request.Modules.Jackson2Module; +import google.registry.request.Modules.UrlFetchTransportModule; +import google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule; +import google.registry.request.RequestModule; +import google.registry.util.SystemClock.SystemClockModule; +import google.registry.util.SystemSleeper.SystemSleeperModule; + import javax.inject.Singleton; /** Dagger component with instance lifetime for "tools" App Engine module. */ diff --git a/java/google/registry/module/tools/ToolsRequestComponent.java b/java/google/registry/module/tools/ToolsRequestComponent.java index 94ad919ef..90c4264ef 100644 --- a/java/google/registry/module/tools/ToolsRequestComponent.java +++ b/java/google/registry/module/tools/ToolsRequestComponent.java @@ -12,37 +12,36 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.tools; - -import com.google.domain.registry.export.PublishDetailReportAction; -import com.google.domain.registry.loadtest.LoadTestAction; -import com.google.domain.registry.loadtest.LoadTestModule; -import com.google.domain.registry.mapreduce.MapreduceModule; -import com.google.domain.registry.request.RequestModule; -import com.google.domain.registry.request.RequestScope; -import com.google.domain.registry.tools.server.CreateGroupsAction; -import com.google.domain.registry.tools.server.CreatePremiumListAction; -import com.google.domain.registry.tools.server.DeleteEntityAction; -import com.google.domain.registry.tools.server.DeleteProberDataAction; -import com.google.domain.registry.tools.server.GenerateZoneFilesAction; -import com.google.domain.registry.tools.server.KillAllCommitLogsAction; -import com.google.domain.registry.tools.server.KillAllCrossTldEntitiesAction; -import com.google.domain.registry.tools.server.KillAllEppResourcesAction; -import com.google.domain.registry.tools.server.ListDomainsAction; -import com.google.domain.registry.tools.server.ListHostsAction; -import com.google.domain.registry.tools.server.ListPremiumListsAction; -import com.google.domain.registry.tools.server.ListRegistrarsAction; -import com.google.domain.registry.tools.server.ListReservedListsAction; -import com.google.domain.registry.tools.server.ListTldsAction; -import com.google.domain.registry.tools.server.ResaveAllEppResourcesAction; -import com.google.domain.registry.tools.server.ToolsServerModule; -import com.google.domain.registry.tools.server.UpdatePremiumListAction; -import com.google.domain.registry.tools.server.VerifyOteAction; -import com.google.domain.registry.tools.server.javascrap.BackfillAutorenewBillingFlagAction; -import com.google.domain.registry.tools.server.javascrap.CountRecurringBillingEventsAction; +package google.registry.module.tools; import dagger.Subcomponent; +import google.registry.export.PublishDetailReportAction; +import google.registry.loadtest.LoadTestAction; +import google.registry.loadtest.LoadTestModule; +import google.registry.mapreduce.MapreduceModule; +import google.registry.request.RequestModule; +import google.registry.request.RequestScope; +import google.registry.tools.server.CreateGroupsAction; +import google.registry.tools.server.CreatePremiumListAction; +import google.registry.tools.server.DeleteEntityAction; +import google.registry.tools.server.DeleteProberDataAction; +import google.registry.tools.server.GenerateZoneFilesAction; +import google.registry.tools.server.KillAllCommitLogsAction; +import google.registry.tools.server.KillAllEppResourcesAction; +import google.registry.tools.server.ListDomainsAction; +import google.registry.tools.server.ListHostsAction; +import google.registry.tools.server.ListPremiumListsAction; +import google.registry.tools.server.ListRegistrarsAction; +import google.registry.tools.server.ListReservedListsAction; +import google.registry.tools.server.ListTldsAction; +import google.registry.tools.server.ResaveAllEppResourcesAction; +import google.registry.tools.server.ToolsServerModule; +import google.registry.tools.server.UpdatePremiumListAction; +import google.registry.tools.server.VerifyOteAction; +import google.registry.tools.server.javascrap.BackfillAutorenewBillingFlagAction; +import google.registry.tools.server.javascrap.CountRecurringBillingEventsAction; + /** Dagger component with per-request lifetime for "tools" App Engine module. */ @RequestScope @Subcomponent( @@ -61,7 +60,6 @@ interface ToolsRequestComponent { DeleteProberDataAction deleteProberDataAction(); GenerateZoneFilesAction generateZoneFilesAction(); KillAllCommitLogsAction killAllCommitLogsAction(); - KillAllCrossTldEntitiesAction killAllCrossTldEntitiesAction(); KillAllEppResourcesAction killAllEppResourcesAction(); ListDomainsAction listDomainsAction(); ListHostsAction listHostsAction(); diff --git a/java/google/registry/module/tools/ToolsServlet.java b/java/google/registry/module/tools/ToolsServlet.java index c45f2b401..e70e10dbf 100644 --- a/java/google/registry/module/tools/ToolsServlet.java +++ b/java/google/registry/module/tools/ToolsServlet.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.tools; +package google.registry.module.tools; import static java.util.Arrays.asList; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; -import com.google.domain.registry.request.RequestHandler; -import com.google.domain.registry.request.RequestModule; + +import google.registry.request.RequestHandler; +import google.registry.request.RequestModule; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/java/google/registry/monitoring/whitebox/BUILD b/java/google/registry/monitoring/whitebox/BUILD index e0bcf3cae..3e9238d7f 100644 --- a/java/google/registry/monitoring/whitebox/BUILD +++ b/java/google/registry/monitoring/whitebox/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "whitebox", @@ -14,14 +16,6 @@ java_library( "//java/com/google/common/cache", "//java/com/google/common/collect", "//java/com/google/common/net", - "//java/com/google/domain/registry/bigquery", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/mapreduce", - "//java/com/google/domain/registry/mapreduce/inputs", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/request:modules", - "//java/com/google/domain/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/appengine_mapreduce2:appengine_mapreduce", "//third_party/java/auto:auto_factory", @@ -31,5 +25,13 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/bigquery", + "//java/google/registry/config", + "//java/google/registry/mapreduce", + "//java/google/registry/mapreduce/inputs", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/request:modules", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/monitoring/whitebox/EntityIntegrityAlertsSchema.java b/java/google/registry/monitoring/whitebox/EntityIntegrityAlertsSchema.java index 07b1edfb9..1938e9825 100644 --- a/java/google/registry/monitoring/whitebox/EntityIntegrityAlertsSchema.java +++ b/java/google/registry/monitoring/whitebox/EntityIntegrityAlertsSchema.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.monitoring.whitebox; +package google.registry.monitoring.whitebox; -import static com.google.domain.registry.bigquery.BigqueryUtils.FieldType.STRING; -import static com.google.domain.registry.bigquery.BigqueryUtils.FieldType.TIMESTAMP; +import static google.registry.bigquery.BigqueryUtils.FieldType.STRING; +import static google.registry.bigquery.BigqueryUtils.FieldType.TIMESTAMP; import com.google.api.services.bigquery.model.TableFieldSchema; import com.google.common.collect.ImmutableList; diff --git a/java/google/registry/monitoring/whitebox/EppMetrics.java b/java/google/registry/monitoring/whitebox/EppMetrics.java index d6d63395c..db6d0e8d4 100644 --- a/java/google/registry/monitoring/whitebox/EppMetrics.java +++ b/java/google/registry/monitoring/whitebox/EppMetrics.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.monitoring.whitebox; +package google.registry.monitoring.whitebox; import com.google.api.services.bigquery.model.TableFieldSchema; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.bigquery.BigqueryUtils.FieldType; -import com.google.domain.registry.model.eppoutput.Result.Code; + +import google.registry.bigquery.BigqueryUtils.FieldType; +import google.registry.model.eppoutput.Result.Code; /** The EPP Metrics collector. See {@link Metrics}. */ public class EppMetrics extends Metrics { diff --git a/java/google/registry/monitoring/whitebox/Metrics.java b/java/google/registry/monitoring/whitebox/Metrics.java index c9b16c57e..d462cb95a 100644 --- a/java/google/registry/monitoring/whitebox/Metrics.java +++ b/java/google/registry/monitoring/whitebox/Metrics.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.monitoring.whitebox; +package google.registry.monitoring.whitebox; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; -import static com.google.domain.registry.bigquery.BigqueryUtils.toBigqueryTimestamp; +import static google.registry.bigquery.BigqueryUtils.toBigqueryTimestamp; import com.google.appengine.api.modules.ModulesService; import com.google.appengine.api.modules.ModulesServiceFactory; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TransientFailureException; import com.google.common.base.Supplier; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.NonFinalForTesting; -import com.google.domain.registry.util.SystemClock; + +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; +import google.registry.util.NonFinalForTesting; +import google.registry.util.SystemClock; import java.util.HashMap; import java.util.Map; diff --git a/java/google/registry/monitoring/whitebox/MetricsExportAction.java b/java/google/registry/monitoring/whitebox/MetricsExportAction.java index ab8a97b64..76d37346c 100644 --- a/java/google/registry/monitoring/whitebox/MetricsExportAction.java +++ b/java/google/registry/monitoring/whitebox/MetricsExportAction.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.monitoring.whitebox; +package google.registry.monitoring.whitebox; import static com.google.common.base.Predicates.in; import static com.google.common.base.Predicates.not; import static com.google.common.collect.Multimaps.filterKeys; -import static com.google.domain.registry.request.Action.Method.POST; -import static com.google.domain.registry.util.FormattingLogger.getLoggerForCallerClass; +import static google.registry.request.Action.Method.POST; +import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import com.google.api.services.bigquery.Bigquery; import com.google.api.services.bigquery.model.TableDataInsertAllRequest; @@ -31,12 +31,13 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.bigquery.BigqueryFactory; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.ParameterMap; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.bigquery.BigqueryFactory; +import google.registry.config.ConfigModule.Config; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.request.ParameterMap; +import google.registry.util.FormattingLogger; import java.io.IOException; import java.util.Map; diff --git a/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityAction.java b/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityAction.java index 693579ea8..722e9572e 100644 --- a/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityAction.java +++ b/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityAction.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.monitoring.whitebox; +package google.registry.monitoring.whitebox; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.getOnlyElement; -import static com.google.domain.registry.model.EppResourceUtils.isActive; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.earliestOf; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; -import static com.google.domain.registry.util.FormattingLogger.getLoggerForCallerClass; -import static com.google.domain.registry.util.PipelineUtils.createJobPath; import static com.googlecode.objectify.Key.getKind; +import static google.registry.model.EppResourceUtils.isActive; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.DateTimeUtils.earliestOf; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; +import static google.registry.util.FormattingLogger.getLoggerForCallerClass; +import static google.registry.util.PipelineUtils.createJobPath; import static org.joda.time.DateTimeZone.UTC; import com.google.appengine.tools.mapreduce.Input; @@ -37,32 +37,33 @@ import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.mapreduce.inputs.EppResourceInputs; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.index.DomainApplicationIndex; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.NonFinalForTesting; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.mapreduce.inputs.EppResourceInputs; +import google.registry.model.EppResource; +import google.registry.model.ImmutableObject; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.host.HostResource; +import google.registry.model.index.DomainApplicationIndex; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; +import google.registry.request.Action; +import google.registry.request.Response; +import google.registry.util.FormattingLogger; +import google.registry.util.NonFinalForTesting; + import org.joda.time.DateTime; import java.io.Serializable; diff --git a/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityStreamer.java b/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityStreamer.java index 8af1d1281..9a6417827 100644 --- a/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityStreamer.java +++ b/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityStreamer.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.monitoring.whitebox; +package google.registry.monitoring.whitebox; import static com.google.api.client.util.Data.NULL_STRING; -import static com.google.domain.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.DATASET; -import static com.google.domain.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.FIELD_MESSAGE; -import static com.google.domain.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.FIELD_SCANTIME; -import static com.google.domain.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.FIELD_SOURCE; -import static com.google.domain.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.FIELD_TARGET; -import static com.google.domain.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.TABLE_ID; +import static google.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.DATASET; +import static google.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.FIELD_MESSAGE; +import static google.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.FIELD_SCANTIME; +import static google.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.FIELD_SOURCE; +import static google.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.FIELD_TARGET; +import static google.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.TABLE_ID; import com.google.api.services.bigquery.Bigquery; import com.google.api.services.bigquery.Bigquery.Tabledata.InsertAll; @@ -36,9 +36,10 @@ import com.google.common.base.Supplier; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.bigquery.BigqueryFactory; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.util.Retrier; + +import google.registry.bigquery.BigqueryFactory; +import google.registry.config.RegistryEnvironment; +import google.registry.util.Retrier; import org.joda.time.DateTime; diff --git a/java/google/registry/monitoring/whitebox/WhiteboxComponent.java b/java/google/registry/monitoring/whitebox/WhiteboxComponent.java index d6a32235c..a1e85be0d 100644 --- a/java/google/registry/monitoring/whitebox/WhiteboxComponent.java +++ b/java/google/registry/monitoring/whitebox/WhiteboxComponent.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.monitoring.whitebox; - -import com.google.domain.registry.bigquery.BigqueryModule; -import com.google.domain.registry.config.ConfigModule; -import com.google.domain.registry.request.Modules.DatastoreServiceModule; -import com.google.domain.registry.util.SystemSleeper.SystemSleeperModule; +package google.registry.monitoring.whitebox; import dagger.Component; +import google.registry.bigquery.BigqueryModule; +import google.registry.config.ConfigModule; +import google.registry.request.Modules.DatastoreServiceModule; +import google.registry.util.SystemSleeper.SystemSleeperModule; + import javax.inject.Singleton; /** Dagger component with instance lifetime for Whitebox package. */ diff --git a/java/google/registry/monitoring/whitebox/WhiteboxModule.java b/java/google/registry/monitoring/whitebox/WhiteboxModule.java index 421954292..c3596ca39 100644 --- a/java/google/registry/monitoring/whitebox/WhiteboxModule.java +++ b/java/google/registry/monitoring/whitebox/WhiteboxModule.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.monitoring.whitebox; +package google.registry.monitoring.whitebox; -import static com.google.domain.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.ENTITY_INTEGRITY_ALERTS_SCHEMA_FIELDS; -import static com.google.domain.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.TABLE_ID; -import static com.google.domain.registry.monitoring.whitebox.EppMetrics.EPPMETRICS_SCHEMA_FIELDS; -import static com.google.domain.registry.monitoring.whitebox.EppMetrics.EPPMETRICS_TABLE_ID; -import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter; import static dagger.Provides.Type.MAP; +import static google.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.ENTITY_INTEGRITY_ALERTS_SCHEMA_FIELDS; +import static google.registry.monitoring.whitebox.EntityIntegrityAlertsSchema.TABLE_ID; +import static google.registry.monitoring.whitebox.EppMetrics.EPPMETRICS_SCHEMA_FIELDS; +import static google.registry.monitoring.whitebox.EppMetrics.EPPMETRICS_TABLE_ID; +import static google.registry.request.RequestParameters.extractRequiredParameter; import com.google.api.services.bigquery.model.TableFieldSchema; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.request.Parameter; import dagger.Module; import dagger.Provides; import dagger.multibindings.StringKey; +import google.registry.request.Parameter; + import java.util.UUID; import javax.servlet.http.HttpServletRequest; diff --git a/java/google/registry/monitoring/whitebox/package-info.java b/java/google/registry/monitoring/whitebox/package-info.java index 965e491dc..312e21ad1 100644 --- a/java/google/registry/monitoring/whitebox/package-info.java +++ b/java/google/registry/monitoring/whitebox/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.monitoring.whitebox; +package google.registry.monitoring.whitebox; diff --git a/java/google/registry/rdap/BUILD b/java/google/registry/rdap/BUILD index 5dca14942..afbce5ec2 100644 --- a/java/google/registry/rdap/BUILD +++ b/java/google/registry/rdap/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "rdap", @@ -14,10 +16,6 @@ java_library( "//java/com/google/common/io", "//java/com/google/common/net", "//java/com/google/common/primitives", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", "//third_party/java/auto:auto_value", "//third_party/java/dagger", "//third_party/java/joda_time", @@ -26,5 +24,9 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/rdap/RdapActionBase.java b/java/google/registry/rdap/RdapActionBase.java index 1e9324c3e..6ef83340c 100644 --- a/java/google/registry/rdap/RdapActionBase.java +++ b/java/google/registry/rdap/RdapActionBase.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.net.HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.Registries.findTldForName; -import static com.google.domain.registry.model.registry.Registries.getTlds; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.Registries.findTldForName; +import static google.registry.model.registry.Registries.getTlds; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_OK; @@ -29,19 +29,20 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.net.InternetDomainName; import com.google.common.net.MediaType; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.NotFoundException; -import com.google.domain.registry.request.RequestMethod; -import com.google.domain.registry.request.RequestPath; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.FormattingLogger; import com.googlecode.objectify.cmd.Query; +import google.registry.config.ConfigModule.Config; +import google.registry.model.EppResource; +import google.registry.request.Action; +import google.registry.request.HttpException; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.NotFoundException; +import google.registry.request.RequestMethod; +import google.registry.request.RequestPath; +import google.registry.request.Response; +import google.registry.util.FormattingLogger; + import org.json.simple.JSONValue; import java.net.URI; diff --git a/java/google/registry/rdap/RdapAutnumAction.java b/java/google/registry/rdap/RdapAutnumAction.java index 3dbb8d7fb..f5e3974c7 100644 --- a/java/google/registry/rdap/RdapAutnumAction.java +++ b/java/google/registry/rdap/RdapAutnumAction.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.HEAD; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.HEAD; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.request.HttpException.NotImplementedException; + +import google.registry.request.Action; +import google.registry.request.HttpException; +import google.registry.request.HttpException.NotImplementedException; import javax.inject.Inject; diff --git a/java/google/registry/rdap/RdapDomainAction.java b/java/google/registry/rdap/RdapDomainAction.java index 7aa9171f6..89f89fbfd 100644 --- a/java/google/registry/rdap/RdapDomainAction.java +++ b/java/google/registry/rdap/RdapDomainAction.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.HEAD; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.HEAD; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.request.HttpException.NotFoundException; -import com.google.domain.registry.util.Clock; + +import google.registry.model.domain.DomainResource; +import google.registry.request.Action; +import google.registry.request.HttpException; +import google.registry.request.HttpException.NotFoundException; +import google.registry.util.Clock; import javax.inject.Inject; diff --git a/java/google/registry/rdap/RdapDomainSearchAction.java b/java/google/registry/rdap/RdapDomainSearchAction.java index a3801f65c..d01fca3ee 100644 --- a/java/google/registry/rdap/RdapDomainSearchAction.java +++ b/java/google/registry/rdap/RdapDomainSearchAction.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.model.index.ForeignKeyIndex.loadAndGetReference; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.HEAD; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.index.ForeignKeyIndex.loadAndGetReference; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.HEAD; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -27,22 +27,23 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Iterables; import com.google.common.primitives.Booleans; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.rdap.RdapJsonFormatter.BoilerplateType; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.NotFoundException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.Idn; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; import com.googlecode.objectify.cmd.Query; import com.googlecode.objectify.cmd.QueryKeys; +import google.registry.model.domain.DomainResource; +import google.registry.model.host.HostResource; +import google.registry.rdap.RdapJsonFormatter.BoilerplateType; +import google.registry.request.Action; +import google.registry.request.HttpException; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.NotFoundException; +import google.registry.request.Parameter; +import google.registry.util.Clock; +import google.registry.util.Idn; + import org.joda.time.DateTime; import java.net.InetAddress; diff --git a/java/google/registry/rdap/RdapEntityAction.java b/java/google/registry/rdap/RdapEntityAction.java index 056bc4d87..544cfbaa0 100644 --- a/java/google/registry/rdap/RdapEntityAction.java +++ b/java/google/registry/rdap/RdapEntityAction.java @@ -12,25 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.HEAD; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.HEAD; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.NotFoundException; -import com.google.domain.registry.util.Clock; import com.googlecode.objectify.Key; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.registrar.Registrar; +import google.registry.request.Action; +import google.registry.request.HttpException; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.NotFoundException; +import google.registry.util.Clock; + import java.util.regex.Pattern; import javax.inject.Inject; diff --git a/java/google/registry/rdap/RdapEntitySearchAction.java b/java/google/registry/rdap/RdapEntitySearchAction.java index 02ac2daab..a7259d30d 100644 --- a/java/google/registry/rdap/RdapEntitySearchAction.java +++ b/java/google/registry/rdap/RdapEntitySearchAction.java @@ -12,34 +12,35 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.HEAD; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.HEAD; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Booleans; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.rdap.RdapJsonFormatter.BoilerplateType; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.NotFoundException; -import com.google.domain.registry.request.HttpException.NotImplementedException; -import com.google.domain.registry.request.HttpException.UnprocessableEntityException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.Clock; import com.googlecode.objectify.Key; import com.googlecode.objectify.cmd.Query; +import google.registry.config.ConfigModule.Config; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.registrar.Registrar; +import google.registry.rdap.RdapJsonFormatter.BoilerplateType; +import google.registry.request.Action; +import google.registry.request.HttpException; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.NotFoundException; +import google.registry.request.HttpException.NotImplementedException; +import google.registry.request.HttpException.UnprocessableEntityException; +import google.registry.request.Parameter; +import google.registry.util.Clock; + import javax.inject.Inject; /** diff --git a/java/google/registry/rdap/RdapHelpAction.java b/java/google/registry/rdap/RdapHelpAction.java index 25a70f42c..ce3594e91 100644 --- a/java/google/registry/rdap/RdapHelpAction.java +++ b/java/google/registry/rdap/RdapHelpAction.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.HEAD; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.HEAD; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.rdap.RdapJsonFormatter.BoilerplateType; -import com.google.domain.registry.rdap.RdapJsonFormatter.MakeRdapJsonNoticeParameters; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.request.HttpException.InternalServerErrorException; -import com.google.domain.registry.request.HttpException.NotFoundException; -import com.google.domain.registry.util.Clock; + +import google.registry.rdap.RdapJsonFormatter.BoilerplateType; +import google.registry.rdap.RdapJsonFormatter.MakeRdapJsonNoticeParameters; +import google.registry.request.Action; +import google.registry.request.HttpException; +import google.registry.request.HttpException.InternalServerErrorException; +import google.registry.request.HttpException.NotFoundException; +import google.registry.util.Clock; import javax.inject.Inject; diff --git a/java/google/registry/rdap/RdapIcannStandardInformation.java b/java/google/registry/rdap/RdapIcannStandardInformation.java index 8ff083832..6101ab2a5 100644 --- a/java/google/registry/rdap/RdapIcannStandardInformation.java +++ b/java/google/registry/rdap/RdapIcannStandardInformation.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/java/google/registry/rdap/RdapIpAction.java b/java/google/registry/rdap/RdapIpAction.java index d66a529fb..1222b1866 100644 --- a/java/google/registry/rdap/RdapIpAction.java +++ b/java/google/registry/rdap/RdapIpAction.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.HEAD; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.HEAD; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.request.HttpException.NotImplementedException; + +import google.registry.request.Action; +import google.registry.request.HttpException; +import google.registry.request.HttpException.NotImplementedException; import javax.inject.Inject; diff --git a/java/google/registry/rdap/RdapJsonFormatter.java b/java/google/registry/rdap/RdapJsonFormatter.java index 917fdbeee..cfe7db3ed 100644 --- a/java/google/registry/rdap/RdapJsonFormatter.java +++ b/java/google/registry/rdap/RdapJsonFormatter.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import static com.google.common.base.Strings.nullToEmpty; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.auto.value.AutoValue; import com.google.common.base.Function; @@ -28,26 +28,27 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.common.net.InetAddresses; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.contact.ContactPhoneNumber; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.PostalInfo; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.DesignatedContact.Type; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.eppcommon.Address; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarAddress; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.util.Idn; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.model.EppResource; +import google.registry.model.contact.ContactPhoneNumber; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.PostalInfo; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.DesignatedContact.Type; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.eppcommon.Address; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.host.HostResource; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarAddress; +import google.registry.model.registrar.RegistrarContact; +import google.registry.model.reporting.HistoryEntry; +import google.registry.util.Idn; + import org.joda.time.DateTime; import java.net.Inet4Address; diff --git a/java/google/registry/rdap/RdapModule.java b/java/google/registry/rdap/RdapModule.java index 502d57d29..bd34780da 100644 --- a/java/google/registry/rdap/RdapModule.java +++ b/java/google/registry/rdap/RdapModule.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import com.google.common.base.Optional; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; import dagger.Module; import dagger.Provides; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; + import java.net.InetAddress; import javax.servlet.http.HttpServletRequest; diff --git a/java/google/registry/rdap/RdapNameserverAction.java b/java/google/registry/rdap/RdapNameserverAction.java index 7edb0388b..877ed075a 100644 --- a/java/google/registry/rdap/RdapNameserverAction.java +++ b/java/google/registry/rdap/RdapNameserverAction.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.HEAD; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.HEAD; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.request.HttpException.NotFoundException; -import com.google.domain.registry.util.Clock; + +import google.registry.model.host.HostResource; +import google.registry.request.Action; +import google.registry.request.HttpException; +import google.registry.request.HttpException.NotFoundException; +import google.registry.util.Clock; import javax.inject.Inject; diff --git a/java/google/registry/rdap/RdapNameserverSearchAction.java b/java/google/registry/rdap/RdapNameserverSearchAction.java index 80cfb01ac..bb3bdbac9 100644 --- a/java/google/registry/rdap/RdapNameserverSearchAction.java +++ b/java/google/registry/rdap/RdapNameserverSearchAction.java @@ -12,33 +12,34 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.HEAD; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.HEAD; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; import com.google.common.primitives.Booleans; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.rdap.RdapJsonFormatter.BoilerplateType; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.NotFoundException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.Idn; import com.googlecode.objectify.cmd.Query; +import google.registry.config.ConfigModule.Config; +import google.registry.model.domain.DomainResource; +import google.registry.model.host.HostResource; +import google.registry.rdap.RdapJsonFormatter.BoilerplateType; +import google.registry.request.Action; +import google.registry.request.HttpException; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.NotFoundException; +import google.registry.request.Parameter; +import google.registry.util.Clock; +import google.registry.util.Idn; + import org.joda.time.DateTime; import java.net.InetAddress; diff --git a/java/google/registry/rdap/RdapSearchPattern.java b/java/google/registry/rdap/RdapSearchPattern.java index 45a7be440..6fda4cc68 100644 --- a/java/google/registry/rdap/RdapSearchPattern.java +++ b/java/google/registry/rdap/RdapSearchPattern.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; -import com.google.domain.registry.request.HttpException.UnprocessableEntityException; +import google.registry.request.HttpException.UnprocessableEntityException; import javax.annotation.Nullable; diff --git a/java/google/registry/rde/BUILD b/java/google/registry/rde/BUILD index 556b9f9e9..d4b1b7895 100644 --- a/java/google/registry/rde/BUILD +++ b/java/google/registry/rde/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "rde", @@ -13,17 +15,6 @@ java_library( "//java/com/google/common/html", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/gcs", - "//java/com/google/domain/registry/keyring/api", - "//java/com/google/domain/registry/mapreduce", - "//java/com/google/domain/registry/mapreduce/inputs", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/tldconfig/idn", - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/xjc", - "//java/com/google/domain/registry/xml", "//third_party/java/appengine:appengine-api", "//third_party/java/appengine_gcs_client", "//third_party/java/appengine_mapreduce2:appengine_mapreduce", @@ -38,5 +29,16 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/gcs", + "//java/google/registry/keyring/api", + "//java/google/registry/mapreduce", + "//java/google/registry/mapreduce/inputs", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/tldconfig/idn", + "//java/google/registry/util", + "//java/google/registry/xjc", + "//java/google/registry/xml", ], ) diff --git a/java/google/registry/rde/BrdaCopyAction.java b/java/google/registry/rde/BrdaCopyAction.java index d53f7a6d2..e960e9bd3 100644 --- a/java/google/registry/rde/BrdaCopyAction.java +++ b/java/google/registry/rde/BrdaCopyAction.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; -import static com.google.domain.registry.model.rde.RdeMode.THIN; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.model.rde.RdeMode.THIN; +import static google.registry.request.Action.Method.POST; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.io.ByteStreams; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.gcs.GcsUtils; -import com.google.domain.registry.keyring.api.KeyModule.Key; -import com.google.domain.registry.model.rde.RdeNamingUtils; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.config.ConfigModule.Config; +import google.registry.gcs.GcsUtils; +import google.registry.keyring.api.KeyModule.Key; +import google.registry.model.rde.RdeNamingUtils; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; +import google.registry.util.FormattingLogger; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPKeyPair; diff --git a/java/google/registry/rde/ContactResourceToXjcConverter.java b/java/google/registry/rde/ContactResourceToXjcConverter.java index c2f114c0f..ed3fa830a 100644 --- a/java/google/registry/rde/ContactResourceToXjcConverter.java +++ b/java/google/registry/rde/ContactResourceToXjcConverter.java @@ -12,30 +12,30 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; -import static com.google.domain.registry.util.XmlEnumUtils.enumToXml; +import static google.registry.util.XmlEnumUtils.enumToXml; -import com.google.domain.registry.model.contact.ContactAddress; -import com.google.domain.registry.model.contact.ContactPhoneNumber; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.Disclose; -import com.google.domain.registry.model.contact.Disclose.PostalInfoChoice; -import com.google.domain.registry.model.contact.PostalInfo; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.xjc.contact.XjcContactAddrType; -import com.google.domain.registry.xjc.contact.XjcContactDiscloseType; -import com.google.domain.registry.xjc.contact.XjcContactE164Type; -import com.google.domain.registry.xjc.contact.XjcContactIntLocType; -import com.google.domain.registry.xjc.contact.XjcContactPostalInfoEnumType; -import com.google.domain.registry.xjc.contact.XjcContactPostalInfoType; -import com.google.domain.registry.xjc.contact.XjcContactStatusType; -import com.google.domain.registry.xjc.contact.XjcContactStatusValueType; -import com.google.domain.registry.xjc.eppcom.XjcEppcomTrStatusType; -import com.google.domain.registry.xjc.rdecontact.XjcRdeContact; -import com.google.domain.registry.xjc.rdecontact.XjcRdeContactElement; -import com.google.domain.registry.xjc.rdecontact.XjcRdeContactTransferDataType; +import google.registry.model.contact.ContactAddress; +import google.registry.model.contact.ContactPhoneNumber; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.Disclose; +import google.registry.model.contact.Disclose.PostalInfoChoice; +import google.registry.model.contact.PostalInfo; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.transfer.TransferData; +import google.registry.xjc.contact.XjcContactAddrType; +import google.registry.xjc.contact.XjcContactDiscloseType; +import google.registry.xjc.contact.XjcContactE164Type; +import google.registry.xjc.contact.XjcContactIntLocType; +import google.registry.xjc.contact.XjcContactPostalInfoEnumType; +import google.registry.xjc.contact.XjcContactPostalInfoType; +import google.registry.xjc.contact.XjcContactStatusType; +import google.registry.xjc.contact.XjcContactStatusValueType; +import google.registry.xjc.eppcom.XjcEppcomTrStatusType; +import google.registry.xjc.rdecontact.XjcRdeContact; +import google.registry.xjc.rdecontact.XjcRdeContactElement; +import google.registry.xjc.rdecontact.XjcRdeContactTransferDataType; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/java/google/registry/rde/DepositFragment.java b/java/google/registry/rde/DepositFragment.java index c7dc0f459..5d07b0657 100644 --- a/java/google/registry/rde/DepositFragment.java +++ b/java/google/registry/rde/DepositFragment.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import com.google.auto.value.AutoValue; diff --git a/java/google/registry/rde/DomainResourceToXjcConverter.java b/java/google/registry/rde/DomainResourceToXjcConverter.java index 7d178a969..314c76942 100644 --- a/java/google/registry/rde/DomainResourceToXjcConverter.java +++ b/java/google/registry/rde/DomainResourceToXjcConverter.java @@ -12,35 +12,36 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.rde.RdeMode; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferStatus; -import com.google.domain.registry.util.Idn; -import com.google.domain.registry.xjc.domain.XjcDomainContactAttrType; -import com.google.domain.registry.xjc.domain.XjcDomainContactType; -import com.google.domain.registry.xjc.domain.XjcDomainNsType; -import com.google.domain.registry.xjc.domain.XjcDomainStatusType; -import com.google.domain.registry.xjc.domain.XjcDomainStatusValueType; -import com.google.domain.registry.xjc.eppcom.XjcEppcomTrStatusType; -import com.google.domain.registry.xjc.rdedomain.XjcRdeDomain; -import com.google.domain.registry.xjc.rdedomain.XjcRdeDomainElement; -import com.google.domain.registry.xjc.rdedomain.XjcRdeDomainTransferDataType; -import com.google.domain.registry.xjc.rgp.XjcRgpStatusType; -import com.google.domain.registry.xjc.rgp.XjcRgpStatusValueType; -import com.google.domain.registry.xjc.secdns.XjcSecdnsDsDataType; -import com.google.domain.registry.xjc.secdns.XjcSecdnsDsOrKeyType; + +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.host.HostResource; +import google.registry.model.rde.RdeMode; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferStatus; +import google.registry.util.Idn; +import google.registry.xjc.domain.XjcDomainContactAttrType; +import google.registry.xjc.domain.XjcDomainContactType; +import google.registry.xjc.domain.XjcDomainNsType; +import google.registry.xjc.domain.XjcDomainStatusType; +import google.registry.xjc.domain.XjcDomainStatusValueType; +import google.registry.xjc.eppcom.XjcEppcomTrStatusType; +import google.registry.xjc.rdedomain.XjcRdeDomain; +import google.registry.xjc.rdedomain.XjcRdeDomainElement; +import google.registry.xjc.rdedomain.XjcRdeDomainTransferDataType; +import google.registry.xjc.rgp.XjcRgpStatusType; +import google.registry.xjc.rgp.XjcRgpStatusValueType; +import google.registry.xjc.secdns.XjcSecdnsDsDataType; +import google.registry.xjc.secdns.XjcSecdnsDsOrKeyType; import org.joda.time.DateTime; diff --git a/java/google/registry/rde/EscrowTaskRunner.java b/java/google/registry/rde/EscrowTaskRunner.java index 0dcf65827..16f8bbc42 100644 --- a/java/google/registry/rde/EscrowTaskRunner.java +++ b/java/google/registry/rde/EscrowTaskRunner.java @@ -12,23 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; - -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.model.server.Lock; -import com.google.domain.registry.request.HttpException.NoContentException; -import com.google.domain.registry.request.HttpException.ServiceUnavailableException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.googlecode.objectify.VoidWork; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; +import google.registry.model.server.Lock; +import google.registry.request.HttpException.NoContentException; +import google.registry.request.HttpException.ServiceUnavailableException; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; + import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/rde/Ghostryde.java b/java/google/registry/rde/Ghostryde.java index 4695f5218..e78492ee3 100644 --- a/java/google/registry/rde/Ghostryde.java +++ b/java/google/registry/rde/Ghostryde.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -24,10 +24,11 @@ import static org.bouncycastle.openpgp.PGPLiteralData.BINARY; import static org.joda.time.DateTimeZone.UTC; import com.google.common.io.ByteStreams; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.ImprovedInputStream; -import com.google.domain.registry.util.ImprovedOutputStream; + +import google.registry.config.ConfigModule.Config; +import google.registry.util.FormattingLogger; +import google.registry.util.ImprovedInputStream; +import google.registry.util.ImprovedOutputStream; import org.bouncycastle.openpgp.PGPCompressedData; import org.bouncycastle.openpgp.PGPCompressedDataGenerator; diff --git a/java/google/registry/rde/HostResourceToXjcConverter.java b/java/google/registry/rde/HostResourceToXjcConverter.java index a725331d9..8542df90e 100644 --- a/java/google/registry/rde/HostResourceToXjcConverter.java +++ b/java/google/registry/rde/HostResourceToXjcConverter.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import com.google.common.net.InetAddresses; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.xjc.host.XjcHostAddrType; -import com.google.domain.registry.xjc.host.XjcHostIpType; -import com.google.domain.registry.xjc.host.XjcHostStatusType; -import com.google.domain.registry.xjc.host.XjcHostStatusValueType; -import com.google.domain.registry.xjc.rdehost.XjcRdeHost; -import com.google.domain.registry.xjc.rdehost.XjcRdeHostElement; + +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.host.HostResource; +import google.registry.xjc.host.XjcHostAddrType; +import google.registry.xjc.host.XjcHostIpType; +import google.registry.xjc.host.XjcHostStatusType; +import google.registry.xjc.host.XjcHostStatusValueType; +import google.registry.xjc.rdehost.XjcRdeHost; +import google.registry.xjc.rdehost.XjcRdeHostElement; import java.net.Inet6Address; import java.net.InetAddress; diff --git a/java/google/registry/rde/JSchModule.java b/java/google/registry/rde/JSchModule.java index fb9df3083..21f8c88d3 100644 --- a/java/google/registry/rde/JSchModule.java +++ b/java/google/registry/rde/JSchModule.java @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.appengine.api.ThreadManager; -import com.google.domain.registry.keyring.api.KeyModule.Key; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; @@ -25,6 +24,8 @@ import com.jcraft.jsch.JSchException; import dagger.Module; import dagger.Provides; +import google.registry.keyring.api.KeyModule.Key; + /** Dagger module for {@link JSch} which provides SSH/SFTP connectivity. */ @Module public final class JSchModule { diff --git a/java/google/registry/rde/JSchSftpChannel.java b/java/google/registry/rde/JSchSftpChannel.java index 5f44c930b..7edcf4a3f 100644 --- a/java/google/registry/rde/JSchSftpChannel.java +++ b/java/google/registry/rde/JSchSftpChannel.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/rde/JSchSshSession.java b/java/google/registry/rde/JSchSshSession.java index 6b8a3e0ef..360ddfaea 100644 --- a/java/google/registry/rde/JSchSshSession.java +++ b/java/google/registry/rde/JSchSshSession.java @@ -12,11 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import com.google.common.base.Splitter; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.util.FormattingLogger; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSch; @@ -24,6 +22,9 @@ import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; import com.jcraft.jsch.SftpException; +import google.registry.config.ConfigModule.Config; +import google.registry.util.FormattingLogger; + import org.joda.time.Duration; import java.io.Closeable; diff --git a/java/google/registry/rde/PendingDeposit.java b/java/google/registry/rde/PendingDeposit.java index 3f07779e4..78204e885 100644 --- a/java/google/registry/rde/PendingDeposit.java +++ b/java/google/registry/rde/PendingDeposit.java @@ -12,11 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import com.google.auto.value.AutoValue; -import com.google.domain.registry.model.rde.RdeMode; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; + +import google.registry.model.rde.RdeMode; +import google.registry.model.registry.RegistryCursor.CursorType; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/rde/PendingDepositChecker.java b/java/google/registry/rde/PendingDepositChecker.java index 67d368f25..59e14fa27 100644 --- a/java/google/registry/rde/PendingDepositChecker.java +++ b/java/google/registry/rde/PendingDepositChecker.java @@ -12,25 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSetMultimap; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.model.rde.RdeMode; -import com.google.domain.registry.model.registry.Registries; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldType; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.util.Clock; import com.googlecode.objectify.Work; +import google.registry.config.ConfigModule.Config; +import google.registry.model.rde.RdeMode; +import google.registry.model.registry.Registries; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldType; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; +import google.registry.util.Clock; + import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/rde/RdeAdapter.java b/java/google/registry/rde/RdeAdapter.java index 6c929e05c..b8e006803 100644 --- a/java/google/registry/rde/RdeAdapter.java +++ b/java/google/registry/rde/RdeAdapter.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Strings.emptyToNull; import static com.google.common.base.Strings.isNullOrEmpty; -import com.google.domain.registry.xjc.rde.XjcRdeRrType; +import google.registry.xjc.rde.XjcRdeRrType; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/java/google/registry/rde/RdeCounter.java b/java/google/registry/rde/RdeCounter.java index 08e363a2a..b485d9dcf 100644 --- a/java/google/registry/rde/RdeCounter.java +++ b/java/google/registry/rde/RdeCounter.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Predicates.equalTo; import static com.google.common.base.Predicates.not; import static com.google.common.collect.Iterables.filter; -import com.google.domain.registry.model.rde.RdeMode; -import com.google.domain.registry.xjc.rde.XjcRdeDepositTypeType; -import com.google.domain.registry.xjc.rdeheader.XjcRdeHeader; -import com.google.domain.registry.xjc.rdeheader.XjcRdeHeaderCount; -import com.google.domain.registry.xjc.rdeheader.XjcRdeHeaderElement; -import com.google.domain.registry.xjc.rdereport.XjcRdeReport; +import google.registry.model.rde.RdeMode; +import google.registry.xjc.rde.XjcRdeDepositTypeType; +import google.registry.xjc.rdeheader.XjcRdeHeader; +import google.registry.xjc.rdeheader.XjcRdeHeaderCount; +import google.registry.xjc.rdeheader.XjcRdeHeaderElement; +import google.registry.xjc.rdereport.XjcRdeReport; import org.joda.time.DateTime; diff --git a/java/google/registry/rde/RdeMarshaller.java b/java/google/registry/rde/RdeMarshaller.java index 1b0f6a050..ba1982a63 100644 --- a/java/google/registry/rde/RdeMarshaller.java +++ b/java/google/registry/rde/RdeMarshaller.java @@ -12,33 +12,33 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Verify.verify; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.rde.RdeMode; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.tldconfig.idn.IdnTable; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.xjc.XjcXmlTransformer; -import com.google.domain.registry.xjc.rde.XjcRdeContentsType; -import com.google.domain.registry.xjc.rde.XjcRdeDeposit; -import com.google.domain.registry.xjc.rde.XjcRdeDepositTypeType; -import com.google.domain.registry.xjc.rde.XjcRdeMenuType; -import com.google.domain.registry.xjc.rdeidn.XjcRdeIdn; -import com.google.domain.registry.xjc.rdeidn.XjcRdeIdnElement; -import com.google.domain.registry.xjc.rdepolicy.XjcRdePolicy; -import com.google.domain.registry.xjc.rdepolicy.XjcRdePolicyElement; -import com.google.domain.registry.xml.XmlException; -import com.google.domain.registry.xml.XmlFragmentMarshaller; - import com.googlecode.objectify.Key; +import google.registry.model.ImmutableObject; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainResource; +import google.registry.model.host.HostResource; +import google.registry.model.rde.RdeMode; +import google.registry.model.registrar.Registrar; +import google.registry.tldconfig.idn.IdnTable; +import google.registry.util.FormattingLogger; +import google.registry.xjc.XjcXmlTransformer; +import google.registry.xjc.rde.XjcRdeContentsType; +import google.registry.xjc.rde.XjcRdeDeposit; +import google.registry.xjc.rde.XjcRdeDepositTypeType; +import google.registry.xjc.rde.XjcRdeMenuType; +import google.registry.xjc.rdeidn.XjcRdeIdn; +import google.registry.xjc.rdeidn.XjcRdeIdnElement; +import google.registry.xjc.rdepolicy.XjcRdePolicy; +import google.registry.xjc.rdepolicy.XjcRdePolicyElement; +import google.registry.xml.XmlException; +import google.registry.xml.XmlFragmentMarshaller; + import org.joda.time.DateTime; import java.io.ByteArrayOutputStream; diff --git a/java/google/registry/rde/RdeModule.java b/java/google/registry/rde/RdeModule.java index 0e089dc87..6189b95fa 100644 --- a/java/google/registry/rde/RdeModule.java +++ b/java/google/registry/rde/RdeModule.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import com.google.appengine.api.taskqueue.Queue; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; import dagger.Module; import dagger.Provides; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; + import org.joda.time.DateTime; import javax.inject.Named; @@ -31,7 +32,7 @@ import javax.servlet.http.HttpServletRequest; /** * Dagger module for RDE package. * - * @see "com.google.domain.registry.module.backend.BackendComponent" + * @see "google.registry.module.backend.BackendComponent" */ @Module public final class RdeModule { diff --git a/java/google/registry/rde/RdeReportAction.java b/java/google/registry/rde/RdeReportAction.java index fa9bace77..92966464a 100644 --- a/java/google/registry/rde/RdeReportAction.java +++ b/java/google/registry/rde/RdeReportAction.java @@ -12,30 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Verify.verify; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; -import static com.google.domain.registry.model.rde.RdeMode.FULL; -import static com.google.domain.registry.request.Action.Method.POST; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.rde.RdeMode.FULL; +import static google.registry.request.Action.Method.POST; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.io.ByteStreams; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.gcs.GcsUtils; -import com.google.domain.registry.keyring.api.KeyModule.Key; -import com.google.domain.registry.model.rde.RdeNamingUtils; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.rde.EscrowTaskRunner.EscrowTask; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException.NoContentException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.config.ConfigModule.Config; +import google.registry.gcs.GcsUtils; +import google.registry.keyring.api.KeyModule.Key; +import google.registry.model.rde.RdeNamingUtils; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; +import google.registry.rde.EscrowTaskRunner.EscrowTask; +import google.registry.request.Action; +import google.registry.request.HttpException.NoContentException; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; +import google.registry.request.Response; +import google.registry.util.FormattingLogger; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPrivateKey; diff --git a/java/google/registry/rde/RdeReporter.java b/java/google/registry/rde/RdeReporter.java index b133732f4..5312b51a0 100644 --- a/java/google/registry/rde/RdeReporter.java +++ b/java/google/registry/rde/RdeReporter.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.appengine.api.urlfetch.FetchOptions.Builder.validateCertificate; import static com.google.appengine.api.urlfetch.HTTPMethod.PUT; import static com.google.common.io.BaseEncoding.base64; import static com.google.common.net.HttpHeaders.AUTHORIZATION; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; -import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName; +import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_OK; @@ -28,18 +28,19 @@ import com.google.appengine.api.urlfetch.HTTPHeader; import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.config.RegistryConfig; -import com.google.domain.registry.keyring.api.KeyModule.Key; -import com.google.domain.registry.request.HttpException.InternalServerErrorException; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.UrlFetchException; -import com.google.domain.registry.xjc.XjcXmlTransformer; -import com.google.domain.registry.xjc.iirdea.XjcIirdeaResponseElement; -import com.google.domain.registry.xjc.iirdea.XjcIirdeaResult; -import com.google.domain.registry.xjc.rdeheader.XjcRdeHeader; -import com.google.domain.registry.xjc.rdereport.XjcRdeReportReport; -import com.google.domain.registry.xml.XmlException; + +import google.registry.config.ConfigModule.Config; +import google.registry.config.RegistryConfig; +import google.registry.keyring.api.KeyModule.Key; +import google.registry.request.HttpException.InternalServerErrorException; +import google.registry.util.FormattingLogger; +import google.registry.util.UrlFetchException; +import google.registry.xjc.XjcXmlTransformer; +import google.registry.xjc.iirdea.XjcIirdeaResponseElement; +import google.registry.xjc.iirdea.XjcIirdeaResult; +import google.registry.xjc.rdeheader.XjcRdeHeader; +import google.registry.xjc.rdereport.XjcRdeReportReport; +import google.registry.xml.XmlException; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/java/google/registry/rde/RdeResourceType.java b/java/google/registry/rde/RdeResourceType.java index 30b6843dc..8dcf67137 100644 --- a/java/google/registry/rde/RdeResourceType.java +++ b/java/google/registry/rde/RdeResourceType.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; -import static com.google.domain.registry.model.rde.RdeMode.FULL; -import static com.google.domain.registry.model.rde.RdeMode.THIN; +import static google.registry.model.rde.RdeMode.FULL; +import static google.registry.model.rde.RdeMode.THIN; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Ordering; -import com.google.domain.registry.model.rde.RdeMode; + +import google.registry.model.rde.RdeMode; import java.util.Collections; import java.util.EnumSet; diff --git a/java/google/registry/rde/RdeStagingAction.java b/java/google/registry/rde/RdeStagingAction.java index a8524fcc6..dd361d2d9 100644 --- a/java/google/registry/rde/RdeStagingAction.java +++ b/java/google/registry/rde/RdeStagingAction.java @@ -12,31 +12,32 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; -import static com.google.domain.registry.util.PipelineUtils.createJobPath; +import static google.registry.util.PipelineUtils.createJobPath; import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Multimaps; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.mapreduce.inputs.EppResourceInputs; -import com.google.domain.registry.mapreduce.inputs.NullInput; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.rde.RdeMode; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.config.ConfigModule.Config; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.mapreduce.inputs.EppResourceInputs; +import google.registry.mapreduce.inputs.NullInput; +import google.registry.model.EppResource; +import google.registry.model.contact.ContactResource; +import google.registry.model.host.HostResource; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.rde.RdeMode; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; +import google.registry.request.Action; +import google.registry.request.Response; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; import org.joda.time.Duration; diff --git a/java/google/registry/rde/RdeStagingMapper.java b/java/google/registry/rde/RdeStagingMapper.java index 493e9645e..1636068a4 100644 --- a/java/google/registry/rde/RdeStagingMapper.java +++ b/java/google/registry/rde/RdeStagingMapper.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Strings.nullToEmpty; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.tools.mapreduce.Mapper; import com.google.auto.value.AutoValue; @@ -26,16 +26,17 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Maps; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResourceUtils; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.rde.RdeMode; -import com.google.domain.registry.model.registrar.Registrar; import com.googlecode.objectify.Result; +import google.registry.model.EppResource; +import google.registry.model.EppResourceUtils; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainResource; +import google.registry.model.host.HostResource; +import google.registry.model.rde.RdeMode; +import google.registry.model.registrar.Registrar; + import org.joda.time.DateTime; import java.util.HashMap; diff --git a/java/google/registry/rde/RdeStagingReducer.java b/java/google/registry/rde/RdeStagingReducer.java index 6e9d534c3..550cef689 100644 --- a/java/google/registry/rde/RdeStagingReducer.java +++ b/java/google/registry/rde/RdeStagingReducer.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; import static com.google.appengine.tools.cloudstorage.GcsServiceFactory.createGcsService; import static com.google.common.base.Verify.verify; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import static java.nio.charset.StandardCharsets.US_ASCII; import static java.nio.charset.StandardCharsets.UTF_8; @@ -26,26 +26,27 @@ import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.appengine.tools.cloudstorage.RetryParams; import com.google.appengine.tools.mapreduce.Reducer; import com.google.appengine.tools.mapreduce.ReducerInput; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.gcs.GcsUtils; -import com.google.domain.registry.keyring.api.KeyModule; -import com.google.domain.registry.keyring.api.PgpHelper; -import com.google.domain.registry.model.rde.RdeMode; -import com.google.domain.registry.model.rde.RdeNamingUtils; -import com.google.domain.registry.model.rde.RdeRevision; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.server.Lock; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.tldconfig.idn.IdnTableEnum; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.TaskEnqueuer; -import com.google.domain.registry.xjc.rdeheader.XjcRdeHeader; -import com.google.domain.registry.xjc.rdeheader.XjcRdeHeaderElement; -import com.google.domain.registry.xml.XmlException; import com.googlecode.objectify.VoidWork; +import google.registry.config.ConfigModule.Config; +import google.registry.gcs.GcsUtils; +import google.registry.keyring.api.KeyModule; +import google.registry.keyring.api.PgpHelper; +import google.registry.model.rde.RdeMode; +import google.registry.model.rde.RdeNamingUtils; +import google.registry.model.rde.RdeRevision; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.server.Lock; +import google.registry.request.RequestParameters; +import google.registry.tldconfig.idn.IdnTableEnum; +import google.registry.util.FormattingLogger; +import google.registry.util.TaskEnqueuer; +import google.registry.xjc.rdeheader.XjcRdeHeader; +import google.registry.xjc.rdeheader.XjcRdeHeaderElement; +import google.registry.xml.XmlException; + import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKey; diff --git a/java/google/registry/rde/RdeUploadAction.java b/java/google/registry/rde/RdeUploadAction.java index e18c2b9e5..55d24ada8 100644 --- a/java/google/registry/rde/RdeUploadAction.java +++ b/java/google/registry/rde/RdeUploadAction.java @@ -12,45 +12,46 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; import static com.google.common.base.Verify.verify; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.rde.RdeMode.FULL; -import static com.google.domain.registry.request.Action.Method.POST; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; import static com.jcraft.jsch.ChannelSftp.OVERWRITE; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.rde.RdeMode.FULL; +import static google.registry.request.Action.Method.POST; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.io.ByteStreams; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.gcs.GcsUtils; -import com.google.domain.registry.keyring.api.KeyModule.Key; -import com.google.domain.registry.model.rde.RdeNamingUtils; -import com.google.domain.registry.model.rde.RdeRevision; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.rde.EscrowTaskRunner.EscrowTask; -import com.google.domain.registry.rde.JSchSshSession.JSchSshSessionFactory; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException.ServiceUnavailableException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.TaskEnqueuer; -import com.google.domain.registry.util.TeeOutputStream; import com.googlecode.objectify.VoidWork; import com.jcraft.jsch.JSch; +import google.registry.config.ConfigModule.Config; +import google.registry.gcs.GcsUtils; +import google.registry.keyring.api.KeyModule.Key; +import google.registry.model.rde.RdeNamingUtils; +import google.registry.model.rde.RdeRevision; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; +import google.registry.rde.EscrowTaskRunner.EscrowTask; +import google.registry.rde.JSchSshSession.JSchSshSessionFactory; +import google.registry.request.Action; +import google.registry.request.HttpException.ServiceUnavailableException; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; +import google.registry.request.Response; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; +import google.registry.util.TaskEnqueuer; +import google.registry.util.TeeOutputStream; + import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; diff --git a/java/google/registry/rde/RdeUploadUrl.java b/java/google/registry/rde/RdeUploadUrl.java index 15e33eaff..051c01ccd 100644 --- a/java/google/registry/rde/RdeUploadUrl.java +++ b/java/google/registry/rde/RdeUploadUrl.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/rde/RdeUtil.java b/java/google/registry/rde/RdeUtil.java index b6d32a073..8df29877d 100644 --- a/java/google/registry/rde/RdeUtil.java +++ b/java/google/registry/rde/RdeUtil.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; -import static com.google.domain.registry.util.HexDumper.dumpHex; +import static google.registry.util.HexDumper.dumpHex; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.io.BaseEncoding; -import com.google.domain.registry.xjc.rde.XjcRdeRrType; -import com.google.domain.registry.xml.XmlException; + +import google.registry.xjc.rde.XjcRdeRrType; +import google.registry.xml.XmlException; import org.joda.time.DateTime; import org.joda.time.ReadableInstant; diff --git a/java/google/registry/rde/RegistrarToXjcConverter.java b/java/google/registry/rde/RegistrarToXjcConverter.java index 1012f6a6f..f81566fd3 100644 --- a/java/google/registry/rde/RegistrarToXjcConverter.java +++ b/java/google/registry/rde/RegistrarToXjcConverter.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.MoreObjects.firstNonNull; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarAddress; -import com.google.domain.registry.xjc.contact.XjcContactE164Type; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrar; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrarAddrType; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrarElement; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoEnumType; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoType; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrarStatusType; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrarWhoisInfoType; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarAddress; +import google.registry.xjc.contact.XjcContactE164Type; +import google.registry.xjc.rderegistrar.XjcRdeRegistrar; +import google.registry.xjc.rderegistrar.XjcRdeRegistrarAddrType; +import google.registry.xjc.rderegistrar.XjcRdeRegistrarElement; +import google.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoEnumType; +import google.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoType; +import google.registry.xjc.rderegistrar.XjcRdeRegistrarStatusType; +import google.registry.xjc.rderegistrar.XjcRdeRegistrarWhoisInfoType; import java.math.BigInteger; diff --git a/java/google/registry/rde/RydePgpCompressionOutputStream.java b/java/google/registry/rde/RydePgpCompressionOutputStream.java index 8b4304d8f..efdc2894f 100644 --- a/java/google/registry/rde/RydePgpCompressionOutputStream.java +++ b/java/google/registry/rde/RydePgpCompressionOutputStream.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static org.bouncycastle.bcpg.CompressionAlgorithmTags.ZIP; import com.google.auto.factory.AutoFactory; import com.google.auto.factory.Provided; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.util.ImprovedOutputStream; + +import google.registry.config.ConfigModule.Config; +import google.registry.util.ImprovedOutputStream; import org.bouncycastle.openpgp.PGPCompressedDataGenerator; import org.bouncycastle.openpgp.PGPException; diff --git a/java/google/registry/rde/RydePgpEncryptionOutputStream.java b/java/google/registry/rde/RydePgpEncryptionOutputStream.java index 32af7d4ed..f2049aa2f 100644 --- a/java/google/registry/rde/RydePgpEncryptionOutputStream.java +++ b/java/google/registry/rde/RydePgpEncryptionOutputStream.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags.AES_128; import static org.bouncycastle.jce.provider.BouncyCastleProvider.PROVIDER_NAME; import com.google.auto.factory.AutoFactory; import com.google.auto.factory.Provided; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.util.ImprovedOutputStream; + +import google.registry.config.ConfigModule.Config; +import google.registry.util.ImprovedOutputStream; import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; import org.bouncycastle.openpgp.PGPException; diff --git a/java/google/registry/rde/RydePgpFileOutputStream.java b/java/google/registry/rde/RydePgpFileOutputStream.java index 410a0c7e8..5e302d763 100644 --- a/java/google/registry/rde/RydePgpFileOutputStream.java +++ b/java/google/registry/rde/RydePgpFileOutputStream.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Preconditions.checkArgument; import static org.bouncycastle.openpgp.PGPLiteralData.BINARY; import com.google.auto.factory.AutoFactory; import com.google.auto.factory.Provided; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.util.ImprovedOutputStream; + +import google.registry.config.ConfigModule.Config; +import google.registry.util.ImprovedOutputStream; import org.bouncycastle.openpgp.PGPLiteralDataGenerator; import org.joda.time.DateTime; diff --git a/java/google/registry/rde/RydePgpSigningOutputStream.java b/java/google/registry/rde/RydePgpSigningOutputStream.java index 4d543f5a1..e4709ef26 100644 --- a/java/google/registry/rde/RydePgpSigningOutputStream.java +++ b/java/google/registry/rde/RydePgpSigningOutputStream.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static org.bouncycastle.bcpg.HashAlgorithmTags.SHA256; import static org.bouncycastle.bcpg.PublicKeyAlgorithmTags.RSA_GENERAL; import static org.bouncycastle.openpgp.PGPSignature.BINARY_DOCUMENT; import com.google.auto.factory.AutoFactory; -import com.google.domain.registry.util.ImprovedOutputStream; + +import google.registry.util.ImprovedOutputStream; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPKeyPair; diff --git a/java/google/registry/rde/RydeTarOutputStream.java b/java/google/registry/rde/RydeTarOutputStream.java index 8b9235caf..3428fc53c 100644 --- a/java/google/registry/rde/RydeTarOutputStream.java +++ b/java/google/registry/rde/RydeTarOutputStream.java @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Preconditions.checkArgument; import com.google.auto.factory.AutoFactory; -import com.google.domain.registry.util.ImprovedOutputStream; -import com.google.domain.registry.util.PosixTarHeader; + +import google.registry.util.ImprovedOutputStream; +import google.registry.util.PosixTarHeader; import org.joda.time.DateTime; diff --git a/java/google/registry/rde/package-info.java b/java/google/registry/rde/package-info.java index 319792d4b..6ee22e3ed 100644 --- a/java/google/registry/rde/package-info.java +++ b/java/google/registry/rde/package-info.java @@ -16,8 +16,8 @@ * Registry Data Escrow * *

This is a cron job that puts our database in a giant XML file and uploads it to a third party. - * Read the {@link com.google.domain.registry.rde.RdeStagingAction RdeStagingAction} javadoc to + * Read the {@link google.registry.rde.RdeStagingAction RdeStagingAction} javadoc to * learn more. */ @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.rde; +package google.registry.rde; diff --git a/java/google/registry/request/Action.java b/java/google/registry/request/Action.java index 9a40727bb..04b13ecfd 100644 --- a/java/google/registry/request/Action.java +++ b/java/google/registry/request/Action.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java/google/registry/request/Actions.java b/java/google/registry/request/Actions.java index b66e0ff5f..b54a08a04 100644 --- a/java/google/registry/request/Actions.java +++ b/java/google/registry/request/Actions.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.base.Preconditions.checkArgument; diff --git a/java/google/registry/request/BUILD b/java/google/registry/request/BUILD index 4c59e41cf..f0a625cc7 100644 --- a/java/google/registry/request/BUILD +++ b/java/google/registry/request/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 java_library( @@ -15,8 +17,6 @@ java_library( "//java/com/google/common/html", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/security", - "//java/com/google/domain/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/auto:auto_value", "//third_party/java/dagger", @@ -25,6 +25,8 @@ java_library( "//third_party/java/jsr305_annotations", "//third_party/java/jsr330_inject", "//third_party/java/servlet/servlet_api", + "//java/google/registry/security", + "//java/google/registry/util", ], ) @@ -40,9 +42,9 @@ java_library( "//java/com/google/api/client/http", "//java/com/google/api/client/json", "//java/com/google/api/client/json/jackson2", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/keyring/api", "//third_party/java/appengine:appengine-api", "//third_party/java/dagger", + "//java/google/registry/config", + "//java/google/registry/keyring/api", ], ) diff --git a/java/google/registry/request/DelegatedOAuthScopes.java b/java/google/registry/request/DelegatedOAuthScopes.java index 76d8197cd..52616c955 100644 --- a/java/google/registry/request/DelegatedOAuthScopes.java +++ b/java/google/registry/request/DelegatedOAuthScopes.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import java.lang.annotation.Documented; import java.util.Set; diff --git a/java/google/registry/request/Header.java b/java/google/registry/request/Header.java index d1d33f727..ea74bc440 100644 --- a/java/google/registry/request/Header.java +++ b/java/google/registry/request/Header.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import java.lang.annotation.Documented; diff --git a/java/google/registry/request/HttpException.java b/java/google/registry/request/HttpException.java index 0ce15813e..f5744413a 100644 --- a/java/google/registry/request/HttpException.java +++ b/java/google/registry/request/HttpException.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.html.HtmlEscapers.htmlEscaper; -import com.google.domain.registry.util.FormattingLogger; +import google.registry.util.FormattingLogger; import java.io.IOException; diff --git a/java/google/registry/request/JsonActionRunner.java b/java/google/registry/request/JsonActionRunner.java index 5ac459661..9685a02f3 100644 --- a/java/google/registry/request/JsonActionRunner.java +++ b/java/google/registry/request/JsonActionRunner.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.base.Verify.verifyNotNull; diff --git a/java/google/registry/request/JsonPayload.java b/java/google/registry/request/JsonPayload.java index be7d5e0cc..c1f61ccb1 100644 --- a/java/google/registry/request/JsonPayload.java +++ b/java/google/registry/request/JsonPayload.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import java.lang.annotation.Documented; diff --git a/java/google/registry/request/JsonResponse.java b/java/google/registry/request/JsonResponse.java index 5e2ec20d5..9f45c3c5a 100644 --- a/java/google/registry/request/JsonResponse.java +++ b/java/google/registry/request/JsonResponse.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.net.HttpHeaders.CONTENT_DISPOSITION; diff --git a/java/google/registry/request/Modules.java b/java/google/registry/request/Modules.java index ae2a78d4d..59943a2b6 100644 --- a/java/google/registry/request/Modules.java +++ b/java/google/registry/request/Modules.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.appengine.api.datastore.DatastoreServiceFactory.getDatastoreService; import static java.nio.charset.StandardCharsets.UTF_8; @@ -31,12 +31,13 @@ import com.google.appengine.api.urlfetch.URLFetchService; import com.google.appengine.api.urlfetch.URLFetchServiceFactory; import com.google.appengine.api.users.UserService; import com.google.appengine.api.users.UserServiceFactory; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.keyring.api.KeyModule.Key; import dagger.Module; import dagger.Provides; +import google.registry.config.ConfigModule.Config; +import google.registry.keyring.api.KeyModule.Key; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Set; @@ -158,7 +159,7 @@ public final class Modules { *

  • Spreadsheet service (which can't use {@link AppIdentityCredential} due to an old library) * * - * @see com.google.domain.registry.keyring.api.Keyring#getJsonCredential() + * @see google.registry.keyring.api.Keyring#getJsonCredential() */ @Module public static final class GoogleCredentialModule { diff --git a/java/google/registry/request/OAuthScopes.java b/java/google/registry/request/OAuthScopes.java index 830e4be73..7e6e82c2d 100644 --- a/java/google/registry/request/OAuthScopes.java +++ b/java/google/registry/request/OAuthScopes.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import java.lang.annotation.Documented; import java.util.Set; diff --git a/java/google/registry/request/Parameter.java b/java/google/registry/request/Parameter.java index 246e7bdde..4b170329f 100644 --- a/java/google/registry/request/Parameter.java +++ b/java/google/registry/request/Parameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import java.lang.annotation.Documented; diff --git a/java/google/registry/request/ParameterMap.java b/java/google/registry/request/ParameterMap.java index 5073cc438..836b8c9fb 100644 --- a/java/google/registry/request/ParameterMap.java +++ b/java/google/registry/request/ParameterMap.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import java.lang.annotation.Documented; diff --git a/java/google/registry/request/Payload.java b/java/google/registry/request/Payload.java index 41d8599c6..619b3d154 100644 --- a/java/google/registry/request/Payload.java +++ b/java/google/registry/request/Payload.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import java.lang.annotation.Documented; diff --git a/java/google/registry/request/RequestHandler.java b/java/google/registry/request/RequestHandler.java index 3438e1eb9..b89ed1c8c 100644 --- a/java/google/registry/request/RequestHandler.java +++ b/java/google/registry/request/RequestHandler.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Strings.nullToEmpty; import static com.google.common.net.HttpHeaders.LOCATION; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; -import static com.google.domain.registry.security.XsrfTokenManager.X_CSRF_TOKEN; -import static com.google.domain.registry.security.XsrfTokenManager.validateToken; +import static google.registry.security.XsrfTokenManager.X_CSRF_TOKEN; +import static google.registry.security.XsrfTokenManager.validateToken; import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED; import static javax.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; @@ -28,8 +28,9 @@ import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.appengine.api.users.UserService; import com.google.appengine.api.users.UserServiceFactory; import com.google.common.base.Optional; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.NonFinalForTesting; + +import google.registry.util.FormattingLogger; +import google.registry.util.NonFinalForTesting; import org.joda.time.Duration; diff --git a/java/google/registry/request/RequestMethod.java b/java/google/registry/request/RequestMethod.java index b2fbcde6d..4358e363c 100644 --- a/java/google/registry/request/RequestMethod.java +++ b/java/google/registry/request/RequestMethod.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import java.lang.annotation.Documented; diff --git a/java/google/registry/request/RequestModule.java b/java/google/registry/request/RequestModule.java index c34205058..30baf4bc6 100644 --- a/java/google/registry/request/RequestModule.java +++ b/java/google/registry/request/RequestModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.net.MediaType.JSON_UTF_8; import static java.nio.charset.StandardCharsets.UTF_8; @@ -22,12 +22,13 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.io.ByteStreams; import com.google.common.io.CharStreams; import com.google.common.net.MediaType; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.UnsupportedMediaTypeException; import dagger.Module; import dagger.Provides; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.UnsupportedMediaTypeException; + import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; diff --git a/java/google/registry/request/RequestParameters.java b/java/google/registry/request/RequestParameters.java index f6104de5b..7fb594f18 100644 --- a/java/google/registry/request/RequestParameters.java +++ b/java/google/registry/request/RequestParameters.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.base.Strings.emptyToNull; import static com.google.common.base.Strings.isNullOrEmpty; @@ -22,7 +22,8 @@ import com.google.common.base.Ascii; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; -import com.google.domain.registry.request.HttpException.BadRequestException; + +import google.registry.request.HttpException.BadRequestException; import org.joda.time.DateTime; diff --git a/java/google/registry/request/RequestPath.java b/java/google/registry/request/RequestPath.java index 2095ab3a3..9de31f0a7 100644 --- a/java/google/registry/request/RequestPath.java +++ b/java/google/registry/request/RequestPath.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import java.lang.annotation.Documented; diff --git a/java/google/registry/request/RequestScope.java b/java/google/registry/request/RequestScope.java index a81a280e6..7b9122054 100644 --- a/java/google/registry/request/RequestScope.java +++ b/java/google/registry/request/RequestScope.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/java/google/registry/request/Response.java b/java/google/registry/request/Response.java index 2fca7b58b..92778ed67 100644 --- a/java/google/registry/request/Response.java +++ b/java/google/registry/request/Response.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import com.google.common.net.MediaType; diff --git a/java/google/registry/request/ResponseImpl.java b/java/google/registry/request/ResponseImpl.java index 513a9f5e8..3382d1152 100644 --- a/java/google/registry/request/ResponseImpl.java +++ b/java/google/registry/request/ResponseImpl.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import com.google.common.net.MediaType; diff --git a/java/google/registry/request/Route.java b/java/google/registry/request/Route.java index 722642995..d60efcfb8 100644 --- a/java/google/registry/request/Route.java +++ b/java/google/registry/request/Route.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import com.google.auto.value.AutoValue; import com.google.common.base.Function; diff --git a/java/google/registry/request/Router.java b/java/google/registry/request/Router.java index 338972258..106db4b4a 100644 --- a/java/google/registry/request/Router.java +++ b/java/google/registry/request/Router.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import com.google.common.base.Function; import com.google.common.base.Optional; diff --git a/java/google/registry/request/ServletDelegate.java b/java/google/registry/request/ServletDelegate.java index 2c8d6d538..3416f65db 100644 --- a/java/google/registry/request/ServletDelegate.java +++ b/java/google/registry/request/ServletDelegate.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import java.io.IOException; diff --git a/java/google/registry/request/package-info.java b/java/google/registry/request/package-info.java index 76f4261b0..45b070bbb 100644 --- a/java/google/registry/request/package-info.java +++ b/java/google/registry/request/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.request; +package google.registry.request; diff --git a/java/google/registry/security/BUILD b/java/google/registry/security/BUILD index 27351ec60..4fc35b51a 100644 --- a/java/google/registry/security/BUILD +++ b/java/google/registry/security/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "security", @@ -17,14 +19,14 @@ java_library( "//java/com/google/common/html", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/joda_time", "//third_party/java/json_simple", "//third_party/java/jsr305_annotations", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/model", + "//java/google/registry/util", ], ) @@ -34,9 +36,9 @@ java_library( deps = [ ":security", "//java/com/google/common/base", - "//java/com/google/domain/registry/request", "//third_party/java/appengine:appengine-api", "//third_party/java/joda_time", "//third_party/java/servlet/servlet_api", + "//java/google/registry/request", ], ) diff --git a/java/google/registry/security/JsonHttp.java b/java/google/registry/security/JsonHttp.java index d2feb04f4..9990c3dfe 100644 --- a/java/google/registry/security/JsonHttp.java +++ b/java/google/registry/security/JsonHttp.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.security; +package google.registry.security; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.net.HttpHeaders.CONTENT_DISPOSITION; @@ -21,7 +21,8 @@ import static com.google.common.net.MediaType.JSON_UTF_8; import static org.json.simple.JSONValue.writeJSONString; import com.google.common.net.MediaType; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.util.FormattingLogger; import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; diff --git a/java/google/registry/security/JsonResponseHelper.java b/java/google/registry/security/JsonResponseHelper.java index 5e20b47f2..78444fe3d 100644 --- a/java/google/registry/security/JsonResponseHelper.java +++ b/java/google/registry/security/JsonResponseHelper.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.security; +package google.registry.security; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/security/JsonTransportServlet.java b/java/google/registry/security/JsonTransportServlet.java index 66b13b637..af0fd6b2a 100644 --- a/java/google/registry/security/JsonTransportServlet.java +++ b/java/google/registry/security/JsonTransportServlet.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.security; +package google.registry.security; import static com.google.common.base.Preconditions.checkNotNull; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_OK; -import com.google.domain.registry.request.HttpException; +import google.registry.request.HttpException; import java.io.IOException; import java.util.Map; diff --git a/java/google/registry/security/XsrfProtectedServlet.java b/java/google/registry/security/XsrfProtectedServlet.java index bdb8a148e..6cf45deed 100644 --- a/java/google/registry/security/XsrfProtectedServlet.java +++ b/java/google/registry/security/XsrfProtectedServlet.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.security; +package google.registry.security; import static com.google.appengine.api.users.UserServiceFactory.getUserService; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Strings.nullToEmpty; -import static com.google.domain.registry.security.XsrfTokenManager.X_CSRF_TOKEN; -import static com.google.domain.registry.security.XsrfTokenManager.validateToken; +import static google.registry.security.XsrfTokenManager.X_CSRF_TOKEN; +import static google.registry.security.XsrfTokenManager.validateToken; import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import com.google.appengine.api.users.UserService; diff --git a/java/google/registry/security/XsrfTokenManager.java b/java/google/registry/security/XsrfTokenManager.java index 358b6f86b..803099edf 100644 --- a/java/google/registry/security/XsrfTokenManager.java +++ b/java/google/registry/security/XsrfTokenManager.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.security; +package google.registry.security; import static com.google.appengine.api.users.UserServiceFactory.getUserService; import static com.google.common.io.BaseEncoding.base64Url; -import static com.google.domain.registry.model.server.ServerSecret.getServerSecret; +import static google.registry.model.server.ServerSecret.getServerSecret; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.appengine.api.users.UserService; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.hash.Hashing; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.NonFinalForTesting; -import com.google.domain.registry.util.SystemClock; + +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; +import google.registry.util.NonFinalForTesting; +import google.registry.util.SystemClock; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/security/package-info.java b/java/google/registry/security/package-info.java index 5deb39913..92f5ea23a 100644 --- a/java/google/registry/security/package-info.java +++ b/java/google/registry/security/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.security; +package google.registry.security; diff --git a/java/google/registry/storage/drive/BUILD b/java/google/registry/storage/drive/BUILD index 3c27d8e8a..bc8ddc7ad 100644 --- a/java/google/registry/storage/drive/BUILD +++ b/java/google/registry/storage/drive/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "drive", diff --git a/java/google/registry/storage/drive/DriveConnection.java b/java/google/registry/storage/drive/DriveConnection.java index 54f4ab2cb..165acb5a5 100644 --- a/java/google/registry/storage/drive/DriveConnection.java +++ b/java/google/registry/storage/drive/DriveConnection.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.storage.drive; +package google.registry.storage.drive; import com.google.api.client.http.ByteArrayContent; import com.google.api.services.drive.Drive; diff --git a/java/google/registry/tldconfig/idn/BUILD b/java/google/registry/tldconfig/idn/BUILD index 59159bbb7..f8cd5de16 100644 --- a/java/google/registry/tldconfig/idn/BUILD +++ b/java/google/registry/tldconfig/idn/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "idn", @@ -12,10 +14,10 @@ java_library( "//java/com/google/common/base", "//java/com/google/common/collect", "//java/com/google/common/io", - "//java/com/google/domain/registry/util", "//third_party/java/joda_time", "//third_party/java/jsr305_annotations", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/tldconfig/idn/IdnLabelValidator.java b/java/google/registry/tldconfig/idn/IdnLabelValidator.java index 7f9d50c19..d85defd97 100644 --- a/java/google/registry/tldconfig/idn/IdnLabelValidator.java +++ b/java/google/registry/tldconfig/idn/IdnLabelValidator.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tldconfig.idn; +package google.registry.tldconfig.idn; -import static com.google.domain.registry.tldconfig.idn.IdnTableEnum.EXTENDED_LATIN; -import static com.google.domain.registry.tldconfig.idn.IdnTableEnum.JA; +import static google.registry.tldconfig.idn.IdnTableEnum.EXTENDED_LATIN; +import static google.registry.tldconfig.idn.IdnTableEnum.JA; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.util.Idn; -import com.google.domain.registry.util.NonFinalForTesting; + +import google.registry.util.Idn; +import google.registry.util.NonFinalForTesting; /** Validates whether a given IDN label can be provisioned for a particular TLD. */ public final class IdnLabelValidator { diff --git a/java/google/registry/tldconfig/idn/IdnTable.java b/java/google/registry/tldconfig/idn/IdnTable.java index 480d2e535..cfb1a91f7 100644 --- a/java/google/registry/tldconfig/idn/IdnTable.java +++ b/java/google/registry/tldconfig/idn/IdnTable.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tldconfig.idn; +package google.registry.tldconfig.idn; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/tldconfig/idn/IdnTableEnum.java b/java/google/registry/tldconfig/idn/IdnTableEnum.java index db2957fe4..4af507291 100644 --- a/java/google/registry/tldconfig/idn/IdnTableEnum.java +++ b/java/google/registry/tldconfig/idn/IdnTableEnum.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tldconfig.idn; +package google.registry.tldconfig.idn; import static com.google.common.io.Resources.readLines; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java b/java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java index 643e69764..cf3113ccb 100644 --- a/java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java +++ b/java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tldconfig.idn; +package google.registry.tldconfig.idn; import static java.lang.Character.UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION; import static java.lang.Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS; diff --git a/java/google/registry/tldconfig/idn/LanguageValidator.java b/java/google/registry/tldconfig/idn/LanguageValidator.java index 2ff49d5a3..6d9e538b3 100644 --- a/java/google/registry/tldconfig/idn/LanguageValidator.java +++ b/java/google/registry/tldconfig/idn/LanguageValidator.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tldconfig.idn; +package google.registry.tldconfig.idn; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; diff --git a/java/google/registry/tmch/BUILD b/java/google/registry/tmch/BUILD index 8ec5b415a..577f3511c 100644 --- a/java/google/registry/tmch/BUILD +++ b/java/google/registry/tmch/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "tmch", @@ -18,13 +20,6 @@ java_library( "//java/com/google/common/io", "//java/com/google/common/net", "//java/com/google/common/util/concurrent", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/cron", - "//java/com/google/domain/registry/keyring/api", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/xml", "//third_party/java/appengine:appengine-api", "//third_party/java/bouncycastle", "//third_party/java/bouncycastle_bcpg", @@ -34,5 +29,12 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/cron", + "//java/google/registry/keyring/api", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/util", + "//java/google/registry/xml", ], ) diff --git a/java/google/registry/tmch/ClaimsListParser.java b/java/google/registry/tmch/ClaimsListParser.java index 50bfc7111..a520f1873 100644 --- a/java/google/registry/tmch/ClaimsListParser.java +++ b/java/google/registry/tmch/ClaimsListParser.java @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.base.Preconditions.checkArgument; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.tmch.ClaimsListShard; + +import google.registry.model.tmch.ClaimsListShard; import org.joda.time.DateTime; diff --git a/java/google/registry/tmch/LordnLog.java b/java/google/registry/tmch/LordnLog.java index 9b51c73c7..614aa3b3e 100644 --- a/java/google/registry/tmch/LordnLog.java +++ b/java/google/registry/tmch/LordnLog.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; diff --git a/java/google/registry/tmch/LordnRequestInitializer.java b/java/google/registry/tmch/LordnRequestInitializer.java index 440eee6a3..55d154de7 100644 --- a/java/google/registry/tmch/LordnRequestInitializer.java +++ b/java/google/registry/tmch/LordnRequestInitializer.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.base.Verify.verifyNotNull; -import static com.google.domain.registry.util.UrlFetchUtils.setAuthorizationHeader; +import static google.registry.util.UrlFetchUtils.setAuthorizationHeader; import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.common.base.Optional; -import com.google.domain.registry.keyring.api.KeyModule.Key; -import com.google.domain.registry.model.registry.Registry; + +import google.registry.keyring.api.KeyModule.Key; +import google.registry.model.registry.Registry; import javax.inject.Inject; diff --git a/java/google/registry/tmch/LordnTask.java b/java/google/registry/tmch/LordnTask.java index 858fbf39b..10adbb05f 100644 --- a/java/google/registry/tmch/LordnTask.java +++ b/java/google/registry/tmch/LordnTask.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.api.taskqueue.LeaseOptions; import com.google.appengine.api.taskqueue.Queue; @@ -29,9 +29,10 @@ import com.google.common.base.Joiner; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Uninterruptibles; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.util.NonFinalForTesting; + +import google.registry.model.domain.DomainResource; +import google.registry.model.registrar.Registrar; +import google.registry.util.NonFinalForTesting; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/tmch/Marksdb.java b/java/google/registry/tmch/Marksdb.java index 34f8e78cd..87f5a907c 100644 --- a/java/google/registry/tmch/Marksdb.java +++ b/java/google/registry/tmch/Marksdb.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.appengine.api.urlfetch.FetchOptions.Builder.validateCertificate; import static com.google.appengine.api.urlfetch.HTTPMethod.GET; -import static com.google.domain.registry.util.HexDumper.dumpHex; -import static com.google.domain.registry.util.UrlFetchUtils.setAuthorizationHeader; +import static google.registry.util.HexDumper.dumpHex; +import static google.registry.util.UrlFetchUtils.setAuthorizationHeader; import static java.nio.charset.StandardCharsets.US_ASCII; import static javax.servlet.http.HttpServletResponse.SC_OK; @@ -26,9 +26,10 @@ import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.base.Optional; import com.google.common.io.ByteSource; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.keyring.api.KeyModule.Key; -import com.google.domain.registry.util.UrlFetchException; + +import google.registry.config.ConfigModule.Config; +import google.registry.keyring.api.KeyModule.Key; +import google.registry.util.UrlFetchException; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openpgp.PGPException; diff --git a/java/google/registry/tmch/NordnUploadAction.java b/java/google/registry/tmch/NordnUploadAction.java index ceb531014..a58311374 100644 --- a/java/google/registry/tmch/NordnUploadAction.java +++ b/java/google/registry/tmch/NordnUploadAction.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; @@ -21,11 +21,11 @@ import static com.google.appengine.api.urlfetch.HTTPMethod.POST; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.net.HttpHeaders.LOCATION; import static com.google.common.net.MediaType.CSV_UTF_8; -import static com.google.domain.registry.tmch.LordnTask.COLUMNS_CLAIMS; -import static com.google.domain.registry.tmch.LordnTask.COLUMNS_SUNRISE; -import static com.google.domain.registry.tmch.LordnTask.convertTasksToCsv; -import static com.google.domain.registry.util.UrlFetchUtils.getHeaderFirst; -import static com.google.domain.registry.util.UrlFetchUtils.setPayloadMultipart; +import static google.registry.tmch.LordnTask.COLUMNS_CLAIMS; +import static google.registry.tmch.LordnTask.COLUMNS_SUNRISE; +import static google.registry.tmch.LordnTask.convertTasksToCsv; +import static google.registry.util.UrlFetchUtils.getHeaderFirst; +import static google.registry.util.UrlFetchUtils.setPayloadMultipart; import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED; import com.google.appengine.api.taskqueue.Queue; @@ -35,13 +35,14 @@ import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.base.Optional; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.UrlFetchException; + +import google.registry.config.ConfigModule.Config; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; +import google.registry.util.UrlFetchException; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/tmch/NordnVerifyAction.java b/java/google/registry/tmch/NordnVerifyAction.java index d144b6638..9c71f631b 100644 --- a/java/google/registry/tmch/NordnVerifyAction.java +++ b/java/google/registry/tmch/NordnVerifyAction.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.appengine.api.urlfetch.FetchOptions.Builder.validateCertificate; import static com.google.appengine.api.urlfetch.HTTPMethod.GET; @@ -25,15 +25,16 @@ import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.annotations.VisibleForTesting; import com.google.common.io.ByteSource; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Header; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.ConflictException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.UrlFetchException; + +import google.registry.request.Action; +import google.registry.request.Header; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.ConflictException; +import google.registry.request.Parameter; +import google.registry.request.RequestParameters; +import google.registry.request.Response; +import google.registry.util.FormattingLogger; +import google.registry.util.UrlFetchException; import java.io.IOException; import java.net.URL; diff --git a/java/google/registry/tmch/SmdrlCsvParser.java b/java/google/registry/tmch/SmdrlCsvParser.java index 281640a13..930068657 100644 --- a/java/google/registry/tmch/SmdrlCsvParser.java +++ b/java/google/registry/tmch/SmdrlCsvParser.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.base.Preconditions.checkArgument; import static org.joda.time.DateTimeZone.UTC; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.smd.SignedMarkRevocationList; + +import google.registry.model.smd.SignedMarkRevocationList; import org.joda.time.DateTime; diff --git a/java/google/registry/tmch/TmchCertificateAuthority.java b/java/google/registry/tmch/TmchCertificateAuthority.java index 2187b2b86..da0b2f68b 100644 --- a/java/google/registry/tmch/TmchCertificateAuthority.java +++ b/java/google/registry/tmch/TmchCertificateAuthority.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.base.Throwables.propagateIfInstanceOf; -import static com.google.domain.registry.util.CacheUtils.memoizeWithLongExpiration; -import static com.google.domain.registry.util.CacheUtils.memoizeWithShortExpiration; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; -import static com.google.domain.registry.util.X509Utils.loadCrl; +import static google.registry.util.CacheUtils.memoizeWithLongExpiration; +import static google.registry.util.CacheUtils.memoizeWithShortExpiration; +import static google.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.util.X509Utils.loadCrl; import com.google.common.base.Supplier; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.tmch.TmchCrl; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.NonFinalForTesting; -import com.google.domain.registry.util.SystemClock; -import com.google.domain.registry.util.X509Utils; + +import google.registry.config.RegistryEnvironment; +import google.registry.model.tmch.TmchCrl; +import google.registry.util.Clock; +import google.registry.util.NonFinalForTesting; +import google.registry.util.SystemClock; +import google.registry.util.X509Utils; import java.security.GeneralSecurityException; import java.security.cert.X509CRL; diff --git a/java/google/registry/tmch/TmchCrlAction.java b/java/google/registry/tmch/TmchCrlAction.java index 6268b006c..3548ae2c1 100644 --- a/java/google/registry/tmch/TmchCrlAction.java +++ b/java/google/registry/tmch/TmchCrlAction.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.request.Action.Method.POST; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Optional; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.request.Action; + +import google.registry.config.ConfigModule.Config; +import google.registry.request.Action; import java.io.IOException; import java.net.URL; diff --git a/java/google/registry/tmch/TmchData.java b/java/google/registry/tmch/TmchData.java index 5f6c7660a..d0e3bb99d 100644 --- a/java/google/registry/tmch/TmchData.java +++ b/java/google/registry/tmch/TmchData.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.base.CharMatcher.whitespace; import com.google.common.io.ByteSource; -import com.google.domain.registry.model.smd.EncodedSignedMark; + +import google.registry.model.smd.EncodedSignedMark; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPUtil; diff --git a/java/google/registry/tmch/TmchDnlAction.java b/java/google/registry/tmch/TmchDnlAction.java index 1b9a70d2d..1429d567a 100644 --- a/java/google/registry/tmch/TmchDnlAction.java +++ b/java/google/registry/tmch/TmchDnlAction.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.request.Action.Method.POST; import com.google.common.base.Optional; -import com.google.domain.registry.keyring.api.KeyModule.Key; -import com.google.domain.registry.model.tmch.ClaimsListShard; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.keyring.api.KeyModule.Key; +import google.registry.model.tmch.ClaimsListShard; +import google.registry.request.Action; +import google.registry.util.FormattingLogger; import org.bouncycastle.openpgp.PGPException; diff --git a/java/google/registry/tmch/TmchModule.java b/java/google/registry/tmch/TmchModule.java index d722fd48e..29e5c9575 100644 --- a/java/google/registry/tmch/TmchModule.java +++ b/java/google/registry/tmch/TmchModule.java @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.io.Resources.asByteSource; import static com.google.common.io.Resources.getResource; -import static com.google.domain.registry.request.RequestParameters.extractRequiredHeader; -import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter; - -import com.google.domain.registry.keyring.api.KeyModule.Key; -import com.google.domain.registry.request.Header; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.Parameter; +import static google.registry.request.RequestParameters.extractRequiredHeader; +import static google.registry.request.RequestParameters.extractRequiredParameter; import dagger.Module; import dagger.Provides; +import google.registry.keyring.api.KeyModule.Key; +import google.registry.request.Header; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.Parameter; + import org.bouncycastle.openpgp.PGPPublicKey; import java.net.MalformedURLException; diff --git a/java/google/registry/tmch/TmchSmdrlAction.java b/java/google/registry/tmch/TmchSmdrlAction.java index d3b658097..df40c8352 100644 --- a/java/google/registry/tmch/TmchSmdrlAction.java +++ b/java/google/registry/tmch/TmchSmdrlAction.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.request.Action.Method.POST; import com.google.common.base.Optional; -import com.google.domain.registry.keyring.api.KeyModule.Key; -import com.google.domain.registry.model.smd.SignedMarkRevocationList; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.keyring.api.KeyModule.Key; +import google.registry.model.smd.SignedMarkRevocationList; +import google.registry.request.Action; +import google.registry.util.FormattingLogger; import org.bouncycastle.openpgp.PGPException; diff --git a/java/google/registry/tmch/TmchXmlSignature.java b/java/google/registry/tmch/TmchXmlSignature.java index 8cac5e7f7..2a6df751d 100644 --- a/java/google/registry/tmch/TmchXmlSignature.java +++ b/java/google/registry/tmch/TmchXmlSignature.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.getRootCause; import static com.google.common.base.Throwables.propagateIfInstanceOf; -import static com.google.domain.registry.xml.XmlTransformer.loadXmlSchemas; +import static google.registry.xml.XmlTransformer.loadXmlSchemas; import com.google.common.collect.ImmutableList; diff --git a/java/google/registry/tmch/package-info.java b/java/google/registry/tmch/package-info.java index aface7901..a3650b927 100644 --- a/java/google/registry/tmch/package-info.java +++ b/java/google/registry/tmch/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.tmch; +package google.registry.tmch; diff --git a/java/google/registry/tools/AllocateDomainCommand.java b/java/google/registry/tools/AllocateDomainCommand.java index 572b61e12..5509a75c1 100644 --- a/java/google/registry/tools/AllocateDomainCommand.java +++ b/java/google/registry/tools/AllocateDomainCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -20,30 +20,15 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Strings.emptyToNull; import static com.google.common.collect.Iterables.transform; import static com.google.common.io.BaseEncoding.base16; -import static com.google.domain.registry.flows.EppXmlTransformer.unmarshal; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.tools.CommandUtilities.addHeader; +import static google.registry.flows.EppXmlTransformer.unmarshal; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.tools.CommandUtilities.addHeader; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppXmlTransformer; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainCommand; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.domain.launch.ApplicationStatus; -import com.google.domain.registry.model.domain.launch.LaunchNotice; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppinput.EppInput; -import com.google.domain.registry.model.eppinput.EppInput.ResourceCommandWrapper; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.smd.SignedMark; -import com.google.domain.registry.tools.soy.DomainAllocateSoyInfo; import com.google.template.soy.data.SoyMapData; import com.beust.jcommander.Parameter; @@ -52,6 +37,22 @@ import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; +import google.registry.flows.EppException; +import google.registry.flows.EppXmlTransformer; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainCommand; +import google.registry.model.domain.Period; +import google.registry.model.domain.launch.ApplicationStatus; +import google.registry.model.domain.launch.LaunchNotice; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppinput.EppInput; +import google.registry.model.eppinput.EppInput.ResourceCommandWrapper; +import google.registry.model.host.HostResource; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.smd.SignedMark; +import google.registry.tools.soy.DomainAllocateSoyInfo; + import java.util.ArrayList; import java.util.List; diff --git a/java/google/registry/tools/AppEngineConnection.java b/java/google/registry/tools/AppEngineConnection.java index 1e31b8c89..c828db331 100644 --- a/java/google/registry/tools/AppEngineConnection.java +++ b/java/google/registry/tools/AppEngineConnection.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Suppliers.memoize; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; import static com.google.common.net.HttpHeaders.X_REQUESTED_WITH; import static com.google.common.net.MediaType.JSON_UTF_8; -import static com.google.domain.registry.security.JsonHttp.JSON_SAFETY_PREFIX; -import static com.google.domain.registry.security.XsrfTokenManager.X_CSRF_TOKEN; +import static google.registry.security.JsonHttp.JSON_SAFETY_PREFIX; +import static google.registry.security.XsrfTokenManager.X_CSRF_TOKEN; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Function; @@ -30,13 +30,14 @@ import com.google.common.collect.Iterables; import com.google.common.io.CharStreams; import com.google.common.net.HostAndPort; import com.google.common.net.MediaType; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.security.XsrfTokenManager; -import com.google.domain.registry.tools.ServerSideCommand.Connection; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.config.RegistryEnvironment; +import google.registry.security.XsrfTokenManager; +import google.registry.tools.ServerSideCommand.Connection; + import org.joda.time.Duration; import org.json.simple.JSONValue; diff --git a/java/google/registry/tools/AuctionStatusCommand.java b/java/google/registry/tools/AuctionStatusCommand.java index 8af06237d..73a883967 100644 --- a/java/google/registry/tools/AuctionStatusCommand.java +++ b/java/google/registry/tools/AuctionStatusCommand.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.Registries.findTldForName; +import static google.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.Registries.findTldForName; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Function; @@ -30,16 +30,17 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.PathParameter; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.googlecode.objectify.Work; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainApplication; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.PathParameter; + import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/java/google/registry/tools/BUILD b/java/google/registry/tools/BUILD index d48a53a83..712e81824 100644 --- a/java/google/registry/tools/BUILD +++ b/java/google/registry/tools/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + # Restrict visibility to :tools because :remoteapi-internal (and transitively # :appengine-api-link) should never be linked into an App Engine deploy jar, @@ -9,10 +11,10 @@ package( package_group( name = "allowed-tools", packages = [ - "//java/com/google/domain/registry/testing", - "//java/com/google/domain/registry/tools", - "//java/com/google/domain/registry/eclipse", - "//javatests/com/google/domain/registry/tools", + "//java/google/registry/testing", + "//java/google/registry/tools", + "//java/google/registry/eclipse", + "//javatests/google/registry/tools", ], ) @@ -41,24 +43,24 @@ java_library( "//java/com/google/common/io", "//java/com/google/common/net", "//java/com/google/common/util/concurrent", - "//java/com/google/domain/registry/bigquery", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/export", - "//java/com/google/domain/registry/flows", - "//java/com/google/domain/registry/keyring/api", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/rde", - "//java/com/google/domain/registry/security", - "//java/com/google/domain/registry/request:modules", - "//java/com/google/domain/registry/tldconfig/idn", - "//java/com/google/domain/registry/tmch", - "//java/com/google/domain/registry/tools/params", - "//java/com/google/domain/registry/tools/server", - "//java/com/google/domain/registry/tools/soy:soy_java_wrappers", - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/whois", - "//java/com/google/domain/registry/xjc", - "//java/com/google/domain/registry/xml", + "//java/google/registry/bigquery", + "//java/google/registry/config", + "//java/google/registry/export", + "//java/google/registry/flows", + "//java/google/registry/keyring/api", + "//java/google/registry/model", + "//java/google/registry/rde", + "//java/google/registry/security", + "//java/google/registry/request:modules", + "//java/google/registry/tldconfig/idn", + "//java/google/registry/tmch", + "//java/google/registry/tools/params", + "//java/google/registry/tools/server", + "//java/google/registry/tools/soy:soy_java_wrappers", + "//java/google/registry/util", + "//java/google/registry/whois", + "//java/google/registry/xjc", + "//java/google/registry/xml", "//third_party/java/appengine:appengine-api", "//third_party/java/bouncycastle", "//third_party/java/bouncycastle_bcpg", @@ -81,7 +83,7 @@ java_library( java_binary( name = "registry_tool", create_executable = 1, - main_class = "com.google.domain.registry.tools.RegistryTool", + main_class = "google.registry.tools.RegistryTool", runtime_deps = [ ":tools", "//third_party/java/appengine:appengine-api-link", diff --git a/java/google/registry/tools/BigqueryCommand.java b/java/google/registry/tools/BigqueryCommand.java index 68ef207ca..cff1be3f9 100644 --- a/java/google/registry/tools/BigqueryCommand.java +++ b/java/google/registry/tools/BigqueryCommand.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.bigquery.BigqueryConnection; +package google.registry.tools; import com.beust.jcommander.ParametersDelegate; +import google.registry.bigquery.BigqueryConnection; + /** A {@link Command} that uses the bigquery client API. */ abstract class BigqueryCommand implements Command { diff --git a/java/google/registry/tools/BigqueryCommandUtilities.java b/java/google/registry/tools/BigqueryCommandUtilities.java index a32303b75..71e70ea74 100644 --- a/java/google/registry/tools/BigqueryCommandUtilities.java +++ b/java/google/registry/tools/BigqueryCommandUtilities.java @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.util.concurrent.ListenableFuture; -import com.google.domain.registry.bigquery.BigqueryConnection.DestinationTable; + +import google.registry.bigquery.BigqueryConnection.DestinationTable; import java.util.concurrent.ExecutionException; diff --git a/java/google/registry/tools/BigqueryParameters.java b/java/google/registry/tools/BigqueryParameters.java index 144331f70..8b5faf948 100644 --- a/java/google/registry/tools/BigqueryParameters.java +++ b/java/google/registry/tools/BigqueryParameters.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; import com.google.api.client.http.HttpTransport; @@ -20,12 +20,13 @@ import com.google.api.client.http.javanet.NetHttpTransport; import com.google.api.client.json.JsonFactory; import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.services.bigquery.BigqueryScopes; -import com.google.domain.registry.bigquery.BigqueryConnection; -import com.google.domain.registry.tools.params.PathParameter; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.bigquery.BigqueryConnection; +import google.registry.tools.params.PathParameter; + import org.joda.time.Duration; import java.nio.file.Path; diff --git a/java/google/registry/tools/CanonicalizeLabelsCommand.java b/java/google/registry/tools/CanonicalizeLabelsCommand.java index 1ab994ed8..9dff75cb9 100644 --- a/java/google/registry/tools/CanonicalizeLabelsCommand.java +++ b/java/google/registry/tools/CanonicalizeLabelsCommand.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName; +import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Joiner; import com.google.common.io.CharStreams; import com.google.common.io.Files; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.util.DomainNameUtils; -import com.google.domain.registry.util.Idn; -import com.google.domain.registry.util.NonFinalForTesting; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.Command.GtechCommand; +import google.registry.util.DomainNameUtils; +import google.registry.util.Idn; +import google.registry.util.NonFinalForTesting; + import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/java/google/registry/tools/CheckSnapshotCommand.java b/java/google/registry/tools/CheckSnapshotCommand.java index 54b448961..ae023caac 100644 --- a/java/google/registry/tools/CheckSnapshotCommand.java +++ b/java/google/registry/tools/CheckSnapshotCommand.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.collect.Iterables; -import com.google.domain.registry.export.DatastoreBackupInfo; -import com.google.domain.registry.export.DatastoreBackupService; -import com.google.domain.registry.tools.Command.RemoteApiCommand; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.export.DatastoreBackupInfo; +import google.registry.export.DatastoreBackupService; +import google.registry.tools.Command.RemoteApiCommand; + /** * Command to check the status of a datastore backup, or "snapshot". */ diff --git a/java/google/registry/tools/Command.java b/java/google/registry/tools/Command.java index d1f52a64f..f1cdd7973 100644 --- a/java/google/registry/tools/Command.java +++ b/java/google/registry/tools/Command.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; /** Interface of all commands. */ public interface Command { diff --git a/java/google/registry/tools/CommandUtilities.java b/java/google/registry/tools/CommandUtilities.java index 4e18589c1..9132b72c9 100644 --- a/java/google/registry/tools/CommandUtilities.java +++ b/java/google/registry/tools/CommandUtilities.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.flows.EppXmlTransformer.marshalWithLenientRetry; +import static google.registry.flows.EppXmlTransformer.marshalWithLenientRetry; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Strings; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.FlowRunner; -import com.google.domain.registry.flows.FlowRunner.CommitMode; -import com.google.domain.registry.flows.FlowRunner.UserPrivileges; + +import google.registry.flows.EppException; +import google.registry.flows.FlowRunner; +import google.registry.flows.FlowRunner.CommitMode; +import google.registry.flows.FlowRunner.UserPrivileges; /** Container class for static utility methods. */ class CommandUtilities { diff --git a/java/google/registry/tools/ConfirmingCommand.java b/java/google/registry/tools/ConfirmingCommand.java index ac89a01c5..b9b26bfd3 100644 --- a/java/google/registry/tools/ConfirmingCommand.java +++ b/java/google/registry/tools/ConfirmingCommand.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.tools.CommandUtilities.printLineIfNotEmpty; -import static com.google.domain.registry.tools.CommandUtilities.promptForYes; +import static google.registry.tools.CommandUtilities.printLineIfNotEmpty; +import static google.registry.tools.CommandUtilities.promptForYes; import com.beust.jcommander.Parameter; diff --git a/java/google/registry/tools/ConvertIdnCommand.java b/java/google/registry/tools/ConvertIdnCommand.java index b67fe0521..c10ee5ffb 100644 --- a/java/google/registry/tools/ConvertIdnCommand.java +++ b/java/google/registry/tools/ConvertIdnCommand.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.util.DomainNameUtils.ACE_PREFIX; -import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName; - -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.util.Idn; +import static google.registry.util.DomainNameUtils.ACE_PREFIX; +import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.Command.GtechCommand; +import google.registry.util.Idn; + import java.io.IOException; import java.util.List; diff --git a/java/google/registry/tools/CreateAnchorTenantCommand.java b/java/google/registry/tools/CreateAnchorTenantCommand.java index fa08b300e..14e25a5c5 100644 --- a/java/google/registry/tools/CreateAnchorTenantCommand.java +++ b/java/google/registry/tools/CreateAnchorTenantCommand.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; -import static com.google.domain.registry.model.registry.Registries.findTldForNameOrThrow; +import static google.registry.model.registry.Registries.findTldForNameOrThrow; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.soy.CreateAnchorTenantSoyInfo; import com.google.template.soy.data.SoyMapData; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.registry.Registry; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.soy.CreateAnchorTenantSoyInfo; + import org.joda.money.Money; import javax.inject.Inject; diff --git a/java/google/registry/tools/CreateAuctionCreditsCommand.java b/java/google/registry/tools/CreateAuctionCreditsCommand.java index ab3ba76da..81daa9185 100644 --- a/java/google/registry/tools/CreateAuctionCreditsCommand.java +++ b/java/google/registry/tools/CreateAuctionCreditsCommand.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.CaseFormat.UPPER_CAMEL; import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; +import static google.registry.model.registry.Registries.assertTldExists; import static java.util.Arrays.asList; import static org.joda.time.DateTimeZone.UTC; @@ -27,15 +27,16 @@ import com.google.common.base.Splitter; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Iterables; -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCredit.CreditType; -import com.google.domain.registry.model.billing.RegistrarCreditBalance; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.billing.RegistrarCredit; +import google.registry.model.billing.RegistrarCredit.CreditType; +import google.registry.model.billing.RegistrarCreditBalance; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; + import org.joda.money.BigMoney; import org.joda.money.CurrencyUnit; import org.joda.money.Money; diff --git a/java/google/registry/tools/CreateContactCommand.java b/java/google/registry/tools/CreateContactCommand.java index 89fd6ea26..3e44ec20f 100644 --- a/java/google/registry/tools/CreateContactCommand.java +++ b/java/google/registry/tools/CreateContactCommand.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.params.PhoneNumberParameter; -import com.google.domain.registry.tools.soy.CreateContactSoyInfo; import com.google.template.soy.data.SoyMapData; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.params.PhoneNumberParameter; +import google.registry.tools.soy.CreateContactSoyInfo; + import java.util.List; import javax.inject.Inject; diff --git a/java/google/registry/tools/CreateCreditBalanceCommand.java b/java/google/registry/tools/CreateCreditBalanceCommand.java index 6b7a7c86e..0e4434ce5 100644 --- a/java/google/registry/tools/CreateCreditBalanceCommand.java +++ b/java/google/registry/tools/CreateCreditBalanceCommand.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; - -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCreditBalance; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.util.SystemClock; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.billing.RegistrarCredit; +import google.registry.model.billing.RegistrarCreditBalance; +import google.registry.model.registrar.Registrar; +import google.registry.tools.Command.GtechCommand; +import google.registry.util.SystemClock; + import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/tools/CreateCreditCommand.java b/java/google/registry/tools/CreateCreditCommand.java index b5396dfd3..3366a5bb5 100644 --- a/java/google/registry/tools/CreateCreditCommand.java +++ b/java/google/registry/tools/CreateCreditCommand.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; import static org.joda.time.DateTimeZone.UTC; -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCredit.CreditType; -import com.google.domain.registry.model.billing.RegistrarCreditBalance; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.tools.Command.GtechCommand; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.billing.RegistrarCredit; +import google.registry.model.billing.RegistrarCredit.CreditType; +import google.registry.model.billing.RegistrarCreditBalance; +import google.registry.model.registrar.Registrar; +import google.registry.tools.Command.GtechCommand; + import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java b/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java index d81e08ab8..ef9ff9bcc 100644 --- a/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java +++ b/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Strings.isNullOrEmpty; -import static com.google.domain.registry.security.JsonHttp.JSON_SAFETY_PREFIX; -import static com.google.domain.registry.tools.server.CreateOrUpdatePremiumListAction.INPUT_PARAM; -import static com.google.domain.registry.tools.server.CreateOrUpdatePremiumListAction.NAME_PARAM; -import static com.google.domain.registry.util.ListNamingUtils.convertFilePathToName; +import static google.registry.security.JsonHttp.JSON_SAFETY_PREFIX; +import static google.registry.tools.server.CreateOrUpdatePremiumListAction.INPUT_PARAM; +import static google.registry.tools.server.CreateOrUpdatePremiumListAction.NAME_PARAM; +import static google.registry.util.ListNamingUtils.convertFilePathToName; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Joiner; import com.google.common.base.Verify; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.tools.params.PathParameter; import com.beust.jcommander.Parameter; +import google.registry.model.registry.label.PremiumList; +import google.registry.tools.params.PathParameter; + import org.json.simple.JSONValue; import java.net.URLEncoder; diff --git a/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java b/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java index a41623d1e..066cd08c8 100644 --- a/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java +++ b/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Predicates.isNull; import static com.google.common.base.Strings.isNullOrEmpty; -import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName; -import static com.google.domain.registry.util.RegistrarUtils.normalizeRegistrarName; +import static google.registry.util.DomainNameUtils.canonicalizeDomainName; +import static google.registry.util.RegistrarUtils.normalizeRegistrarName; import static java.nio.charset.StandardCharsets.US_ASCII; import static org.joda.time.DateTimeZone.UTC; @@ -27,18 +27,19 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import com.google.domain.registry.model.billing.RegistrarBillingUtils; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.Registrar.BillingMethod; -import com.google.domain.registry.model.registrar.RegistrarAddress; -import com.google.domain.registry.tools.params.OptionalLongParameter; -import com.google.domain.registry.tools.params.OptionalPhoneNumberParameter; -import com.google.domain.registry.tools.params.OptionalStringParameter; -import com.google.domain.registry.tools.params.PathParameter; -import com.google.domain.registry.util.CidrAddressBlock; import com.beust.jcommander.Parameter; +import google.registry.model.billing.RegistrarBillingUtils; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.Registrar.BillingMethod; +import google.registry.model.registrar.RegistrarAddress; +import google.registry.tools.params.OptionalLongParameter; +import google.registry.tools.params.OptionalPhoneNumberParameter; +import google.registry.tools.params.OptionalStringParameter; +import google.registry.tools.params.PathParameter; +import google.registry.util.CidrAddressBlock; + import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/tools/CreateOrUpdateReservedListCommand.java b/java/google/registry/tools/CreateOrUpdateReservedListCommand.java index 3cdf39805..1bcf3ae3a 100644 --- a/java/google/registry/tools/CreateOrUpdateReservedListCommand.java +++ b/java/google/registry/tools/CreateOrUpdateReservedListCommand.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.tools.params.PathParameter; +package google.registry.tools; import com.beust.jcommander.Parameter; +import google.registry.tools.params.PathParameter; + import java.nio.file.Path; import javax.annotation.Nullable; diff --git a/java/google/registry/tools/CreateOrUpdateTldCommand.java b/java/google/registry/tools/CreateOrUpdateTldCommand.java index 2d07db903..8a48469bb 100644 --- a/java/google/registry/tools/CreateOrUpdateTldCommand.java +++ b/java/google/registry/tools/CreateOrUpdateTldCommand.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Sets.difference; import static com.google.common.collect.Sets.intersection; import static com.google.common.collect.Sets.union; -import static com.google.domain.registry.model.RoidSuffixes.isRoidSuffixUsed; -import static com.google.domain.registry.util.CollectionUtils.findDuplicates; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; -import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName; +import static google.registry.model.RoidSuffixes.isRoidSuffixUsed; +import static google.registry.util.CollectionUtils.findDuplicates; +import static google.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import com.google.common.base.CharMatcher; import com.google.common.base.Function; @@ -31,19 +31,20 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; -import com.google.domain.registry.model.registry.Registries; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.model.registry.Registry.TldType; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.model.registry.label.ReservedList; -import com.google.domain.registry.tools.params.OptionalStringParameter; -import com.google.domain.registry.tools.params.TransitionListParameter.BillingCostTransitions; -import com.google.domain.registry.tools.params.TransitionListParameter.TldStateTransitions; import com.beust.jcommander.Parameter; import com.googlecode.objectify.Key; +import google.registry.model.registry.Registries; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldState; +import google.registry.model.registry.Registry.TldType; +import google.registry.model.registry.label.PremiumList; +import google.registry.model.registry.label.ReservedList; +import google.registry.tools.params.OptionalStringParameter; +import google.registry.tools.params.TransitionListParameter.BillingCostTransitions; +import google.registry.tools.params.TransitionListParameter.TldStateTransitions; + import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/tools/CreatePremiumListCommand.java b/java/google/registry/tools/CreatePremiumListCommand.java index 9f8918ae6..df3ee97f1 100644 --- a/java/google/registry/tools/CreatePremiumListCommand.java +++ b/java/google/registry/tools/CreatePremiumListCommand.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.tools.server.CreatePremiumListAction; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.registry.label.PremiumList; +import google.registry.tools.server.CreatePremiumListAction; + import javax.annotation.Nullable; /** Command to create a {@link PremiumList} on Datastore. */ diff --git a/java/google/registry/tools/CreateRegistrarCommand.java b/java/google/registry/tools/CreateRegistrarCommand.java index 5fe23afbe..045cadd9c 100644 --- a/java/google/registry/tools/CreateRegistrarCommand.java +++ b/java/google/registry/tools/CreateRegistrarCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -21,22 +21,23 @@ import static com.google.common.base.Strings.emptyToNull; import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.collect.Lists.newArrayList; -import static com.google.domain.registry.model.registrar.Registrar.State.ACTIVE; -import static com.google.domain.registry.tools.RegistryToolEnvironment.PRODUCTION; -import static com.google.domain.registry.tools.RegistryToolEnvironment.SANDBOX; -import static com.google.domain.registry.tools.RegistryToolEnvironment.UNITTEST; -import static com.google.domain.registry.util.RegistrarUtils.normalizeClientId; +import static google.registry.model.registrar.Registrar.State.ACTIVE; +import static google.registry.tools.RegistryToolEnvironment.PRODUCTION; +import static google.registry.tools.RegistryToolEnvironment.SANDBOX; +import static google.registry.tools.RegistryToolEnvironment.UNITTEST; +import static google.registry.util.RegistrarUtils.normalizeClientId; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.tools.Command.GtechCommand; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.registrar.Registrar; +import google.registry.tools.Command.GtechCommand; + import java.util.List; import javax.annotation.Nullable; diff --git a/java/google/registry/tools/CreateRegistrarGroupsCommand.java b/java/google/registry/tools/CreateRegistrarGroupsCommand.java index 053652959..ec694c8af 100644 --- a/java/google/registry/tools/CreateRegistrarGroupsCommand.java +++ b/java/google/registry/tools/CreateRegistrarGroupsCommand.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.collect.Iterables.transform; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.server.CreateGroupsAction; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.registrar.Registrar; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.server.CreateGroupsAction; + import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/java/google/registry/tools/CreateReservedListCommand.java b/java/google/registry/tools/CreateReservedListCommand.java index 7ffd8ed92..937251d40 100644 --- a/java/google/registry/tools/CreateReservedListCommand.java +++ b/java/google/registry/tools/CreateReservedListCommand.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; -import static com.google.domain.registry.util.ListNamingUtils.convertFilePathToName; +import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.util.ListNamingUtils.convertFilePathToName; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Splitter; import com.google.common.base.Strings; -import com.google.domain.registry.model.registry.label.ReservedList; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.registry.label.ReservedList; + import org.joda.time.DateTime; import java.nio.file.Files; diff --git a/java/google/registry/tools/CreateSandboxTldCommand.java b/java/google/registry/tools/CreateSandboxTldCommand.java index 840b1ade6..38e3ec370 100644 --- a/java/google/registry/tools/CreateSandboxTldCommand.java +++ b/java/google/registry/tools/CreateSandboxTldCommand.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.tools.Command.GtechCommand; - import com.beust.jcommander.Parameters; +import google.registry.config.RegistryEnvironment; +import google.registry.tools.Command.GtechCommand; + /** Command to create a TLD in sandbox, separated out for Gtech use. */ @Parameters(separators = " =", commandDescription = "Create new sandbox TLD(s)") final class CreateSandboxTldCommand extends CreateTldCommand implements GtechCommand { diff --git a/java/google/registry/tools/CreateTldCommand.java b/java/google/registry/tools/CreateTldCommand.java index f58f1688f..c4c0a0e1b 100644 --- a/java/google/registry/tools/CreateTldCommand.java +++ b/java/google/registry/tools/CreateTldCommand.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.model.registry.Registries.getTlds; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.registry.Registries.getTlds; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSortedMap; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldState; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldState; + import org.joda.money.Money; import javax.annotation.Nullable; diff --git a/java/google/registry/tools/DeleteCreditCommand.java b/java/google/registry/tools/DeleteCreditCommand.java index 32cb5cb5e..05f924fad 100644 --- a/java/google/registry/tools/DeleteCreditCommand.java +++ b/java/google/registry/tools/DeleteCreditCommand.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; - -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCreditBalance; -import com.google.domain.registry.model.registrar.Registrar; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.billing.RegistrarCredit; +import google.registry.model.billing.RegistrarCreditBalance; +import google.registry.model.registrar.Registrar; + /** Command for deleting a registrar credit object and all of its child balances. */ @Parameters(separators = " =", commandDescription = "Delete a registrar credit") final class DeleteCreditCommand extends MutatingCommand { diff --git a/java/google/registry/tools/DeleteDomainCommand.java b/java/google/registry/tools/DeleteDomainCommand.java index c1f5dd4c7..4f9fe87e6 100644 --- a/java/google/registry/tools/DeleteDomainCommand.java +++ b/java/google/registry/tools/DeleteDomainCommand.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.soy.DeleteDomainSoyInfo; import com.google.template.soy.data.SoyMapData; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.soy.DeleteDomainSoyInfo; + /** A command to delete a domain via EPP. */ @Parameters(separators = " =", commandDescription = "Delete domain") final class DeleteDomainCommand extends MutatingEppToolCommand implements GtechCommand { diff --git a/java/google/registry/tools/DeleteEntityCommand.java b/java/google/registry/tools/DeleteEntityCommand.java index 1c2564c74..7309079f6 100644 --- a/java/google/registry/tools/DeleteEntityCommand.java +++ b/java/google/registry/tools/DeleteEntityCommand.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; -import com.google.domain.registry.tools.server.DeleteEntityAction; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.server.DeleteEntityAction; + import java.util.List; /** diff --git a/java/google/registry/tools/DeleteEppResourceCommand.java b/java/google/registry/tools/DeleteEppResourceCommand.java index dab39148d..0be83bce8 100644 --- a/java/google/registry/tools/DeleteEppResourceCommand.java +++ b/java/google/registry/tools/DeleteEppResourceCommand.java @@ -12,23 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; import static org.joda.time.DateTimeZone.UTC; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.tools.params.EppResourceTypeParameter; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.googlecode.objectify.Key; +import google.registry.model.EppResource; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.model.reporting.HistoryEntry; +import google.registry.tools.params.EppResourceTypeParameter; + import org.joda.time.DateTime; import java.util.List; diff --git a/java/google/registry/tools/DeletePremiumListCommand.java b/java/google/registry/tools/DeletePremiumListCommand.java index c55b69970..9e067f4bb 100644 --- a/java/google/registry/tools/DeletePremiumListCommand.java +++ b/java/google/registry/tools/DeletePremiumListCommand.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.tools.Command.RemoteApiCommand; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; -import javax.annotation.Nullable; +import google.registry.model.registry.label.PremiumList; +import google.registry.tools.Command.RemoteApiCommand; +import javax.annotation.Nullable; /** * Command to delete a {@link PremiumList} in Datastore. This command will fail if the premium diff --git a/java/google/registry/tools/DeleteReservedListCommand.java b/java/google/registry/tools/DeleteReservedListCommand.java index f854321c9..d35f0fbee 100644 --- a/java/google/registry/tools/DeleteReservedListCommand.java +++ b/java/google/registry/tools/DeleteReservedListCommand.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registry.label.ReservedList; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.registry.label.ReservedList; + /** * Command to delete a {@link ReservedList} in Datastore. This command will fail if the reserved * list is currently in use on a tld. diff --git a/java/google/registry/tools/DomainApplicationInfoCommand.java b/java/google/registry/tools/DomainApplicationInfoCommand.java index 8cb326017..109ebaf17 100644 --- a/java/google/registry/tools/DomainApplicationInfoCommand.java +++ b/java/google/registry/tools/DomainApplicationInfoCommand.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; -import com.google.domain.registry.model.domain.launch.LaunchPhase; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.soy.DomainApplicationInfoSoyInfo; import com.google.template.soy.data.SoyMapData; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.domain.launch.LaunchPhase; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.soy.DomainApplicationInfoSoyInfo; + /** A command to execute a domain application info EPP command. */ @Parameters(separators = " =", commandDescription = "Get domain application EPP info") final class DomainApplicationInfoCommand extends EppToolCommand implements GtechCommand { diff --git a/java/google/registry/tools/DomainCheckClaimsCommand.java b/java/google/registry/tools/DomainCheckClaimsCommand.java index ff92559cf..fba53d58b 100644 --- a/java/google/registry/tools/DomainCheckClaimsCommand.java +++ b/java/google/registry/tools/DomainCheckClaimsCommand.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.collect.Multimap; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.soy.DomainCheckClaimsSoyInfo; import com.google.template.soy.data.SoyMapData; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.soy.DomainCheckClaimsSoyInfo; + import java.util.Collection; import java.util.List; diff --git a/java/google/registry/tools/DomainCheckCommand.java b/java/google/registry/tools/DomainCheckCommand.java index 8aa43447f..199a81765 100644 --- a/java/google/registry/tools/DomainCheckCommand.java +++ b/java/google/registry/tools/DomainCheckCommand.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.collect.Multimap; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.soy.DomainCheckSoyInfo; import com.google.template.soy.data.SoyMapData; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.soy.DomainCheckSoyInfo; + import java.util.Collection; import java.util.List; diff --git a/java/google/registry/tools/DomainCheckFeeCommand.java b/java/google/registry/tools/DomainCheckFeeCommand.java index 992e111fd..3a65fe6db 100644 --- a/java/google/registry/tools/DomainCheckFeeCommand.java +++ b/java/google/registry/tools/DomainCheckFeeCommand.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.collect.Multimap; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.soy.DomainCheckFeeSoyInfo; import com.google.template.soy.data.SoyMapData; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.soy.DomainCheckFeeSoyInfo; + import java.util.Collection; import java.util.List; diff --git a/java/google/registry/tools/EncryptEscrowDepositCommand.java b/java/google/registry/tools/EncryptEscrowDepositCommand.java index 10ad543ad..48228e8bb 100644 --- a/java/google/registry/tools/EncryptEscrowDepositCommand.java +++ b/java/google/registry/tools/EncryptEscrowDepositCommand.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName; - -import com.google.domain.registry.tools.params.PathParameter; +import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.params.PathParameter; + import java.nio.file.Path; import java.nio.file.Paths; diff --git a/java/google/registry/tools/EppToolCommand.java b/java/google/registry/tools/EppToolCommand.java index 31b7984c5..b10c1fe9f 100644 --- a/java/google/registry/tools/EppToolCommand.java +++ b/java/google/registry/tools/EppToolCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -20,11 +20,11 @@ import static com.google.common.base.Predicates.notNull; import static com.google.common.base.Strings.nullToEmpty; import static com.google.common.collect.Maps.filterValues; import static com.google.common.io.Resources.getResource; -import static com.google.domain.registry.flows.EppServletUtils.APPLICATION_EPP_XML_UTF8; -import static com.google.domain.registry.model.registry.Registries.findTldForNameOrThrow; -import static com.google.domain.registry.tools.CommandUtilities.addHeader; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; -import static com.google.domain.registry.xml.XmlTransformer.prettyPrint; +import static google.registry.flows.EppServletUtils.APPLICATION_EPP_XML_UTF8; +import static google.registry.model.registry.Registries.findTldForNameOrThrow; +import static google.registry.tools.CommandUtilities.addHeader; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; +import static google.registry.xml.XmlTransformer.prettyPrint; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Joiner; @@ -32,7 +32,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.model.registrar.Registrar; import com.google.template.soy.SoyFileSet; import com.google.template.soy.data.SoyRecord; import com.google.template.soy.parseinfo.SoyFileInfo; @@ -40,6 +39,8 @@ import com.google.template.soy.parseinfo.SoyTemplateInfo; import com.beust.jcommander.Parameter; +import google.registry.model.registrar.Registrar; + import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; diff --git a/java/google/registry/tools/EscrowDepositEncryptor.java b/java/google/registry/tools/EscrowDepositEncryptor.java index 9085828b1..4dffef4a4 100644 --- a/java/google/registry/tools/EscrowDepositEncryptor.java +++ b/java/google/registry/tools/EscrowDepositEncryptor.java @@ -12,25 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.model.rde.RdeMode.FULL; +import static google.registry.model.rde.RdeMode.FULL; import com.google.common.io.ByteStreams; -import com.google.domain.registry.keyring.api.KeyModule.Key; -import com.google.domain.registry.model.rde.RdeNamingUtils; -import com.google.domain.registry.rde.RdeUtil; -import com.google.domain.registry.rde.RydePgpCompressionOutputStream; -import com.google.domain.registry.rde.RydePgpCompressionOutputStreamFactory; -import com.google.domain.registry.rde.RydePgpEncryptionOutputStream; -import com.google.domain.registry.rde.RydePgpEncryptionOutputStreamFactory; -import com.google.domain.registry.rde.RydePgpFileOutputStream; -import com.google.domain.registry.rde.RydePgpFileOutputStreamFactory; -import com.google.domain.registry.rde.RydePgpSigningOutputStream; -import com.google.domain.registry.rde.RydePgpSigningOutputStreamFactory; -import com.google.domain.registry.rde.RydeTarOutputStream; -import com.google.domain.registry.rde.RydeTarOutputStreamFactory; -import com.google.domain.registry.xml.XmlException; + +import google.registry.keyring.api.KeyModule.Key; +import google.registry.model.rde.RdeNamingUtils; +import google.registry.rde.RdeUtil; +import google.registry.rde.RydePgpCompressionOutputStream; +import google.registry.rde.RydePgpCompressionOutputStreamFactory; +import google.registry.rde.RydePgpEncryptionOutputStream; +import google.registry.rde.RydePgpEncryptionOutputStreamFactory; +import google.registry.rde.RydePgpFileOutputStream; +import google.registry.rde.RydePgpFileOutputStreamFactory; +import google.registry.rde.RydePgpSigningOutputStream; +import google.registry.rde.RydePgpSigningOutputStreamFactory; +import google.registry.rde.RydeTarOutputStream; +import google.registry.rde.RydeTarOutputStreamFactory; +import google.registry.xml.XmlException; import org.bouncycastle.bcpg.ArmoredOutputStream; import org.bouncycastle.openpgp.PGPException; diff --git a/java/google/registry/tools/ExecuteEppCommand.java b/java/google/registry/tools/ExecuteEppCommand.java index 131aed6c8..492d68642 100644 --- a/java/google/registry/tools/ExecuteEppCommand.java +++ b/java/google/registry/tools/ExecuteEppCommand.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.io.CharStreams; import com.google.common.io.Files; -import com.google.domain.registry.util.NonFinalForTesting; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.util.NonFinalForTesting; + import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/java/google/registry/tools/GenerateApplicationsReportCommand.java b/java/google/registry/tools/GenerateApplicationsReportCommand.java index f9e19fcb2..1da998ef1 100644 --- a/java/google/registry/tools/GenerateApplicationsReportCommand.java +++ b/java/google/registry/tools/GenerateApplicationsReportCommand.java @@ -12,38 +12,39 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Strings.isNullOrEmpty; -import static com.google.domain.registry.flows.EppXmlTransformer.unmarshal; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; -import static com.google.domain.registry.util.DomainNameUtils.ACE_PREFIX; +import static google.registry.flows.EppXmlTransformer.unmarshal; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; +import static google.registry.util.DomainNameUtils.ACE_PREFIX; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Collections.emptyList; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.smd.EncodedSignedMark; -import com.google.domain.registry.model.smd.SignedMark; -import com.google.domain.registry.model.smd.SignedMarkRevocationList; -import com.google.domain.registry.model.tmch.ClaimsListShard; -import com.google.domain.registry.tmch.TmchXmlSignature; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.PathParameter; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.Idn; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.googlecode.objectify.cmd.LoadType; import com.googlecode.objectify.cmd.Query; +import google.registry.flows.EppException; +import google.registry.model.domain.DomainApplication; +import google.registry.model.smd.EncodedSignedMark; +import google.registry.model.smd.SignedMark; +import google.registry.model.smd.SignedMarkRevocationList; +import google.registry.model.tmch.ClaimsListShard; +import google.registry.tmch.TmchXmlSignature; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.PathParameter; +import google.registry.util.Clock; +import google.registry.util.Idn; + import org.joda.time.DateTime; import java.nio.file.Files; diff --git a/java/google/registry/tools/GenerateAuctionDataCommand.java b/java/google/registry/tools/GenerateAuctionDataCommand.java index dbd6e253f..8a65cb89b 100644 --- a/java/google/registry/tools/GenerateAuctionDataCommand.java +++ b/java/google/registry/tools/GenerateAuctionDataCommand.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Strings.nullToEmpty; -import static com.google.domain.registry.model.domain.launch.ApplicationStatus.REJECTED; -import static com.google.domain.registry.model.domain.launch.ApplicationStatus.VALIDATED; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; -import static com.google.domain.registry.util.DateTimeUtils.isAtOrAfter; +import static google.registry.model.domain.launch.ApplicationStatus.REJECTED; +import static google.registry.model.domain.launch.ApplicationStatus.VALIDATED; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.util.DateTimeUtils.isAtOrAfter; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; @@ -33,22 +33,23 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; import com.google.common.collect.Ordering; import com.google.common.collect.TreeMultimap; -import com.google.domain.registry.model.contact.ContactAddress; -import com.google.domain.registry.model.contact.ContactPhoneNumber; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.PostalInfo; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.launch.ApplicationStatus; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarAddress; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.PathParameter; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.contact.ContactAddress; +import google.registry.model.contact.ContactPhoneNumber; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.PostalInfo; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.launch.ApplicationStatus; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarAddress; +import google.registry.model.registrar.RegistrarContact; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.PathParameter; + import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; diff --git a/java/google/registry/tools/GenerateDnsReportCommand.java b/java/google/registry/tools/GenerateDnsReportCommand.java index 07d85a2f0..fa92713a6 100644 --- a/java/google/registry/tools/GenerateDnsReportCommand.java +++ b/java/google/registry/tools/GenerateDnsReportCommand.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.io.BaseEncoding.base16; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; import static java.nio.charset.StandardCharsets.US_ASCII; import com.google.common.base.Function; @@ -25,17 +25,18 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Ordering; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.PathParameter; -import com.google.domain.registry.util.Clock; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.host.HostResource; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.PathParameter; +import google.registry.util.Clock; + import org.joda.time.DateTime; import org.json.simple.JSONValue; diff --git a/java/google/registry/tools/GenerateEscrowDepositCommand.java b/java/google/registry/tools/GenerateEscrowDepositCommand.java index bf26cb727..c9955b79e 100644 --- a/java/google/registry/tools/GenerateEscrowDepositCommand.java +++ b/java/google/registry/tools/GenerateEscrowDepositCommand.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.Registries.assertTldExists; import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; import static org.joda.time.DateTimeZone.UTC; @@ -25,35 +25,36 @@ import com.google.common.base.Predicates; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResourceUtils; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.EppResourceIndexBucket; -import com.google.domain.registry.model.rde.RdeMode; -import com.google.domain.registry.model.rde.RdeNamingUtils; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.rde.DepositFragment; -import com.google.domain.registry.rde.RdeCounter; -import com.google.domain.registry.rde.RdeMarshaller; -import com.google.domain.registry.rde.RdeResourceType; -import com.google.domain.registry.rde.RdeUtil; -import com.google.domain.registry.tldconfig.idn.IdnTableEnum; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.DateTimeParameter; -import com.google.domain.registry.tools.params.PathParameter; -import com.google.domain.registry.xjc.rdeheader.XjcRdeHeader; -import com.google.domain.registry.xjc.rdeheader.XjcRdeHeaderElement; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.googlecode.objectify.Key; import com.googlecode.objectify.Result; +import google.registry.config.ConfigModule.Config; +import google.registry.model.EppResource; +import google.registry.model.EppResourceUtils; +import google.registry.model.ImmutableObject; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainResource; +import google.registry.model.host.HostResource; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.EppResourceIndexBucket; +import google.registry.model.rde.RdeMode; +import google.registry.model.rde.RdeNamingUtils; +import google.registry.model.registrar.Registrar; +import google.registry.rde.DepositFragment; +import google.registry.rde.RdeCounter; +import google.registry.rde.RdeMarshaller; +import google.registry.rde.RdeResourceType; +import google.registry.rde.RdeUtil; +import google.registry.tldconfig.idn.IdnTableEnum; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.DateTimeParameter; +import google.registry.tools.params.PathParameter; +import google.registry.xjc.rdeheader.XjcRdeHeader; +import google.registry.xjc.rdeheader.XjcRdeHeaderElement; + import org.joda.time.DateTime; import java.io.OutputStream; diff --git a/java/google/registry/tools/GenerateLordnCommand.java b/java/google/registry/tools/GenerateLordnCommand.java index f7b696a14..059287a23 100644 --- a/java/google/registry/tools/GenerateLordnCommand.java +++ b/java/google/registry/tools/GenerateLordnCommand.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.tmch.LordnTask; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.PathParameter; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.domain.DomainResource; +import google.registry.tmch.LordnTask; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.PathParameter; + import org.joda.time.DateTime; import java.io.IOException; diff --git a/java/google/registry/tools/GenerateZoneFilesCommand.java b/java/google/registry/tools/GenerateZoneFilesCommand.java index 675c04c84..eea076806 100644 --- a/java/google/registry/tools/GenerateZoneFilesCommand.java +++ b/java/google/registry/tools/GenerateZoneFilesCommand.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; +import static google.registry.model.registry.Registries.assertTldExists; import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.Duration.standardMinutes; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.tools.params.DateTimeParameter; -import com.google.domain.registry.tools.server.GenerateZoneFilesAction; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.params.DateTimeParameter; +import google.registry.tools.server.GenerateZoneFilesAction; + import org.joda.time.DateTime; import java.io.IOException; diff --git a/java/google/registry/tools/GetApplicationCommand.java b/java/google/registry/tools/GetApplicationCommand.java index 7e2d96daf..e068fa236 100644 --- a/java/google/registry/tools/GetApplicationCommand.java +++ b/java/google/registry/tools/GetApplicationCommand.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.tools.Command.GtechCommand; +package google.registry.tools; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.domain.DomainApplication; +import google.registry.tools.Command.GtechCommand; + import java.util.List; /** Command to show a domain application. */ diff --git a/java/google/registry/tools/GetApplicationIdsCommand.java b/java/google/registry/tools/GetApplicationIdsCommand.java index 7ef2b709a..e38eb568c 100644 --- a/java/google/registry/tools/GetApplicationIdsCommand.java +++ b/java/google/registry/tools/GetApplicationIdsCommand.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; -import static com.google.domain.registry.model.registry.Registries.findTldForNameOrThrow; +import static google.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName; +import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.model.registry.Registries.findTldForNameOrThrow; import com.google.common.collect.ImmutableList; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.domain.DomainApplication; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; + import java.util.List; /** Command to generate a list of all applications for a given domain name(s). */ diff --git a/java/google/registry/tools/GetAppliedLabelsCommand.java b/java/google/registry/tools/GetAppliedLabelsCommand.java index 93bbe38a8..168772cc3 100644 --- a/java/google/registry/tools/GetAppliedLabelsCommand.java +++ b/java/google/registry/tools/GetAppliedLabelsCommand.java @@ -12,26 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.model.domain.launch.ApplicationStatus.REJECTED; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; -import static com.google.domain.registry.util.DateTimeUtils.isAtOrAfter; +import static google.registry.model.domain.launch.ApplicationStatus.REJECTED; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.util.DateTimeUtils.isAtOrAfter; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.launch.ApplicationStatus; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.PathParameter; -import com.google.domain.registry.util.Idn; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.beust.jcommander.internal.Sets; import com.googlecode.objectify.Work; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.launch.ApplicationStatus; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.PathParameter; +import google.registry.util.Idn; + import org.joda.time.DateTime; import java.nio.file.Files; diff --git a/java/google/registry/tools/GetClaimsListCommand.java b/java/google/registry/tools/GetClaimsListCommand.java index 13dd10559..554252691 100644 --- a/java/google/registry/tools/GetClaimsListCommand.java +++ b/java/google/registry/tools/GetClaimsListCommand.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Joiner; import com.google.common.io.Files; -import com.google.domain.registry.model.tmch.ClaimsListShard; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.PathParameter; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.tmch.ClaimsListShard; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.PathParameter; + import java.nio.file.Path; import java.nio.file.Paths; diff --git a/java/google/registry/tools/GetContactCommand.java b/java/google/registry/tools/GetContactCommand.java index aabd09601..659043006 100644 --- a/java/google/registry/tools/GetContactCommand.java +++ b/java/google/registry/tools/GetContactCommand.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.tools.Command.GtechCommand; +package google.registry.tools; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.contact.ContactResource; +import google.registry.tools.Command.GtechCommand; + import java.util.List; /** Command to show one or more contacts. */ diff --git a/java/google/registry/tools/GetDomainCommand.java b/java/google/registry/tools/GetDomainCommand.java index c910855df..8e4668192 100644 --- a/java/google/registry/tools/GetDomainCommand.java +++ b/java/google/registry/tools/GetDomainCommand.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.tools.Command.GtechCommand; +package google.registry.tools; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.domain.DomainResource; +import google.registry.tools.Command.GtechCommand; + import java.util.List; /** Command to show a domain resource. */ diff --git a/java/google/registry/tools/GetEppResourceCommand.java b/java/google/registry/tools/GetEppResourceCommand.java index 0e107c672..21f482aca 100644 --- a/java/google/registry/tools/GetEppResourceCommand.java +++ b/java/google/registry/tools/GetEppResourceCommand.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.EppResourceUtils.loadByUniqueId; import static org.joda.time.DateTimeZone.UTC; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.googlecode.objectify.Key; +import google.registry.model.EppResource; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.util.TypeUtils.TypeInstantiator; + import org.joda.time.DateTime; /** diff --git a/java/google/registry/tools/GetHistoryEntriesCommand.java b/java/google/registry/tools/GetHistoryEntriesCommand.java index 66bec2ba7..d61ffa9c6 100644 --- a/java/google/registry/tools/GetHistoryEntriesCommand.java +++ b/java/google/registry/tools/GetHistoryEntriesCommand.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; - -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.xml.XmlTransformer; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.reporting.HistoryEntry; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.xml.XmlTransformer; + import org.joda.time.DateTime; /** Command to show history entries. */ diff --git a/java/google/registry/tools/GetHostCommand.java b/java/google/registry/tools/GetHostCommand.java index eb173e217..25033c160 100644 --- a/java/google/registry/tools/GetHostCommand.java +++ b/java/google/registry/tools/GetHostCommand.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.tools.Command.GtechCommand; +package google.registry.tools; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.host.HostResource; +import google.registry.tools.Command.GtechCommand; + import java.util.List; /** Command to show one or more host resources. */ diff --git a/java/google/registry/tools/GetRegistrarCommand.java b/java/google/registry/tools/GetRegistrarCommand.java index 2b4e7de46..5159cbfcb 100644 --- a/java/google/registry/tools/GetRegistrarCommand.java +++ b/java/google/registry/tools/GetRegistrarCommand.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkState; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; - import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.registrar.Registrar; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; + import java.util.List; /** Command to show a registrar record. */ diff --git a/java/google/registry/tools/GetResourceByKeyCommand.java b/java/google/registry/tools/GetResourceByKeyCommand.java index 8a512f3a4..796ef4b21 100644 --- a/java/google/registry/tools/GetResourceByKeyCommand.java +++ b/java/google/registry/tools/GetResourceByKeyCommand.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; - -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.tools.Command.RemoteApiCommand; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.googlecode.objectify.Key; +import google.registry.model.EppResource; +import google.registry.tools.Command.RemoteApiCommand; + import java.util.List; /** diff --git a/java/google/registry/tools/GetSchemaCommand.java b/java/google/registry/tools/GetSchemaCommand.java index 351760d60..927cd6a56 100644 --- a/java/google/registry/tools/GetSchemaCommand.java +++ b/java/google/registry/tools/GetSchemaCommand.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.model.SchemaVersion; -import com.google.domain.registry.tools.Command.GtechCommand; +package google.registry.tools; import com.beust.jcommander.Parameters; +import google.registry.model.SchemaVersion; +import google.registry.tools.Command.GtechCommand; + /** Generates the schema file used for model versioning. */ @Parameters(commandDescription = "Generate a model schema file") final class GetSchemaCommand implements GtechCommand { diff --git a/java/google/registry/tools/GetSchemaTreeCommand.java b/java/google/registry/tools/GetSchemaTreeCommand.java index 67b976886..75b52a58a 100644 --- a/java/google/registry/tools/GetSchemaTreeCommand.java +++ b/java/google/registry/tools/GetSchemaTreeCommand.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.collect.Ordering.arbitrary; -import static com.google.domain.registry.model.EntityClasses.ALL_CLASSES; +import static google.registry.model.EntityClasses.ALL_CLASSES; import static java.lang.ClassLoader.getSystemClassLoader; import static java.lang.reflect.Modifier.isAbstract; @@ -24,16 +24,17 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.Ordering; import com.google.common.collect.TreeMultimap; -import com.google.domain.registry.model.BackupGroupRoot; -import com.google.domain.registry.model.annotations.NotBackedUp; -import com.google.domain.registry.model.annotations.VirtualEntity; -import com.google.domain.registry.tools.Command.GtechCommand; import com.beust.jcommander.Parameters; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.EntitySubclass; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.BackupGroupRoot; +import google.registry.model.annotations.NotBackedUp; +import google.registry.model.annotations.VirtualEntity; +import google.registry.tools.Command.GtechCommand; + import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; diff --git a/java/google/registry/tools/GetTldCommand.java b/java/google/registry/tools/GetTldCommand.java index 5a7d150d3..f6274232a 100644 --- a/java/google/registry/tools/GetTldCommand.java +++ b/java/google/registry/tools/GetTldCommand.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; - -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; +import static google.registry.model.registry.Registries.assertTldExists; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.registry.Registry; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; + import java.util.List; /** Command to show a TLD record. */ diff --git a/java/google/registry/tools/GhostrydeCommand.java b/java/google/registry/tools/GhostrydeCommand.java index ca41f4d96..a8a085f0c 100644 --- a/java/google/registry/tools/GhostrydeCommand.java +++ b/java/google/registry/tools/GhostrydeCommand.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; import static org.joda.time.DateTimeZone.UTC; import com.google.common.io.ByteStreams; -import com.google.domain.registry.keyring.api.KeyModule.Key; -import com.google.domain.registry.rde.Ghostryde; -import com.google.domain.registry.tools.params.PathParameter; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.keyring.api.KeyModule.Key; +import google.registry.rde.Ghostryde; +import google.registry.tools.params.PathParameter; + import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; diff --git a/java/google/registry/tools/GtechTool.java b/java/google/registry/tools/GtechTool.java index ead5b7797..4201500f6 100644 --- a/java/google/registry/tools/GtechTool.java +++ b/java/google/registry/tools/GtechTool.java @@ -12,11 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; -import com.google.domain.registry.tools.Command.GtechCommand; + +import google.registry.tools.Command.GtechCommand; /** Command line interface with a subset of commands that are safe for tech support to run. */ public final class GtechTool { diff --git a/java/google/registry/tools/HashCertificateCommand.java b/java/google/registry/tools/HashCertificateCommand.java index 598bcc3d3..21d1b6123 100644 --- a/java/google/registry/tools/HashCertificateCommand.java +++ b/java/google/registry/tools/HashCertificateCommand.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.util.X509Utils.getCertificateHash; -import static com.google.domain.registry.util.X509Utils.loadCertificate; +import static google.registry.util.X509Utils.getCertificateHash; +import static google.registry.util.X509Utils.loadCertificate; import com.google.common.base.Joiner; -import com.google.domain.registry.tools.Command.GtechCommand; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.Command.GtechCommand; + import java.io.IOException; import java.nio.file.Paths; import java.security.cert.CertificateParsingException; diff --git a/java/google/registry/tools/HelpCommand.java b/java/google/registry/tools/HelpCommand.java index 6fed0d3d7..99adae2ed 100644 --- a/java/google/registry/tools/HelpCommand.java +++ b/java/google/registry/tools/HelpCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.collect.Iterables.getOnlyElement; diff --git a/java/google/registry/tools/Injector.java b/java/google/registry/tools/Injector.java index 96bfad487..4dc8ecfa2 100644 --- a/java/google/registry/tools/Injector.java +++ b/java/google/registry/tools/Injector.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/java/google/registry/tools/ListCreditsCommand.java b/java/google/registry/tools/ListCreditsCommand.java index 4feb0e304..51977ce4c 100644 --- a/java/google/registry/tools/ListCreditsCommand.java +++ b/java/google/registry/tools/ListCreditsCommand.java @@ -12,23 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCreditBalance.BalanceMap; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.googlecode.objectify.Work; +import google.registry.model.billing.RegistrarCredit; +import google.registry.model.billing.RegistrarCreditBalance.BalanceMap; +import google.registry.model.registrar.Registrar; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; + import org.joda.money.Money; /** Command to list registrar credits and balances. */ diff --git a/java/google/registry/tools/ListCursorsCommand.java b/java/google/registry/tools/ListCursorsCommand.java index faac91566..46170615d 100644 --- a/java/google/registry/tools/ListCursorsCommand.java +++ b/java/google/registry/tools/ListCursorsCommand.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.base.Optional; import com.google.common.collect.Ordering; -import com.google.domain.registry.model.registry.Registries; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldType; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.tools.Command.RemoteApiCommand; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.registry.Registries; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldType; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; +import google.registry.tools.Command.RemoteApiCommand; + import org.joda.time.DateTime; import java.util.ArrayList; diff --git a/java/google/registry/tools/ListDomainsCommand.java b/java/google/registry/tools/ListDomainsCommand.java index 948c204c6..214ff6f96 100644 --- a/java/google/registry/tools/ListDomainsCommand.java +++ b/java/google/registry/tools/ListDomainsCommand.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.tools.server.ListDomainsAction; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; -/** Command to list all second-level domains associated with a TLD. */ +import google.registry.tools.server.ListDomainsAction; +/** Command to list all second-level domains associated with a TLD. */ @Parameters(separators = " =", commandDescription = "List domains associated with a TLD.") final class ListDomainsCommand extends ListObjectsCommand { diff --git a/java/google/registry/tools/ListHostsCommand.java b/java/google/registry/tools/ListHostsCommand.java index c15335862..8189bd00d 100644 --- a/java/google/registry/tools/ListHostsCommand.java +++ b/java/google/registry/tools/ListHostsCommand.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.tools.server.ListHostsAction; +package google.registry.tools; import com.beust.jcommander.Parameters; +import google.registry.tools.server.ListHostsAction; + /** Command to list all HostResource entities associated with a TLD. */ @Parameters(separators = " =", commandDescription = "List hosts associated with a TLD.") final class ListHostsCommand extends ListObjectsCommand { diff --git a/java/google/registry/tools/ListObjectsCommand.java b/java/google/registry/tools/ListObjectsCommand.java index b4500a046..2e4dc38ed 100644 --- a/java/google/registry/tools/ListObjectsCommand.java +++ b/java/google/registry/tools/ListObjectsCommand.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.security.JsonHttp.JSON_SAFETY_PREFIX; -import static com.google.domain.registry.tools.server.ListObjectsAction.FIELDS_PARAM; -import static com.google.domain.registry.tools.server.ListObjectsAction.FULL_FIELD_NAMES_PARAM; -import static com.google.domain.registry.tools.server.ListObjectsAction.PRINT_HEADER_ROW_PARAM; +import static google.registry.security.JsonHttp.JSON_SAFETY_PREFIX; +import static google.registry.tools.server.ListObjectsAction.FIELDS_PARAM; +import static google.registry.tools.server.ListObjectsAction.FULL_FIELD_NAMES_PARAM; +import static google.registry.tools.server.ListObjectsAction.PRINT_HEADER_ROW_PARAM; import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; -import com.google.domain.registry.tools.Command.RemoteApiCommand; import com.beust.jcommander.Parameter; +import google.registry.tools.Command.RemoteApiCommand; + import org.json.simple.JSONValue; import java.util.List; diff --git a/java/google/registry/tools/ListPremiumListsCommand.java b/java/google/registry/tools/ListPremiumListsCommand.java index 3f2343842..192d31793 100644 --- a/java/google/registry/tools/ListPremiumListsCommand.java +++ b/java/google/registry/tools/ListPremiumListsCommand.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.tools.server.ListPremiumListsAction; +package google.registry.tools; import com.beust.jcommander.Parameters; +import google.registry.tools.server.ListPremiumListsAction; + /** Command to list all premium lists. */ @Parameters(separators = " =", commandDescription = "List all premium lists.") final class ListPremiumListsCommand extends ListObjectsCommand { diff --git a/java/google/registry/tools/ListRegistrarsCommand.java b/java/google/registry/tools/ListRegistrarsCommand.java index 407dc78bb..48a9c75b4 100644 --- a/java/google/registry/tools/ListRegistrarsCommand.java +++ b/java/google/registry/tools/ListRegistrarsCommand.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.server.ListRegistrarsAction; +package google.registry.tools; import com.beust.jcommander.Parameters; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.server.ListRegistrarsAction; + /** Command to list all registrars. */ @Parameters(separators = " =", commandDescription = "List all registrars.") final class ListRegistrarsCommand extends ListObjectsCommand implements GtechCommand { diff --git a/java/google/registry/tools/ListReservedListsCommand.java b/java/google/registry/tools/ListReservedListsCommand.java index 2ec0ead57..2033b69c8 100644 --- a/java/google/registry/tools/ListReservedListsCommand.java +++ b/java/google/registry/tools/ListReservedListsCommand.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.tools.server.ListReservedListsAction; +package google.registry.tools; import com.beust.jcommander.Parameters; +import google.registry.tools.server.ListReservedListsAction; + /** Command to list all reserved lists. */ @Parameters(separators = " =", commandDescription = "List all reserved lists.") final class ListReservedListsCommand extends ListObjectsCommand { diff --git a/java/google/registry/tools/ListTldsCommand.java b/java/google/registry/tools/ListTldsCommand.java index 5ea7b6c5f..e90d1f00c 100644 --- a/java/google/registry/tools/ListTldsCommand.java +++ b/java/google/registry/tools/ListTldsCommand.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.server.ListTldsAction; +package google.registry.tools; import com.beust.jcommander.Parameters; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.server.ListTldsAction; + /** Command to list all top-level domains. */ @Parameters(separators = " =", commandDescription = "List all top-level domains.") final class ListTldsCommand extends ListObjectsCommand implements GtechCommand { diff --git a/java/google/registry/tools/LoadSnapshotCommand.java b/java/google/registry/tools/LoadSnapshotCommand.java index a34163337..97dc6cec3 100644 --- a/java/google/registry/tools/LoadSnapshotCommand.java +++ b/java/google/registry/tools/LoadSnapshotCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Predicates.notNull; @@ -22,12 +22,13 @@ import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import com.google.domain.registry.bigquery.BigqueryUtils.SourceFormat; -import com.google.domain.registry.export.ExportConstants; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.bigquery.BigqueryUtils.SourceFormat; +import google.registry.export.ExportConstants; + import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/java/google/registry/tools/LoggingParameters.java b/java/google/registry/tools/LoggingParameters.java index 75b8f25e5..9be04a156 100644 --- a/java/google/registry/tools/LoggingParameters.java +++ b/java/google/registry/tools/LoggingParameters.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.util.ResourceUtils.readResourceBytes; +import static google.registry.util.ResourceUtils.readResourceBytes; import com.google.common.base.Joiner; import com.google.common.io.ByteSource; import com.google.common.io.Files; -import com.google.domain.registry.tools.params.PathParameter; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.params.PathParameter; + import java.io.IOException; import java.io.InputStream; import java.nio.file.Path; diff --git a/java/google/registry/tools/MakeBillingTablesCommand.java b/java/google/registry/tools/MakeBillingTablesCommand.java index 8211f5c83..55d26a4ec 100644 --- a/java/google/registry/tools/MakeBillingTablesCommand.java +++ b/java/google/registry/tools/MakeBillingTablesCommand.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.tools.BigqueryCommandUtilities.handleTableCreation; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.tools.BigqueryCommandUtilities.handleTableCreation; +import static google.registry.util.ResourceUtils.readResourceUtf8; import com.google.common.base.Joiner; import com.google.common.base.Optional; -import com.google.domain.registry.bigquery.BigqueryUtils.TableType; -import com.google.domain.registry.tools.BigqueryCommandUtilities.TableCreationException; -import com.google.domain.registry.util.SqlTemplate; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.bigquery.BigqueryUtils.TableType; +import google.registry.tools.BigqueryCommandUtilities.TableCreationException; +import google.registry.util.SqlTemplate; + import java.util.List; /** Command to make synthetic billing tables and views in Bigquery. */ diff --git a/java/google/registry/tools/MutatingCommand.java b/java/google/registry/tools/MutatingCommand.java index c9acae443..8c8790826 100644 --- a/java/google/registry/tools/MutatingCommand.java +++ b/java/google/registry/tools/MutatingCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.CaseFormat.UPPER_CAMEL; import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; @@ -21,9 +21,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Strings.emptyToNull; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DatastoreServiceUtils.getNameOrId; -import static com.google.domain.registry.util.DiffUtils.prettyPrintDeepDiff; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DatastoreServiceUtils.getNameOrId; +import static google.registry.util.DiffUtils.prettyPrintDeepDiff; import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; @@ -32,12 +32,13 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.tools.Command.RemoteApiCommand; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; +import google.registry.model.ImmutableObject; +import google.registry.tools.Command.RemoteApiCommand; + import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashMap; diff --git a/java/google/registry/tools/MutatingEppToolCommand.java b/java/google/registry/tools/MutatingEppToolCommand.java index 8652bc24e..0d56709c5 100644 --- a/java/google/registry/tools/MutatingEppToolCommand.java +++ b/java/google/registry/tools/MutatingEppToolCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.beust.jcommander.Parameter; diff --git a/java/google/registry/tools/PasswordGenerator.java b/java/google/registry/tools/PasswordGenerator.java index 18f5551a4..099496e4b 100644 --- a/java/google/registry/tools/PasswordGenerator.java +++ b/java/google/registry/tools/PasswordGenerator.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; /** Password generator interface. */ interface PasswordGenerator { diff --git a/java/google/registry/tools/PendingEscrowCommand.java b/java/google/registry/tools/PendingEscrowCommand.java index 00fd5fbf5..c8646e685 100644 --- a/java/google/registry/tools/PendingEscrowCommand.java +++ b/java/google/registry/tools/PendingEscrowCommand.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.base.Functions; import com.google.common.base.Joiner; import com.google.common.collect.ComparisonChain; import com.google.common.collect.FluentIterable; import com.google.common.collect.Ordering; -import com.google.domain.registry.rde.PendingDeposit; -import com.google.domain.registry.rde.PendingDepositChecker; -import com.google.domain.registry.tools.Command.RemoteApiCommand; import com.beust.jcommander.Parameters; +import google.registry.rde.PendingDeposit; +import google.registry.rde.PendingDepositChecker; +import google.registry.tools.Command.RemoteApiCommand; + import javax.inject.Inject; /** Command to show what escrow deposits are pending generation on the server. */ diff --git a/java/google/registry/tools/PublishDetailReportCommand.java b/java/google/registry/tools/PublishDetailReportCommand.java index d895719c8..ab3969044 100644 --- a/java/google/registry/tools/PublishDetailReportCommand.java +++ b/java/google/registry/tools/PublishDetailReportCommand.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.export.PublishDetailReportAction; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.tools.Command.GtechCommand; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.export.PublishDetailReportAction; +import google.registry.model.registrar.Registrar; +import google.registry.tools.Command.GtechCommand; + import java.util.Map; /** diff --git a/java/google/registry/tools/RandomPasswordGenerator.java b/java/google/registry/tools/RandomPasswordGenerator.java index aad7490e4..a5ed3e9d2 100644 --- a/java/google/registry/tools/RandomPasswordGenerator.java +++ b/java/google/registry/tools/RandomPasswordGenerator.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; diff --git a/java/google/registry/tools/RegistrarActivityReportCommand.java b/java/google/registry/tools/RegistrarActivityReportCommand.java index d8e4a2c27..9f3d7d286 100644 --- a/java/google/registry/tools/RegistrarActivityReportCommand.java +++ b/java/google/registry/tools/RegistrarActivityReportCommand.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.util.ResourceUtils.readResourceUtf8; import com.google.api.services.bigquery.model.Job; import com.google.api.services.bigquery.model.JobConfiguration; import com.google.api.services.bigquery.model.JobConfigurationExtract; import com.google.api.services.bigquery.model.JobConfigurationQuery; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.bigquery.BigqueryConnection; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.util.SqlTemplate; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.beust.jcommander.ParametersDelegate; +import google.registry.bigquery.BigqueryConnection; +import google.registry.tools.Command.GtechCommand; +import google.registry.util.SqlTemplate; + import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; diff --git a/java/google/registry/tools/RegistrarContactCommand.java b/java/google/registry/tools/RegistrarContactCommand.java index 34b7823e4..26b762d3c 100644 --- a/java/google/registry/tools/RegistrarContactCommand.java +++ b/java/google/registry/tools/RegistrarContactCommand.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Sets.newHashSet; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; +import static google.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Enums; @@ -28,17 +28,18 @@ import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.common.GaeUserIdConverter; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.model.registrar.RegistrarContact.Builder; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.params.OptionalPhoneNumberParameter; -import com.google.domain.registry.tools.params.PathParameter; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.common.GaeUserIdConverter; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.model.registrar.RegistrarContact.Builder; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.params.OptionalPhoneNumberParameter; +import google.registry.tools.params.PathParameter; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/java/google/registry/tools/RegistryCli.java b/java/google/registry/tools/RegistryCli.java index 4ea8c89d2..7d7c8e63a 100644 --- a/java/google/registry/tools/RegistryCli.java +++ b/java/google/registry/tools/RegistryCli.java @@ -12,17 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.tools.Injector.injectReflectively; +import static google.registry.tools.Injector.injectReflectively; import com.google.appengine.tools.remoteapi.RemoteApiInstaller; import com.google.appengine.tools.remoteapi.RemoteApiOptions; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.ofy.ObjectifyService; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.ParameterFactory; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; @@ -30,6 +27,10 @@ import com.beust.jcommander.ParameterException; import com.beust.jcommander.Parameters; import com.beust.jcommander.ParametersDelegate; +import google.registry.model.ofy.ObjectifyService; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.ParameterFactory; + import org.bouncycastle.jce.provider.BouncyCastleProvider; import java.security.Security; diff --git a/java/google/registry/tools/RegistryTool.java b/java/google/registry/tools/RegistryTool.java index f93de494c..23080dc6c 100644 --- a/java/google/registry/tools/RegistryTool.java +++ b/java/google/registry/tools/RegistryTool.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; -import com.google.domain.registry.tools.javascrap.LoadAndResaveCommand; + +import google.registry.tools.javascrap.LoadAndResaveCommand; /** Container class to create and run remote commands against a datastore instance. */ public final class RegistryTool { diff --git a/java/google/registry/tools/RegistryToolComponent.java b/java/google/registry/tools/RegistryToolComponent.java index 4ba44ae19..a6177df5d 100644 --- a/java/google/registry/tools/RegistryToolComponent.java +++ b/java/google/registry/tools/RegistryToolComponent.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.config.ConfigModule; -import com.google.domain.registry.keyring.api.KeyModule; -import com.google.domain.registry.keyring.api.VoidKeyringModule; -import com.google.domain.registry.request.Modules.DatastoreServiceModule; -import com.google.domain.registry.request.Modules.Jackson2Module; -import com.google.domain.registry.request.Modules.URLFetchServiceModule; -import com.google.domain.registry.util.SystemClock.SystemClockModule; +package google.registry.tools; import dagger.Component; +import google.registry.config.ConfigModule; +import google.registry.keyring.api.KeyModule; +import google.registry.keyring.api.VoidKeyringModule; +import google.registry.request.Modules.DatastoreServiceModule; +import google.registry.request.Modules.Jackson2Module; +import google.registry.request.Modules.URLFetchServiceModule; +import google.registry.util.SystemClock.SystemClockModule; + /** * Dagger component for Registry Tool. * diff --git a/java/google/registry/tools/RegistryToolEnvironment.java b/java/google/registry/tools/RegistryToolEnvironment.java index b98b817ad..ac519e32f 100644 --- a/java/google/registry/tools/RegistryToolEnvironment.java +++ b/java/google/registry/tools/RegistryToolEnvironment.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.config.RegistryEnvironment; + +import google.registry.config.RegistryEnvironment; /** Enum of production environments, used for the {@code --environment} flag. */ enum RegistryToolEnvironment { @@ -31,7 +32,7 @@ enum RegistryToolEnvironment { LOCALHOST(RegistryEnvironment.LOCAL), UNITTEST(RegistryEnvironment.UNITTEST), PDT(RegistryEnvironment.PRODUCTION, ImmutableMap.of( - "com.google.domain.registry.rde.key.receiver", + "google.registry.rde.key.receiver", "pdt-escrow-test@icann.org")); private static final ImmutableList FLAGS = ImmutableList.of("-e", "--environment"); diff --git a/java/google/registry/tools/RegistryToolModule.java b/java/google/registry/tools/RegistryToolModule.java index 88378fc37..b1a1e12a3 100644 --- a/java/google/registry/tools/RegistryToolModule.java +++ b/java/google/registry/tools/RegistryToolModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import dagger.Module; import dagger.Provides; diff --git a/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java b/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java index ed07cde0e..ed10f8b2e 100644 --- a/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java +++ b/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java @@ -12,22 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.collect.Iterables.concat; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; - -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.tools.Command.RemoteApiCommand; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.beust.jcommander.Parameters; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; +import google.registry.model.ImmutableObject; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.model.registry.Registry; +import google.registry.tools.Command.RemoteApiCommand; + /** * Command to re-save all environment entities to ensure that they have valid commit logs. * diff --git a/java/google/registry/tools/SendEscrowReportToIcannCommand.java b/java/google/registry/tools/SendEscrowReportToIcannCommand.java index 49b561654..83172fc24 100644 --- a/java/google/registry/tools/SendEscrowReportToIcannCommand.java +++ b/java/google/registry/tools/SendEscrowReportToIcannCommand.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.rde.RdeReporter; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.PathParameter; +package google.registry.tools; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.rde.RdeReporter; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.PathParameter; + import java.nio.file.Files; import java.nio.file.Path; import java.util.List; diff --git a/java/google/registry/tools/ServerSideCommand.java b/java/google/registry/tools/ServerSideCommand.java index c6216a32f..ea3b5f17e 100644 --- a/java/google/registry/tools/ServerSideCommand.java +++ b/java/google/registry/tools/ServerSideCommand.java @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.net.MediaType; -import com.google.domain.registry.tools.Command.RemoteApiCommand; + +import google.registry.tools.Command.RemoteApiCommand; import java.io.IOException; import java.util.Map; diff --git a/java/google/registry/tools/SetupOteCommand.java b/java/google/registry/tools/SetupOteCommand.java index 83fb9ce3c..3b4782e41 100644 --- a/java/google/registry/tools/SetupOteCommand.java +++ b/java/google/registry/tools/SetupOteCommand.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.tools.CommandUtilities.promptForYes; -import static com.google.domain.registry.util.X509Utils.loadCertificate; +import static google.registry.tools.CommandUtilities.promptForYes; +import static google.registry.util.X509Utils.loadCertificate; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.PathParameter; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.config.RegistryEnvironment; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry.TldState; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.PathParameter; + import org.joda.time.Duration; import java.nio.file.Path; diff --git a/java/google/registry/tools/UpdateApplicationStatusCommand.java b/java/google/registry/tools/UpdateApplicationStatusCommand.java index 818cc8f92..46da172aa 100644 --- a/java/google/registry/tools/UpdateApplicationStatusCommand.java +++ b/java/google/registry/tools/UpdateApplicationStatusCommand.java @@ -12,30 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.model.domain.launch.ApplicationStatus.ALLOCATED; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.domain.launch.ApplicationStatus.ALLOCATED; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.launch.ApplicationStatus; -import com.google.domain.registry.model.domain.launch.LaunchInfoResponseExtension; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.reporting.HistoryEntry; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.googlecode.objectify.VoidWork; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.launch.ApplicationStatus; +import google.registry.model.domain.launch.LaunchInfoResponseExtension; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; +import google.registry.model.poll.PollMessage; +import google.registry.model.registrar.Registrar; +import google.registry.model.reporting.HistoryEntry; + import org.joda.time.DateTime; import java.util.List; diff --git a/java/google/registry/tools/UpdateClaimsNoticeCommand.java b/java/google/registry/tools/UpdateClaimsNoticeCommand.java index a608bf3d0..7ae1d85c8 100644 --- a/java/google/registry/tools/UpdateClaimsNoticeCommand.java +++ b/java/google/registry/tools/UpdateClaimsNoticeCommand.java @@ -12,23 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.launch.LaunchNotice; -import com.google.domain.registry.model.domain.launch.LaunchNotice.InvalidChecksumException; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.tools.Command.RemoteApiCommand; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.googlecode.objectify.VoidWork; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.launch.LaunchNotice; +import google.registry.model.domain.launch.LaunchNotice.InvalidChecksumException; +import google.registry.model.reporting.HistoryEntry; +import google.registry.tools.Command.RemoteApiCommand; + import org.joda.time.DateTime; /** Command to update the claims notice on a domain application. */ diff --git a/java/google/registry/tools/UpdateCreditsCommand.java b/java/google/registry/tools/UpdateCreditsCommand.java index 2414d7d97..b96e8ee34 100644 --- a/java/google/registry/tools/UpdateCreditsCommand.java +++ b/java/google/registry/tools/UpdateCreditsCommand.java @@ -12,25 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static com.google.domain.registry.bigquery.BigqueryUtils.fromBigqueryTimestampString; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.bigquery.BigqueryUtils.fromBigqueryTimestampString; +import static google.registry.model.ofy.ObjectifyService.ofy; import static org.joda.time.DateTimeZone.UTC; import com.google.common.base.Optional; import com.google.common.base.Splitter; -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCreditBalance; -import com.google.domain.registry.model.billing.RegistrarCreditBalance.BalanceMap; -import com.google.domain.registry.model.registrar.Registrar; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.billing.RegistrarCredit; +import google.registry.model.billing.RegistrarCreditBalance; +import google.registry.model.billing.RegistrarCreditBalance.BalanceMap; +import google.registry.model.registrar.Registrar; + import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/tools/UpdateCursorsCommand.java b/java/google/registry/tools/UpdateCursorsCommand.java index 902e92463..105c3296b 100644 --- a/java/google/registry/tools/UpdateCursorsCommand.java +++ b/java/google/registry/tools/UpdateCursorsCommand.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.base.Optional; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.tools.params.DateTimeParameter; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; +import google.registry.tools.params.DateTimeParameter; + import org.joda.time.DateTime; import java.util.List; diff --git a/java/google/registry/tools/UpdatePremiumListCommand.java b/java/google/registry/tools/UpdatePremiumListCommand.java index bc0e86084..d983fbe9a 100644 --- a/java/google/registry/tools/UpdatePremiumListCommand.java +++ b/java/google/registry/tools/UpdatePremiumListCommand.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; - -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.tools.server.UpdatePremiumListAction; +package google.registry.tools; import com.beust.jcommander.Parameters; +import google.registry.model.registry.label.PremiumList; +import google.registry.tools.server.UpdatePremiumListAction; + /** Command to safely update {@link PremiumList} in Datastore for a given TLD. */ @Parameters(separators = " =", commandDescription = "Update a PremiumList in Datastore.") class UpdatePremiumListCommand extends CreateOrUpdatePremiumListCommand { diff --git a/java/google/registry/tools/UpdateRegistrarCommand.java b/java/google/registry/tools/UpdateRegistrarCommand.java index dceed5564..01a6af94d 100644 --- a/java/google/registry/tools/UpdateRegistrarCommand.java +++ b/java/google/registry/tools/UpdateRegistrarCommand.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.tools.Command.GtechCommand; - import com.beust.jcommander.Parameters; +import google.registry.model.registrar.Registrar; +import google.registry.tools.Command.GtechCommand; + /** Command to update a Registrar. */ @Parameters(separators = " =", commandDescription = "Update registrar account(s)") final class UpdateRegistrarCommand extends CreateOrUpdateRegistrarCommand diff --git a/java/google/registry/tools/UpdateReservedListCommand.java b/java/google/registry/tools/UpdateReservedListCommand.java index f07b5dab1..7fb312ec1 100644 --- a/java/google/registry/tools/UpdateReservedListCommand.java +++ b/java/google/registry/tools/UpdateReservedListCommand.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.util.ListNamingUtils.convertFilePathToName; +import static google.registry.util.ListNamingUtils.convertFilePathToName; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Optional; import com.google.common.base.Strings; -import com.google.domain.registry.model.registry.label.ReservedList; -import com.google.domain.registry.model.registry.label.ReservedList.Builder; -import com.google.domain.registry.util.SystemClock; import com.beust.jcommander.Parameters; +import google.registry.model.registry.label.ReservedList; +import google.registry.model.registry.label.ReservedList.Builder; +import google.registry.util.SystemClock; + import java.nio.file.Files; /** Command to safely update {@link ReservedList} on Datastore. */ diff --git a/java/google/registry/tools/UpdateSandboxTldCommand.java b/java/google/registry/tools/UpdateSandboxTldCommand.java index d166d362f..6de3c15fa 100644 --- a/java/google/registry/tools/UpdateSandboxTldCommand.java +++ b/java/google/registry/tools/UpdateSandboxTldCommand.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.tools.Command.GtechCommand; - import com.beust.jcommander.Parameters; +import google.registry.config.RegistryEnvironment; +import google.registry.tools.Command.GtechCommand; + /** Command to update a TLD in sandbox, separated out for Gtech use. */ @Parameters(separators = " =", commandDescription = "Update new sandbox TLD(s)") final class UpdateSandboxTldCommand extends UpdateTldCommand implements GtechCommand { diff --git a/java/google/registry/tools/UpdateServerLocksCommand.java b/java/google/registry/tools/UpdateServerLocksCommand.java index 65b9d4632..e980a0582 100644 --- a/java/google/registry/tools/UpdateServerLocksCommand.java +++ b/java/google/registry/tools/UpdateServerLocksCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; @@ -21,14 +21,15 @@ import static com.google.common.collect.Sets.intersection; import static com.google.common.collect.Sets.union; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.soy.UpdateServerLocksSoyInfo; import com.google.template.soy.data.SoyMapData; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.eppcommon.StatusValue; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.soy.UpdateServerLocksSoyInfo; + import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/java/google/registry/tools/UpdateSmdCommand.java b/java/google/registry/tools/UpdateSmdCommand.java index 5696b2529..ea5455b49 100644 --- a/java/google/registry/tools/UpdateSmdCommand.java +++ b/java/google/registry/tools/UpdateSmdCommand.java @@ -12,28 +12,29 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.flows.domain.DomainFlowUtils.verifyEncodedSignedMark; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.tmch.TmchData.readEncodedSignedMark; +import static google.registry.flows.domain.DomainFlowUtils.verifyEncodedSignedMark; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.tmch.TmchData.readEncodedSignedMark; import static java.nio.charset.StandardCharsets.US_ASCII; import com.google.common.collect.ImmutableList; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.smd.EncodedSignedMark; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.PathParameter; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.googlecode.objectify.VoidWork; +import google.registry.flows.EppException; +import google.registry.model.domain.DomainApplication; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.smd.EncodedSignedMark; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.PathParameter; + import org.joda.time.DateTime; import java.nio.file.Files; diff --git a/java/google/registry/tools/UpdateTldCommand.java b/java/google/registry/tools/UpdateTldCommand.java index 9826d97ab..a26549fab 100644 --- a/java/google/registry/tools/UpdateTldCommand.java +++ b/java/google/registry/tools/UpdateTldCommand.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registry.Registry; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.registry.Registry; + import java.util.List; import javax.annotation.Nullable; diff --git a/java/google/registry/tools/UploadClaimsListCommand.java b/java/google/registry/tools/UploadClaimsListCommand.java index 5a5d681e9..7cbaadeed 100644 --- a/java/google/registry/tools/UploadClaimsListCommand.java +++ b/java/google/registry/tools/UploadClaimsListCommand.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static java.nio.charset.StandardCharsets.US_ASCII; import com.google.common.base.Joiner; import com.google.common.io.Files; -import com.google.domain.registry.model.tmch.ClaimsListShard; -import com.google.domain.registry.tmch.ClaimsListParser; -import com.google.domain.registry.tools.Command.RemoteApiCommand; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.tmch.ClaimsListShard; +import google.registry.tmch.ClaimsListParser; +import google.registry.tools.Command.RemoteApiCommand; + import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/java/google/registry/tools/UserIdProvider.java b/java/google/registry/tools/UserIdProvider.java index 96b0cc903..234c0d1ba 100644 --- a/java/google/registry/tools/UserIdProvider.java +++ b/java/google/registry/tools/UserIdProvider.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; /** Static methods to get the current user id. */ diff --git a/java/google/registry/tools/ValidateEscrowDepositCommand.java b/java/google/registry/tools/ValidateEscrowDepositCommand.java index 24ca06d28..a796b5f22 100644 --- a/java/google/registry/tools/ValidateEscrowDepositCommand.java +++ b/java/google/registry/tools/ValidateEscrowDepositCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkNotNull; @@ -21,22 +21,23 @@ import static com.google.common.collect.Sets.difference; import com.google.common.base.Joiner; import com.google.common.collect.Ordering; -import com.google.domain.registry.keyring.api.Keyring; -import com.google.domain.registry.rde.Ghostryde; -import com.google.domain.registry.tools.params.PathParameter; -import com.google.domain.registry.xjc.XjcXmlTransformer; -import com.google.domain.registry.xjc.domain.XjcDomainContactType; -import com.google.domain.registry.xjc.domain.XjcDomainHostAttrType; -import com.google.domain.registry.xjc.rde.XjcRdeDeposit; -import com.google.domain.registry.xjc.rdecontact.XjcRdeContact; -import com.google.domain.registry.xjc.rdedomain.XjcRdeDomain; -import com.google.domain.registry.xjc.rdehost.XjcRdeHost; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrar; -import com.google.domain.registry.xml.XmlException; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.keyring.api.Keyring; +import google.registry.rde.Ghostryde; +import google.registry.tools.params.PathParameter; +import google.registry.xjc.XjcXmlTransformer; +import google.registry.xjc.domain.XjcDomainContactType; +import google.registry.xjc.domain.XjcDomainHostAttrType; +import google.registry.xjc.rde.XjcRdeDeposit; +import google.registry.xjc.rdecontact.XjcRdeContact; +import google.registry.xjc.rdedomain.XjcRdeDomain; +import google.registry.xjc.rdehost.XjcRdeHost; +import google.registry.xjc.rderegistrar.XjcRdeRegistrar; +import google.registry.xml.XmlException; + import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; diff --git a/java/google/registry/tools/ValidateLoginCredentialsCommand.java b/java/google/registry/tools/ValidateLoginCredentialsCommand.java index b54a97f86..d248f0521 100644 --- a/java/google/registry/tools/ValidateLoginCredentialsCommand.java +++ b/java/google/registry/tools/ValidateLoginCredentialsCommand.java @@ -12,38 +12,39 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.io.Resources.getResource; -import static com.google.domain.registry.flows.EppXmlTransformer.unmarshal; -import static com.google.domain.registry.tools.CommandUtilities.runFlow; -import static com.google.domain.registry.util.X509Utils.getCertificateHash; -import static com.google.domain.registry.util.X509Utils.loadCertificate; +import static google.registry.flows.EppXmlTransformer.unmarshal; +import static google.registry.tools.CommandUtilities.runFlow; +import static google.registry.util.X509Utils.getCertificateHash; +import static google.registry.util.X509Utils.loadCertificate; import static java.nio.charset.StandardCharsets.US_ASCII; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.net.InetAddresses; -import com.google.domain.registry.flows.Flow; -import com.google.domain.registry.flows.FlowRegistry; -import com.google.domain.registry.flows.FlowRunner; -import com.google.domain.registry.flows.FlowRunner.CommitMode; -import com.google.domain.registry.flows.FlowRunner.UserPrivileges; -import com.google.domain.registry.flows.SessionMetadata; -import com.google.domain.registry.flows.TlsCredentials; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.eppinput.EppInput; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.tools.params.PathParameter; -import com.google.domain.registry.tools.soy.LoginSoyInfo; import com.google.template.soy.SoyFileSet; import com.google.template.soy.data.SoyMapData; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.flows.Flow; +import google.registry.flows.FlowRegistry; +import google.registry.flows.FlowRunner; +import google.registry.flows.FlowRunner.CommitMode; +import google.registry.flows.FlowRunner.UserPrivileges; +import google.registry.flows.SessionMetadata; +import google.registry.flows.TlsCredentials; +import google.registry.model.eppcommon.Trid; +import google.registry.model.eppinput.EppInput; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.tools.params.PathParameter; +import google.registry.tools.soy.LoginSoyInfo; + import java.nio.file.Files; import java.nio.file.Path; import java.util.HashMap; diff --git a/java/google/registry/tools/VerifyOteCommand.java b/java/google/registry/tools/VerifyOteCommand.java index 48742c295..bb10946bb 100644 --- a/java/google/registry/tools/VerifyOteCommand.java +++ b/java/google/registry/tools/VerifyOteCommand.java @@ -12,25 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Predicates.notNull; import static com.google.common.base.Verify.verifyNotNull; -import static com.google.domain.registry.model.registrar.Registrar.loadByClientId; +import static google.registry.model.registrar.Registrar.loadByClientId; import com.google.common.base.Function; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.server.VerifyOteAction; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.config.RegistryEnvironment; +import google.registry.model.registrar.Registrar; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.server.VerifyOteAction; + import java.io.IOException; import java.util.ArrayList; import java.util.Collection; diff --git a/java/google/registry/tools/WhoisQueryCommand.java b/java/google/registry/tools/WhoisQueryCommand.java index e56704871..919556d27 100644 --- a/java/google/registry/tools/WhoisQueryCommand.java +++ b/java/google/registry/tools/WhoisQueryCommand.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.base.Joiner; -import com.google.domain.registry.tools.Command.GtechCommand; -import com.google.domain.registry.tools.Command.RemoteApiCommand; -import com.google.domain.registry.whois.Whois; -import com.google.domain.registry.whois.WhoisException; -import com.google.domain.registry.whois.WhoisResponse; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.tools.Command.GtechCommand; +import google.registry.tools.Command.RemoteApiCommand; +import google.registry.whois.Whois; +import google.registry.whois.WhoisException; +import google.registry.whois.WhoisResponse; + import java.util.List; import javax.inject.Inject; diff --git a/java/google/registry/tools/javascrap/LoadAndResaveCommand.java b/java/google/registry/tools/javascrap/LoadAndResaveCommand.java index f7f119c3f..33c496910 100644 --- a/java/google/registry/tools/javascrap/LoadAndResaveCommand.java +++ b/java/google/registry/tools/javascrap/LoadAndResaveCommand.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.javascrap; +package google.registry.tools.javascrap; import static com.google.common.collect.Maps.uniqueIndex; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.ofy.ObjectifyService.ofy; import static org.joda.time.DateTimeZone.UTC; import com.google.common.base.Function; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.tools.MutatingCommand; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.model.EppResource; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainResource; +import google.registry.model.host.HostResource; +import google.registry.tools.MutatingCommand; + import org.joda.time.DateTime; import java.util.Arrays; diff --git a/java/google/registry/tools/package-info.java b/java/google/registry/tools/package-info.java index 2ba1aea1d..bf24b52dd 100644 --- a/java/google/registry/tools/package-info.java +++ b/java/google/registry/tools/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.tools; +package google.registry.tools; diff --git a/java/google/registry/tools/params/BUILD b/java/google/registry/tools/params/BUILD index 09a044eba..a58eb28e2 100644 --- a/java/google/registry/tools/params/BUILD +++ b/java/google/registry/tools/params/BUILD @@ -1,23 +1,25 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "params", - visibility = ["//visibility:public"], srcs = glob(["*.java"]), + visibility = ["//visibility:public"], deps = [ "//java/com/google/common/annotations", "//java/com/google/common/base", "//java/com/google/common/collect", "//java/com/google/common/net", "//java/com/google/common/primitives", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/util", "//third_party/java/jcommander", "//third_party/java/joda_money", "//third_party/java/joda_time", "//third_party/java/jsr305_annotations", + "//java/google/registry/model", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/tools/params/DateTimeParameter.java b/java/google/registry/tools/params/DateTimeParameter.java index 001a78be4..dc5296283 100644 --- a/java/google/registry/tools/params/DateTimeParameter.java +++ b/java/google/registry/tools/params/DateTimeParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import static org.joda.time.DateTimeZone.UTC; diff --git a/java/google/registry/tools/params/DurationParameter.java b/java/google/registry/tools/params/DurationParameter.java index 20d16c5f7..f312743e9 100644 --- a/java/google/registry/tools/params/DurationParameter.java +++ b/java/google/registry/tools/params/DurationParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import org.joda.time.Duration; import org.joda.time.Period; diff --git a/java/google/registry/tools/params/EppResourceTypeParameter.java b/java/google/registry/tools/params/EppResourceTypeParameter.java index c351442a4..bae7f5359 100644 --- a/java/google/registry/tools/params/EppResourceTypeParameter.java +++ b/java/google/registry/tools/params/EppResourceTypeParameter.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.host.HostResource; +import google.registry.model.EppResource; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainBase; +import google.registry.model.host.HostResource; /** Enum to make it easy for a command to accept a flag that specifies an EppResource subclass. */ public enum EppResourceTypeParameter { diff --git a/java/google/registry/tools/params/HostAndPortParameter.java b/java/google/registry/tools/params/HostAndPortParameter.java index 8180a89de..153e914e0 100644 --- a/java/google/registry/tools/params/HostAndPortParameter.java +++ b/java/google/registry/tools/params/HostAndPortParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import com.google.common.net.HostAndPort; diff --git a/java/google/registry/tools/params/InternetDomainNameParameter.java b/java/google/registry/tools/params/InternetDomainNameParameter.java index e4e18ec52..db7eed7cf 100644 --- a/java/google/registry/tools/params/InternetDomainNameParameter.java +++ b/java/google/registry/tools/params/InternetDomainNameParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import com.google.common.net.InternetDomainName; diff --git a/java/google/registry/tools/params/LocalDateParameter.java b/java/google/registry/tools/params/LocalDateParameter.java index 99b614123..8f8bfd20a 100644 --- a/java/google/registry/tools/params/LocalDateParameter.java +++ b/java/google/registry/tools/params/LocalDateParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import org.joda.time.LocalDate; import org.joda.time.format.ISODateTimeFormat; diff --git a/java/google/registry/tools/params/LoggingLevelParameter.java b/java/google/registry/tools/params/LoggingLevelParameter.java index 6c1f51885..81e072db2 100644 --- a/java/google/registry/tools/params/LoggingLevelParameter.java +++ b/java/google/registry/tools/params/LoggingLevelParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import java.util.logging.Level; diff --git a/java/google/registry/tools/params/LongParameter.java b/java/google/registry/tools/params/LongParameter.java index d30e36731..186a8fd93 100644 --- a/java/google/registry/tools/params/LongParameter.java +++ b/java/google/registry/tools/params/LongParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; /** Long CLI parameter converter/validator. */ public class LongParameter extends ParameterConverterValidator { diff --git a/java/google/registry/tools/params/MoneyParameter.java b/java/google/registry/tools/params/MoneyParameter.java index d75ef8fab..77b4eacef 100644 --- a/java/google/registry/tools/params/MoneyParameter.java +++ b/java/google/registry/tools/params/MoneyParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import com.google.common.base.Ascii; diff --git a/java/google/registry/tools/params/OptionalLongParameter.java b/java/google/registry/tools/params/OptionalLongParameter.java index 6b09fd8c9..f8347ce76 100644 --- a/java/google/registry/tools/params/OptionalLongParameter.java +++ b/java/google/registry/tools/params/OptionalLongParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; /** Optional wrapper for LongParameter. */ public final class OptionalLongParameter diff --git a/java/google/registry/tools/params/OptionalParameterConverterValidator.java b/java/google/registry/tools/params/OptionalParameterConverterValidator.java index 065acbfbc..fbe4057ce 100644 --- a/java/google/registry/tools/params/OptionalParameterConverterValidator.java +++ b/java/google/registry/tools/params/OptionalParameterConverterValidator.java @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import com.google.common.base.Optional; -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; + +import google.registry.util.TypeUtils.TypeInstantiator; /** * Class for parameters that can handle special string "null" or empty values to diff --git a/java/google/registry/tools/params/OptionalPhoneNumberParameter.java b/java/google/registry/tools/params/OptionalPhoneNumberParameter.java index dbc291400..3636fea92 100644 --- a/java/google/registry/tools/params/OptionalPhoneNumberParameter.java +++ b/java/google/registry/tools/params/OptionalPhoneNumberParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; /** Optional wrapper for PhoneNumberParameter. */ public final class OptionalPhoneNumberParameter diff --git a/java/google/registry/tools/params/OptionalStringParameter.java b/java/google/registry/tools/params/OptionalStringParameter.java index d33f63a31..c27b5d69a 100644 --- a/java/google/registry/tools/params/OptionalStringParameter.java +++ b/java/google/registry/tools/params/OptionalStringParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; /** Optional wrapper for StringParameter. */ public final class OptionalStringParameter diff --git a/java/google/registry/tools/params/ParameterConverterValidator.java b/java/google/registry/tools/params/ParameterConverterValidator.java index 90b3b0c96..78d296ea2 100644 --- a/java/google/registry/tools/params/ParameterConverterValidator.java +++ b/java/google/registry/tools/params/ParameterConverterValidator.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import com.beust.jcommander.IParameterValidator; import com.beust.jcommander.IStringConverter; diff --git a/java/google/registry/tools/params/ParameterFactory.java b/java/google/registry/tools/params/ParameterFactory.java index 5ad0a4b0e..020ce64db 100644 --- a/java/google/registry/tools/params/ParameterFactory.java +++ b/java/google/registry/tools/params/ParameterFactory.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import com.google.common.collect.ImmutableMap; import com.google.common.net.HostAndPort; diff --git a/java/google/registry/tools/params/PathParameter.java b/java/google/registry/tools/params/PathParameter.java index 6b21cde00..64f96fba8 100644 --- a/java/google/registry/tools/params/PathParameter.java +++ b/java/google/registry/tools/params/PathParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/tools/params/PhoneNumberParameter.java b/java/google/registry/tools/params/PhoneNumberParameter.java index ef60e2c31..82b84d9ca 100644 --- a/java/google/registry/tools/params/PhoneNumberParameter.java +++ b/java/google/registry/tools/params/PhoneNumberParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import static com.google.common.base.Preconditions.checkArgument; diff --git a/java/google/registry/tools/params/StringParameter.java b/java/google/registry/tools/params/StringParameter.java index 124331242..704e2d204 100644 --- a/java/google/registry/tools/params/StringParameter.java +++ b/java/google/registry/tools/params/StringParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; /** Identity String CLI parameter converter/validator. */ public class StringParameter extends ParameterConverterValidator { diff --git a/java/google/registry/tools/params/TransitionListParameter.java b/java/google/registry/tools/params/TransitionListParameter.java index 36fa480ff..230971def 100644 --- a/java/google/registry/tools/params/TransitionListParameter.java +++ b/java/google/registry/tools/params/TransitionListParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import static com.google.common.base.Preconditions.checkArgument; @@ -20,7 +20,8 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Ordering; -import com.google.domain.registry.model.registry.Registry.TldState; + +import google.registry.model.registry.Registry.TldState; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/java/google/registry/tools/params/YearMonthParameter.java b/java/google/registry/tools/params/YearMonthParameter.java index 0196affb2..4efdfe00b 100644 --- a/java/google/registry/tools/params/YearMonthParameter.java +++ b/java/google/registry/tools/params/YearMonthParameter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import org.joda.time.YearMonth; import org.joda.time.format.ISODateTimeFormat; diff --git a/java/google/registry/tools/params/package-info.java b/java/google/registry/tools/params/package-info.java index 457025aa3..dbbd83681 100644 --- a/java/google/registry/tools/params/package-info.java +++ b/java/google/registry/tools/params/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.tools.params; +package google.registry.tools.params; diff --git a/java/google/registry/tools/server/BUILD b/java/google/registry/tools/server/BUILD index 52cea9b01..b5fd15949 100644 --- a/java/google/registry/tools/server/BUILD +++ b/java/google/registry/tools/server/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "server", @@ -14,16 +16,6 @@ java_library( "//java/com/google/common/net", "//java/com/google/common/primitives", "//java/com/google/common/util/concurrent", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/export", - "//java/com/google/domain/registry/flows", - "//java/com/google/domain/registry/gcs", - "//java/com/google/domain/registry/groups", - "//java/com/google/domain/registry/mapreduce", - "//java/com/google/domain/registry/mapreduce/inputs", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/appengine_gcs_client", "//third_party/java/appengine_mapreduce2:appengine_mapreduce", @@ -35,5 +27,15 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/export", + "//java/google/registry/flows", + "//java/google/registry/gcs", + "//java/google/registry/groups", + "//java/google/registry/mapreduce", + "//java/google/registry/mapreduce/inputs", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/util", ], ) diff --git a/java/google/registry/tools/server/CreateGroupsAction.java b/java/google/registry/tools/server/CreateGroupsAction.java index e0cfee936..aeb185cea 100644 --- a/java/google/registry/tools/server/CreateGroupsAction.java +++ b/java/google/registry/tools/server/CreateGroupsAction.java @@ -12,28 +12,29 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.export.SyncGroupMembersAction.getGroupEmailAddressForContactType; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.export.SyncGroupMembersAction.getGroupEmailAddressForContactType; +import static google.registry.request.Action.Method.POST; import static java.util.Arrays.asList; import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.base.Function; import com.google.common.base.Optional; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.groups.GroupsConnection; -import com.google.domain.registry.groups.GroupsConnection.Role; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.model.registrar.RegistrarContact.Type; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.InternalServerErrorException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.Concurrent; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.config.ConfigModule.Config; +import google.registry.groups.GroupsConnection; +import google.registry.groups.GroupsConnection.Role; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.model.registrar.RegistrarContact.Type; +import google.registry.request.Action; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.InternalServerErrorException; +import google.registry.request.Parameter; +import google.registry.request.Response; +import google.registry.util.Concurrent; +import google.registry.util.FormattingLogger; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java b/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java index b3e117be4..093c8932f 100644 --- a/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java +++ b/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.request.JsonResponse; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.request.JsonResponse; +import google.registry.request.Parameter; +import google.registry.util.FormattingLogger; import javax.inject.Inject; diff --git a/java/google/registry/tools/server/CreatePremiumListAction.java b/java/google/registry/tools/server/CreatePremiumListAction.java index 997c46b44..a49b1e102 100644 --- a/java/google/registry/tools/server/CreatePremiumListAction.java +++ b/java/google/registry/tools/server/CreatePremiumListAction.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.request.Action.Method.POST; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; + +import google.registry.model.registry.label.PremiumList; +import google.registry.request.Action; +import google.registry.request.Parameter; import java.util.List; diff --git a/java/google/registry/tools/server/DeleteEntityAction.java b/java/google/registry/tools/server/DeleteEntityAction.java index 19de7c7cd..de547fde4 100644 --- a/java/google/registry/tools/server/DeleteEntityAction.java +++ b/java/google/registry/tools/server/DeleteEntityAction.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.appengine.api.datastore.DatastoreServiceFactory.getDatastoreService; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; import static com.googlecode.objectify.Key.create; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.api.datastore.Entity; import com.google.appengine.api.datastore.EntityNotFoundException; @@ -25,15 +25,16 @@ import com.google.appengine.api.datastore.KeyFactory; import com.google.common.base.Optional; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.FormattingLogger; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.impl.EntityMetadata; +import google.registry.request.Action; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.Parameter; +import google.registry.request.Response; +import google.registry.util.FormattingLogger; + import javax.inject.Inject; /** diff --git a/java/google/registry/tools/server/DeleteProberDataAction.java b/java/google/registry/tools/server/DeleteProberDataAction.java index 505372832..38a257f0e 100644 --- a/java/google/registry/tools/server/DeleteProberDataAction.java +++ b/java/google/registry/tools/server/DeleteProberDataAction.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.base.Verify.verifyNotNull; -import static com.google.domain.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.Registries.getTldsOfType; +import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.Registries.getTldsOfType; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.base.Function; @@ -27,24 +27,25 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.mapreduce.inputs.EppResourceInputs; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldType; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.FormattingLogger; -import com.google.domain.registry.util.PipelineUtils; import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.mapreduce.inputs.EppResourceInputs; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainBase; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldType; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.request.Response; +import google.registry.util.FormattingLogger; +import google.registry.util.PipelineUtils; + import java.util.List; import javax.inject.Inject; diff --git a/java/google/registry/tools/server/GenerateZoneFilesAction.java b/java/google/registry/tools/server/GenerateZoneFilesAction.java index 534ac5271..0861675e1 100644 --- a/java/google/registry/tools/server/GenerateZoneFilesAction.java +++ b/java/google/registry/tools/server/GenerateZoneFilesAction.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.appengine.tools.cloudstorage.GcsServiceFactory.createGcsService; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Iterators.filter; import static com.google.common.io.BaseEncoding.base16; -import static com.google.domain.registry.mapreduce.inputs.EppResourceInputs.createEntityInput; -import static com.google.domain.registry.model.EppResourceUtils.loadAtPointInTime; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.request.Action.Method.POST; -import static com.google.domain.registry.util.PipelineUtils.createJobPath; +import static google.registry.mapreduce.inputs.EppResourceInputs.createEntityInput; +import static google.registry.model.EppResourceUtils.loadAtPointInTime; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.request.Action.Method.POST; +import static google.registry.util.PipelineUtils.createJobPath; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; @@ -37,22 +37,23 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.gcs.GcsUtils; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.mapreduce.inputs.NullInput; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.JsonActionRunner; -import com.google.domain.registry.util.Clock; import com.googlecode.objectify.Ref; +import google.registry.config.ConfigModule.Config; +import google.registry.gcs.GcsUtils; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.mapreduce.inputs.NullInput; +import google.registry.model.EppResource; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.host.HostResource; +import google.registry.request.Action; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.JsonActionRunner; +import google.registry.util.Clock; + import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/tools/server/KillAllCommitLogsAction.java b/java/google/registry/tools/server/KillAllCommitLogsAction.java index 7976103bf..70a45a29d 100644 --- a/java/google/registry/tools/server/KillAllCommitLogsAction.java +++ b/java/google/registry/tools/server/KillAllCommitLogsAction.java @@ -12,28 +12,30 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.collect.Lists.partition; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.request.Action.Method.POST; -import static com.google.domain.registry.util.PipelineUtils.createJobPath; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.request.Action.Method.POST; +import static google.registry.util.PipelineUtils.createJobPath; +import com.google.appengine.tools.mapreduce.Input; import com.google.appengine.tools.mapreduce.Mapper; import com.google.appengine.tools.mapreduce.inputs.InMemoryInput; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.mapreduce.MapreduceAction; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.model.ofy.CommitLogBucket; -import com.google.domain.registry.model.ofy.CommitLogCheckpointRoot; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Response; +import com.google.common.collect.Lists; import com.googlecode.objectify.Key; +import google.registry.config.RegistryEnvironment; +import google.registry.mapreduce.MapreduceAction; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.model.ofy.CommitLogBucket; +import google.registry.model.ofy.CommitLogCheckpointRoot; +import google.registry.request.Action; +import google.registry.request.Response; + import java.util.Arrays; import javax.inject.Inject; @@ -47,27 +49,27 @@ public class KillAllCommitLogsAction implements MapreduceAction { @Inject KillAllCommitLogsAction() {} @Override - public final void run() { + public void run() { checkArgument( // safety RegistryEnvironment.get() == RegistryEnvironment.CRASH || RegistryEnvironment.get() == RegistryEnvironment.UNITTEST, "DO NOT RUN ANYWHERE ELSE EXCEPT CRASH OR TESTS."); + // Create a in-memory input, assigning each bucket to its own shard for maximum parallelization, + // with one extra shard for the CommitLogCheckpointRoot. + Input> input = new InMemoryInput<>( + Lists.partition( + FluentIterable + .from(Arrays.>asList(CommitLogCheckpointRoot.getKey())) + .append(CommitLogBucket.getAllBucketKeys()) + .toList(), + 1)); response.sendJavaScriptRedirect(createJobPath(mrRunner - .setJobName("Delete all commit logs and checkpoints") + .setJobName("Delete all commit logs") .setModuleName("tools") .runMapreduce( new KillAllCommitLogsMapper(), new KillAllEntitiesReducer(), - // Create a in-memory input, assigning each bucket to its own shard for maximum - // parallelization, with one extra shard for the CommitLogCheckpointRoot. - ImmutableList.of( - new InMemoryInput<>( - partition( - FluentIterable - .from(Arrays.>asList(CommitLogCheckpointRoot.getKey())) - .append(CommitLogBucket.getAllBucketKeys()) - .toList(), - 1)))))); + ImmutableList.of(input)))); } /** diff --git a/java/google/registry/tools/server/KillAllCrossTldEntitiesAction.java b/java/google/registry/tools/server/KillAllCrossTldEntitiesAction.java deleted file mode 100644 index 9fcb5b28e..000000000 --- a/java/google/registry/tools/server/KillAllCrossTldEntitiesAction.java +++ /dev/null @@ -1,105 +0,0 @@ -// 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.tools.server; - -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.request.Action.Method.POST; -import static com.google.domain.registry.util.PipelineUtils.createJobPath; - -import com.google.appengine.tools.mapreduce.Mapper; -import com.google.common.collect.ImmutableList; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.mapreduce.MapreduceAction; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.mapreduce.inputs.NullInput; -import com.google.domain.registry.model.common.EntityGroupRoot; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Response; - -import com.googlecode.objectify.Key; - -import javax.inject.Inject; - -/** - * Deletes all cross tld entities in datastore. - * - *

    This doesn't really need to be a mapreduce, but doing so makes it consistent with the other - * kill-all actions, and gives us retries, a dashboard and counters for free. - */ -@Action(path = "/_dr/task/killAllCrossTld", method = POST) -public class KillAllCrossTldEntitiesAction implements MapreduceAction { - - @Inject MapreduceRunner mrRunner; - @Inject Response response; - @Inject KillAllCrossTldEntitiesAction() {} - - @Override - public final void run() { - checkArgument( // safety - RegistryEnvironment.get() == RegistryEnvironment.CRASH - || RegistryEnvironment.get() == RegistryEnvironment.UNITTEST, - "DO NOT RUN ANYWHERE ELSE EXCEPT CRASH OR TESTS."); - response.sendJavaScriptRedirect(createJobPath(mrRunner - .setJobName("Delete all cross-tld entities") - .setModuleName("tools") - .runMapreduce( - new KillAllCrossTldEntitiesMapper(), - new KillAllEntitiesReducer(), - ImmutableList.of(new NullInput())))); - } - - /** - * Mapper to delete all descendants of {@link EntityGroupRoot#getCrossTldKey()}. - * - *

    This will delete: - *

      - * {@code ClaimsListShard} - * {@code ClaimsListSingleton} - * {@link EntityGroupRoot} - * {@code LogsExportCursor} - * {@code PremiumList} - * {@code PremiumListEntry} - * {@code Registrar} - * {@code RegistrarBillingEntry} - * {@code RegistrarContact} - * {@code RegistrarCredit} - * {@code RegistrarCreditBalance} - * {@code Registry} - * {@code RegistryCursor} - * {@code ReservedList} - * {@code ServerSecret} - * {@code SignedMarkRevocationList} - * {@code TmchCrl} - *
    - */ - static class KillAllCrossTldEntitiesMapper extends Mapper, Key> { - - private static final long serialVersionUID = 8343696167876596542L; - - @Override - public void map(Object ignored) { - // There will be exactly one input to the mapper, and we ignore it. - Key crossTldKey = getCrossTldKey(); - for (Key key : ofy().load().ancestor(crossTldKey).keys()) { - emit(crossTldKey, key); - getContext().incrementCounter("entities emitted"); - getContext().incrementCounter(String.format("%s emitted", key.getKind())); - } - } - } -} - diff --git a/java/google/registry/tools/server/KillAllEntitiesReducer.java b/java/google/registry/tools/server/KillAllEntitiesReducer.java index 3f8e63b74..056d1018d 100644 --- a/java/google/registry/tools/server/KillAllEntitiesReducer.java +++ b/java/google/registry/tools/server/KillAllEntitiesReducer.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.collect.Iterators.partition; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.tools.mapreduce.Reducer; import com.google.appengine.tools.mapreduce.ReducerInput; diff --git a/java/google/registry/tools/server/KillAllEppResourcesAction.java b/java/google/registry/tools/server/KillAllEppResourcesAction.java index 5da35cc0c..45454714a 100644 --- a/java/google/registry/tools/server/KillAllEppResourcesAction.java +++ b/java/google/registry/tools/server/KillAllEppResourcesAction.java @@ -12,30 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.request.Action.Method.POST; -import static com.google.domain.registry.util.PipelineUtils.createJobPath; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.request.Action.Method.POST; +import static google.registry.util.PipelineUtils.createJobPath; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.mapreduce.MapreduceAction; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.mapreduce.inputs.EppResourceInputs; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.index.DomainApplicationIndex; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Response; import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; +import google.registry.config.RegistryEnvironment; +import google.registry.mapreduce.MapreduceAction; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.mapreduce.inputs.EppResourceInputs; +import google.registry.model.EppResource; +import google.registry.model.domain.DomainApplication; +import google.registry.model.index.DomainApplicationIndex; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.request.Action; +import google.registry.request.Response; + import javax.inject.Inject; /** Deletes all {@link EppResource} objects in datastore, including indices and descendants. */ @@ -47,7 +48,7 @@ public class KillAllEppResourcesAction implements MapreduceAction { @Inject KillAllEppResourcesAction() {} @Override - public final void run() { + public void run() { checkArgument( // safety RegistryEnvironment.get() == RegistryEnvironment.CRASH || RegistryEnvironment.get() == RegistryEnvironment.UNITTEST, @@ -61,26 +62,25 @@ public class KillAllEppResourcesAction implements MapreduceAction { ImmutableList.of(EppResourceInputs.createIndexInput())))); } - /** - * Mapper to delete an {@link EppResourceIndex}, its referent, all descendants of each referent, - * and the {@link ForeignKeyIndex} or {@link DomainApplicationIndex} of the referent, as - * appropriate. - * - *

    This will delete: - *

      - *
    • All {@link ForeignKeyIndex} types - *
    • {@link DomainApplicationIndex} - *
    • {@link EppResourceIndex} - *
    • All {@link EppResource} types - *
    • {@code HistoryEntry} - *
    • All {@code BillingEvent} types - *
    • All {@code PollMessage} types - *
    - */ static class KillAllEppResourcesMapper extends Mapper, Key> { private static final long serialVersionUID = 8205309000002507407L; + /** + * Delete an {@link EppResourceIndex}, its referent, all descendants of each referent, and the + * {@link ForeignKeyIndex} or {@link DomainApplicationIndex} of the referent, as appropriate. + * + *

    This will delete: + *

      + *
    • All {@link ForeignKeyIndex} types + *
    • {@link DomainApplicationIndex} + *
    • {@link EppResourceIndex} + *
    • All {@link EppResource} types + *
    • {@code HistoryEntry} + *
    • All {@code BillingEvent} types + *
    • All {@code PollMessage} types + *
    + */ @Override public void map(final EppResourceIndex eri) { Key eriKey = Key.create(eri); diff --git a/java/google/registry/tools/server/ListDomainsAction.java b/java/google/registry/tools/server/ListDomainsAction.java index bf5eede1c..c58cf9e52 100644 --- a/java/google/registry/tools/server/ListDomainsAction.java +++ b/java/google/registry/tools/server/ListDomainsAction.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.model.EppResourceUtils.queryNotDeleted; -import static com.google.domain.registry.model.registry.Registries.assertTldExists; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.model.EppResourceUtils.queryNotDeleted; +import static google.registry.model.registry.Registries.assertTldExists; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.POST; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Parameter; -import com.google.domain.registry.util.Clock; + +import google.registry.model.domain.DomainResource; +import google.registry.request.Action; +import google.registry.request.Parameter; +import google.registry.util.Clock; import java.util.Comparator; diff --git a/java/google/registry/tools/server/ListHostsAction.java b/java/google/registry/tools/server/ListHostsAction.java index b1040cb2f..10f02ade9 100644 --- a/java/google/registry/tools/server/ListHostsAction.java +++ b/java/google/registry/tools/server/ListHostsAction.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.POST; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EppResourceUtils; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.util.Clock; + +import google.registry.model.EppResourceUtils; +import google.registry.model.host.HostResource; +import google.registry.request.Action; +import google.registry.util.Clock; import org.joda.time.DateTime; diff --git a/java/google/registry/tools/server/ListObjectsAction.java b/java/google/registry/tools/server/ListObjectsAction.java index 6396350e9..1e62fd923 100644 --- a/java/google/registry/tools/server/ListObjectsAction.java +++ b/java/google/registry/tools/server/ListObjectsAction.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.base.Preconditions.checkArgument; @@ -31,9 +31,10 @@ import com.google.common.collect.ImmutableTable; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.request.JsonResponse; -import com.google.domain.registry.request.Parameter; + +import google.registry.model.ImmutableObject; +import google.registry.request.JsonResponse; +import google.registry.request.Parameter; import java.util.ArrayList; import java.util.HashMap; diff --git a/java/google/registry/tools/server/ListPremiumListsAction.java b/java/google/registry/tools/server/ListPremiumListsAction.java index 9e5430dac..53be20a0e 100644 --- a/java/google/registry/tools/server/ListPremiumListsAction.java +++ b/java/google/registry/tools/server/ListPremiumListsAction.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.POST; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.request.Action; + +import google.registry.model.registry.label.PremiumList; +import google.registry.request.Action; import javax.inject.Inject; diff --git a/java/google/registry/tools/server/ListRegistrarsAction.java b/java/google/registry/tools/server/ListRegistrarsAction.java index 39be23bce..2514b7934 100644 --- a/java/google/registry/tools/server/ListRegistrarsAction.java +++ b/java/google/registry/tools/server/ListRegistrarsAction.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.POST; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.request.Action; + +import google.registry.model.registrar.Registrar; +import google.registry.request.Action; import javax.inject.Inject; diff --git a/java/google/registry/tools/server/ListReservedListsAction.java b/java/google/registry/tools/server/ListReservedListsAction.java index f8cd63ecb..2079d5e4e 100644 --- a/java/google/registry/tools/server/ListReservedListsAction.java +++ b/java/google/registry/tools/server/ListReservedListsAction.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.POST; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registry.label.ReservedList; -import com.google.domain.registry.request.Action; + +import google.registry.model.registry.label.ReservedList; +import google.registry.request.Action; import javax.inject.Inject; diff --git a/java/google/registry/tools/server/ListTldsAction.java b/java/google/registry/tools/server/ListTldsAction.java index 196512710..a8976ded3 100644 --- a/java/google/registry/tools/server/ListTldsAction.java +++ b/java/google/registry/tools/server/ListTldsAction.java @@ -12,26 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.model.registry.Registries.getTlds; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.model.registry.Registries.getTlds; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.POST; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.util.Clock; + +import google.registry.model.registry.Registry; +import google.registry.request.Action; +import google.registry.util.Clock; import org.joda.time.DateTime; import javax.inject.Inject; - /** An action that lists top-level domains, for use by the registry_tool list_tlds command. */ @Action(path = ListTldsAction.PATH, method = {GET, POST}) public final class ListTldsAction extends ListObjectsAction { diff --git a/java/google/registry/tools/server/ResaveAllEppResourcesAction.java b/java/google/registry/tools/server/ResaveAllEppResourcesAction.java index f6debe7ce..89920a79e 100644 --- a/java/google/registry/tools/server/ResaveAllEppResourcesAction.java +++ b/java/google/registry/tools/server/ResaveAllEppResourcesAction.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.mapreduce.inputs.EppResourceInputs.createEntityInput; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.PipelineUtils.createJobPath; +import static google.registry.mapreduce.inputs.EppResourceInputs.createEntityInput; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.PipelineUtils.createJobPath; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.mapreduce.MapreduceAction; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Response; import com.googlecode.objectify.VoidWork; +import google.registry.mapreduce.MapreduceAction; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.model.EppResource; +import google.registry.request.Action; +import google.registry.request.Response; + import javax.inject.Inject; /** diff --git a/java/google/registry/tools/server/ToolsServerModule.java b/java/google/registry/tools/server/ToolsServerModule.java index d788d1623..b29cba256 100644 --- a/java/google/registry/tools/server/ToolsServerModule.java +++ b/java/google/registry/tools/server/ToolsServerModule.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.base.Strings.emptyToNull; -import static com.google.domain.registry.request.RequestParameters.extractBooleanParameter; -import static com.google.domain.registry.request.RequestParameters.extractOptionalParameter; -import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter; +import static google.registry.request.RequestParameters.extractBooleanParameter; +import static google.registry.request.RequestParameters.extractOptionalParameter; +import static google.registry.request.RequestParameters.extractRequiredParameter; import com.google.common.base.Optional; -import com.google.domain.registry.request.Parameter; import dagger.Module; import dagger.Provides; +import google.registry.request.Parameter; + import javax.servlet.http.HttpServletRequest; /** diff --git a/java/google/registry/tools/server/UpdatePremiumListAction.java b/java/google/registry/tools/server/UpdatePremiumListAction.java index 9371a61a5..e45cfac95 100644 --- a/java/google/registry/tools/server/UpdatePremiumListAction.java +++ b/java/google/registry/tools/server/UpdatePremiumListAction.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.request.Action.Method.POST; import com.google.common.base.Optional; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.request.Action; + +import google.registry.model.registry.label.PremiumList; +import google.registry.request.Action; import java.util.List; diff --git a/java/google/registry/tools/server/VerifyOteAction.java b/java/google/registry/tools/server/VerifyOteAction.java index 8dc619279..a34f2cdb3 100644 --- a/java/google/registry/tools/server/VerifyOteAction.java +++ b/java/google/registry/tools/server/VerifyOteAction.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.base.Predicates.not; import static com.google.common.collect.Maps.toMap; -import static com.google.domain.registry.flows.EppXmlTransformer.unmarshal; -import static com.google.domain.registry.flows.FlowRegistry.getFlowClass; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CollectionUtils.isNullOrEmpty; -import static com.google.domain.registry.util.DomainNameUtils.ACE_PREFIX; +import static google.registry.flows.EppXmlTransformer.unmarshal; +import static google.registry.flows.FlowRegistry.getFlowClass; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CollectionUtils.isNullOrEmpty; +import static google.registry.util.DomainNameUtils.ACE_PREFIX; import static java.util.Arrays.asList; import com.google.common.base.Function; @@ -31,42 +31,43 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.HashMultiset; import com.google.common.collect.ImmutableList; import com.google.common.collect.Multiset; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.Flow; -import com.google.domain.registry.flows.contact.ContactCreateFlow; -import com.google.domain.registry.flows.contact.ContactDeleteFlow; -import com.google.domain.registry.flows.contact.ContactTransferApproveFlow; -import com.google.domain.registry.flows.contact.ContactTransferCancelFlow; -import com.google.domain.registry.flows.contact.ContactTransferRejectFlow; -import com.google.domain.registry.flows.contact.ContactTransferRequestFlow; -import com.google.domain.registry.flows.contact.ContactUpdateFlow; -import com.google.domain.registry.flows.domain.DomainApplicationCreateFlow; -import com.google.domain.registry.flows.domain.DomainApplicationDeleteFlow; -import com.google.domain.registry.flows.domain.DomainApplicationUpdateFlow; -import com.google.domain.registry.flows.domain.DomainCreateFlow; -import com.google.domain.registry.flows.domain.DomainDeleteFlow; -import com.google.domain.registry.flows.domain.DomainRenewFlow; -import com.google.domain.registry.flows.domain.DomainRestoreRequestFlow; -import com.google.domain.registry.flows.domain.DomainTransferApproveFlow; -import com.google.domain.registry.flows.domain.DomainTransferCancelFlow; -import com.google.domain.registry.flows.domain.DomainTransferRejectFlow; -import com.google.domain.registry.flows.domain.DomainTransferRequestFlow; -import com.google.domain.registry.flows.domain.DomainUpdateFlow; -import com.google.domain.registry.flows.host.HostCreateFlow; -import com.google.domain.registry.flows.host.HostDeleteFlow; -import com.google.domain.registry.flows.host.HostUpdateFlow; -import com.google.domain.registry.model.domain.DomainCommand; -import com.google.domain.registry.model.domain.fee.FeeCreateExtension; -import com.google.domain.registry.model.domain.launch.LaunchCreateExtension; -import com.google.domain.registry.model.domain.secdns.SecDnsCreateExtension; -import com.google.domain.registry.model.domain.secdns.SecDnsUpdateExtension; -import com.google.domain.registry.model.eppinput.EppInput; -import com.google.domain.registry.model.eppinput.EppInput.ResourceCommandWrapper; -import com.google.domain.registry.model.host.HostCommand; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.JsonActionRunner; -import com.google.domain.registry.request.JsonActionRunner.JsonAction; + +import google.registry.flows.EppException; +import google.registry.flows.Flow; +import google.registry.flows.contact.ContactCreateFlow; +import google.registry.flows.contact.ContactDeleteFlow; +import google.registry.flows.contact.ContactTransferApproveFlow; +import google.registry.flows.contact.ContactTransferCancelFlow; +import google.registry.flows.contact.ContactTransferRejectFlow; +import google.registry.flows.contact.ContactTransferRequestFlow; +import google.registry.flows.contact.ContactUpdateFlow; +import google.registry.flows.domain.DomainApplicationCreateFlow; +import google.registry.flows.domain.DomainApplicationDeleteFlow; +import google.registry.flows.domain.DomainApplicationUpdateFlow; +import google.registry.flows.domain.DomainCreateFlow; +import google.registry.flows.domain.DomainDeleteFlow; +import google.registry.flows.domain.DomainRenewFlow; +import google.registry.flows.domain.DomainRestoreRequestFlow; +import google.registry.flows.domain.DomainTransferApproveFlow; +import google.registry.flows.domain.DomainTransferCancelFlow; +import google.registry.flows.domain.DomainTransferRejectFlow; +import google.registry.flows.domain.DomainTransferRequestFlow; +import google.registry.flows.domain.DomainUpdateFlow; +import google.registry.flows.host.HostCreateFlow; +import google.registry.flows.host.HostDeleteFlow; +import google.registry.flows.host.HostUpdateFlow; +import google.registry.model.domain.DomainCommand; +import google.registry.model.domain.fee.FeeCreateExtension; +import google.registry.model.domain.launch.LaunchCreateExtension; +import google.registry.model.domain.secdns.SecDnsCreateExtension; +import google.registry.model.domain.secdns.SecDnsUpdateExtension; +import google.registry.model.eppinput.EppInput; +import google.registry.model.eppinput.EppInput.ResourceCommandWrapper; +import google.registry.model.host.HostCommand; +import google.registry.model.reporting.HistoryEntry; +import google.registry.request.Action; +import google.registry.request.JsonActionRunner; +import google.registry.request.JsonActionRunner.JsonAction; import java.util.ArrayList; import java.util.EnumSet; diff --git a/java/google/registry/tools/soy/BUILD b/java/google/registry/tools/soy/BUILD index 02adcdf80..b5b39d2a4 100644 --- a/java/google/registry/tools/soy/BUILD +++ b/java/google/registry/tools/soy/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 load("//third_party/closure/templates:closure_template_java_library.bzl", "closure_template_java_library") @@ -6,5 +8,5 @@ load("//third_party/closure/templates:closure_template_java_library.bzl", "closu closure_template_java_library( name = "soy_java_wrappers", srcs = glob(["*.soy"]), - java_package = "com.google.domain.registry.tools.soy", + java_package = "google.registry.tools.soy", ) diff --git a/java/google/registry/ui/BUILD b/java/google/registry/ui/BUILD index 45e23a0e6..11b5c51aa 100644 --- a/java/google/registry/ui/BUILD +++ b/java/google/registry/ui/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 load("//third_party/closure/compiler:closure_js_binary.bzl", "closure_js_binary") load("//third_party/closure/compiler:closure_js_deps.bzl", "closure_js_deps") @@ -14,11 +16,11 @@ filegroup( filegroup( name = "js_files_recursive", srcs = [ - "//java/com/google/domain/registry/ui/js:js_files", - "//java/com/google/domain/registry/ui/js/registrar:js_files", - "//java/com/google/domain/registry/ui/soy:js_files", - "//java/com/google/domain/registry/ui/soy/api:js_files", - "//java/com/google/domain/registry/ui/soy/registrar:js_files", + "//java/google/registry/ui/js:js_files", + "//java/google/registry/ui/js/registrar:js_files", + "//java/google/registry/ui/soy:js_files", + "//java/google/registry/ui/soy/api:js_files", + "//java/google/registry/ui/soy/registrar:js_files", ], ) @@ -30,11 +32,11 @@ filegroup( "registrar_bin.js", "registrar_bin_map.js", ":assets_recursive", - "//java/com/google/domain/registry/ui:deps-runfiles.js", - "//java/com/google/domain/registry/ui/css:registrar_bin.css", - "//java/com/google/domain/registry/ui/html:html_files", "//javascript/closure:js_files_recursive", "//javascript/template/soy:soy_usegoog_js_files", + "//java/google/registry/ui:deps-runfiles.js", + "//java/google/registry/ui/css:registrar_bin.css", + "//java/google/registry/ui/html:html_files", ], ) @@ -44,9 +46,9 @@ filegroup( "deps-runfiles.js", ":js_files_recursive", ":runfiles", - "//java/com/google/domain/registry/ui/css:css_files", "//javascript/closure:js_files_recursive", "//javascript/template/soy:soy_usegoog_js_files", + "//java/google/registry/ui/css:css_files", "//third_party/javascript/closure:js_files_recursive", ], ) @@ -56,10 +58,10 @@ java_library( srcs = glob(["*.java"]), deps = [ "//java/com/google/common/base", - "//java/com/google/domain/registry/config", "//third_party/java/appengine:appengine-api", "//third_party/java/dagger", "//third_party/java/jsr305_annotations", + "//java/google/registry/config", ], ) @@ -67,8 +69,8 @@ java_library( closure_js_deps( name = "deps", srcs = [ - "//java/com/google/domain/registry/ui/js", - "//java/com/google/domain/registry/ui/js/registrar", + "//java/google/registry/ui/js", + "//java/google/registry/ui/js/registrar", ], ) @@ -89,11 +91,11 @@ SOURCEMAP_SCRUB = (" -e 's@b....-out/[^/]*/bin/@@g'" + # non-union minified equivalents. closure_js_binary( name = "registrar_bin", - externs_list = ["//java/com/google/domain/registry/ui/externs"], + externs_list = ["//java/google/registry/ui/externs"], main = "registry.registrar.main", deps = [ - "//java/com/google/domain/registry/ui/css:registrar_bin", - "//java/com/google/domain/registry/ui/js/registrar", + "//java/google/registry/ui/css:registrar_bin", + "//java/google/registry/ui/js/registrar", ], ) @@ -124,12 +126,12 @@ genrule( closure_js_binary( name = "registrar_dbg", debug = 1, - externs_list = ["//java/com/google/domain/registry/ui/externs"], + externs_list = ["//java/google/registry/ui/externs"], formatting = "PRETTY_PRINT", main = "registry.registrar.main", deps = [ - "//java/com/google/domain/registry/ui/css:registrar_dbg", - "//java/com/google/domain/registry/ui/js/registrar", + "//java/google/registry/ui/css:registrar_dbg", + "//java/google/registry/ui/js/registrar", ], ) @@ -138,9 +140,9 @@ closure_js_binary( closure_js_binary( name = "brain_bin", - externs_list = ["//java/com/google/domain/registry/ui/externs"], + externs_list = ["//java/google/registry/ui/externs"], main = "registry.registrar.BrainFrame.main", - deps = ["//java/com/google/domain/registry/ui/js/registrar"], + deps = ["//java/google/registry/ui/js/registrar"], ) genrule( diff --git a/java/google/registry/ui/ConsoleConfigModule.java b/java/google/registry/ui/ConsoleConfigModule.java index fdbd8c724..8a7e12af7 100644 --- a/java/google/registry/ui/ConsoleConfigModule.java +++ b/java/google/registry/ui/ConsoleConfigModule.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui; +package google.registry.ui; import com.google.appengine.api.users.UserService; -import com.google.domain.registry.config.ConfigModule.Config; import dagger.Module; import dagger.Provides; +import google.registry.config.ConfigModule.Config; + /** Dagger module for UI configuration. */ @Module public final class ConsoleConfigModule { // TODO(b/26829015): Move to config package. diff --git a/java/google/registry/ui/ConsoleDebug.java b/java/google/registry/ui/ConsoleDebug.java index a7a4591cf..acd7dc350 100644 --- a/java/google/registry/ui/ConsoleDebug.java +++ b/java/google/registry/ui/ConsoleDebug.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui; +package google.registry.ui; /** Enum defining which JS/CSS files get rendered in a soy templates. */ public enum ConsoleDebug { diff --git a/java/google/registry/ui/css/BUILD b/java/google/registry/ui/css/BUILD index 13bc4e7fb..12e0bf1e2 100644 --- a/java/google/registry/ui/css/BUILD +++ b/java/google/registry/ui/css/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 load("//third_party/closure/stylesheets:closure_css_library.bzl", "closure_css_library") load("//third_party/closure/stylesheets:closure_css_binary.bzl", "closure_css_binary") diff --git a/java/google/registry/ui/externs/BUILD b/java/google/registry/ui/externs/BUILD index 867687936..e6a64b785 100644 --- a/java/google/registry/ui/externs/BUILD +++ b/java/google/registry/ui/externs/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 filegroup( diff --git a/java/google/registry/ui/forms/BUILD b/java/google/registry/ui/forms/BUILD index 8de6a8d67..3f9b362f8 100644 --- a/java/google/registry/ui/forms/BUILD +++ b/java/google/registry/ui/forms/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 java_library( diff --git a/java/google/registry/ui/forms/FormException.java b/java/google/registry/ui/forms/FormException.java index 45ac80f4c..fbb999685 100644 --- a/java/google/registry/ui/forms/FormException.java +++ b/java/google/registry/ui/forms/FormException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.forms; +package google.registry.ui.forms; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/ui/forms/FormField.java b/java/google/registry/ui/forms/FormField.java index 207e15d27..0769d1f0f 100644 --- a/java/google/registry/ui/forms/FormField.java +++ b/java/google/registry/ui/forms/FormField.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.forms; +package google.registry.ui.forms; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/ui/forms/FormFieldException.java b/java/google/registry/ui/forms/FormFieldException.java index 3b0abd531..a0c226709 100644 --- a/java/google/registry/ui/forms/FormFieldException.java +++ b/java/google/registry/ui/forms/FormFieldException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.forms; +package google.registry.ui.forms; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/ui/forms/FormFields.java b/java/google/registry/ui/forms/FormFields.java index 717434604..2e63898d7 100644 --- a/java/google/registry/ui/forms/FormFields.java +++ b/java/google/registry/ui/forms/FormFields.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.forms; +package google.registry.ui.forms; import static com.google.common.collect.Range.atMost; import static com.google.common.collect.Range.closed; diff --git a/java/google/registry/ui/forms/package-info.java b/java/google/registry/ui/forms/package-info.java index 0a9fbdf31..63eda0d45 100644 --- a/java/google/registry/ui/forms/package-info.java +++ b/java/google/registry/ui/forms/package-info.java @@ -14,4 +14,4 @@ /** Web application backend form processing utilities. */ @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.ui.forms; +package google.registry.ui.forms; diff --git a/java/google/registry/ui/globals.txt b/java/google/registry/ui/globals.txt index 9c7c67428..d0e2d40f8 100644 --- a/java/google/registry/ui/globals.txt +++ b/java/google/registry/ui/globals.txt @@ -1,5 +1,5 @@ DEBUG = null -com.google.domain.registry.ui.ConsoleDebug.PRODUCTION = 0 -com.google.domain.registry.ui.ConsoleDebug.DEBUG = 1 -com.google.domain.registry.ui.ConsoleDebug.RAW = 2 -com.google.domain.registry.ui.ConsoleDebug.TEST = 3 +google.registry.ui.ConsoleDebug.PRODUCTION = 0 +google.registry.ui.ConsoleDebug.DEBUG = 1 +google.registry.ui.ConsoleDebug.RAW = 2 +google.registry.ui.ConsoleDebug.TEST = 3 diff --git a/java/google/registry/ui/html/BUILD b/java/google/registry/ui/html/BUILD index ffc1c1e41..d555aef80 100644 --- a/java/google/registry/ui/html/BUILD +++ b/java/google/registry/ui/html/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 filegroup( diff --git a/java/google/registry/ui/js/BUILD b/java/google/registry/ui/js/BUILD index 86a8052bf..8d8574e5d 100644 --- a/java/google/registry/ui/js/BUILD +++ b/java/google/registry/ui/js/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 load("//third_party/closure/compiler:closure_js_library.bzl", "closure_js_library") @@ -12,8 +14,8 @@ closure_js_library( name = "js", srcs = [":js_files"], deps = [ - "//java/com/google/domain/registry/ui/soy:Console", - "//java/com/google/domain/registry/ui/soy:Forms", "//javascript/closure", + "//java/google/registry/ui/soy:Console", + "//java/google/registry/ui/soy:Forms", ], ) diff --git a/java/google/registry/ui/js/registrar/BUILD b/java/google/registry/ui/js/registrar/BUILD index 77354f341..ac3512967 100644 --- a/java/google/registry/ui/js/registrar/BUILD +++ b/java/google/registry/ui/js/registrar/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 load("//third_party/closure/compiler:closure_js_library.bzl", "closure_js_library") @@ -12,20 +14,20 @@ closure_js_library( name = "registrar", srcs = [":js_files"], deps = [ - "//java/com/google/domain/registry/ui/js", - "//java/com/google/domain/registry/ui/soy:Forms", - "//java/com/google/domain/registry/ui/soy/registrar:Console", - "//java/com/google/domain/registry/ui/soy/registrar:Contact", - "//java/com/google/domain/registry/ui/soy/registrar:ContactEpp", - "//java/com/google/domain/registry/ui/soy/registrar:ContactSettings", - "//java/com/google/domain/registry/ui/soy/registrar:Domain", - "//java/com/google/domain/registry/ui/soy/registrar:DomainEpp", - "//java/com/google/domain/registry/ui/soy/registrar:Epp", - "//java/com/google/domain/registry/ui/soy/registrar:Host", - "//java/com/google/domain/registry/ui/soy/registrar:HostEpp", - "//java/com/google/domain/registry/ui/soy/registrar:Payment", - "//java/com/google/domain/registry/ui/soy/registrar:SecuritySettings", - "//java/com/google/domain/registry/ui/soy/registrar:WhoisSettings", "//javascript/closure", + "//java/google/registry/ui/js", + "//java/google/registry/ui/soy:Forms", + "//java/google/registry/ui/soy/registrar:Console", + "//java/google/registry/ui/soy/registrar:Contact", + "//java/google/registry/ui/soy/registrar:ContactEpp", + "//java/google/registry/ui/soy/registrar:ContactSettings", + "//java/google/registry/ui/soy/registrar:Domain", + "//java/google/registry/ui/soy/registrar:DomainEpp", + "//java/google/registry/ui/soy/registrar:Epp", + "//java/google/registry/ui/soy/registrar:Host", + "//java/google/registry/ui/soy/registrar:HostEpp", + "//java/google/registry/ui/soy/registrar:Payment", + "//java/google/registry/ui/soy/registrar:SecuritySettings", + "//java/google/registry/ui/soy/registrar:WhoisSettings", ], ) diff --git a/java/google/registry/ui/package-info.java b/java/google/registry/ui/package-info.java index fe7abf6ec..c242d4bd3 100644 --- a/java/google/registry/ui/package-info.java +++ b/java/google/registry/ui/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.ui; +package google.registry.ui; diff --git a/java/google/registry/ui/server/BUILD b/java/google/registry/ui/server/BUILD index d60c9d4de..94d6fd419 100644 --- a/java/google/registry/ui/server/BUILD +++ b/java/google/registry/ui/server/BUILD @@ -1,24 +1,26 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 java_library( name = "server", srcs = glob(["*.java"]), resources = [ - "//java/com/google/domain/registry/ui:globals.txt", - "//java/com/google/domain/registry/ui/css:registrar_bin.css.js", - "//java/com/google/domain/registry/ui/css:registrar_dbg.css.js", + "//java/google/registry/ui:globals.txt", + "//java/google/registry/ui/css:registrar_bin.css.js", + "//java/google/registry/ui/css:registrar_dbg.css.js", ], deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/security", - "//java/com/google/domain/registry/ui", - "//java/com/google/domain/registry/ui/forms", - "//java/com/google/domain/registry/util", + "//java/google/registry/model", + "//java/google/registry/security", + "//java/google/registry/ui", + "//java/google/registry/ui/forms", + "//java/google/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/joda_time", "//third_party/java/json_simple", diff --git a/java/google/registry/ui/server/RegistrarFormFields.java b/java/google/registry/ui/server/RegistrarFormFields.java index eb793ce5f..e4457dff6 100644 --- a/java/google/registry/ui/server/RegistrarFormFields.java +++ b/java/google/registry/ui/server/RegistrarFormFields.java @@ -12,25 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server; +package google.registry.ui.server; import static com.google.common.collect.Range.atLeast; import static com.google.common.collect.Range.atMost; import static com.google.common.collect.Range.closed; -import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName; +import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import com.google.common.base.Function; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarAddress; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.ui.forms.FormField; -import com.google.domain.registry.ui.forms.FormFieldException; -import com.google.domain.registry.ui.forms.FormFields; -import com.google.domain.registry.util.CidrAddressBlock; -import com.google.domain.registry.util.X509Utils; + +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarAddress; +import google.registry.model.registrar.RegistrarContact; +import google.registry.ui.forms.FormField; +import google.registry.ui.forms.FormFieldException; +import google.registry.ui.forms.FormFields; +import google.registry.util.CidrAddressBlock; +import google.registry.util.X509Utils; import java.security.cert.CertificateParsingException; import java.util.List; diff --git a/java/google/registry/ui/server/SoyTemplateUtils.java b/java/google/registry/ui/server/SoyTemplateUtils.java index 336245c33..b0d402ca1 100644 --- a/java/google/registry/ui/server/SoyTemplateUtils.java +++ b/java/google/registry/ui/server/SoyTemplateUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server; +package google.registry.ui.server; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Suppliers.memoize; @@ -25,7 +25,6 @@ import com.google.common.base.Splitter; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import com.google.common.io.Resources; -import com.google.domain.registry.ui.ConsoleDebug; import com.google.template.soy.SoyFileSet; import com.google.template.soy.SoyUtils; import com.google.template.soy.base.SoySyntaxException; @@ -33,6 +32,8 @@ import com.google.template.soy.parseinfo.SoyFileInfo; import com.google.template.soy.shared.SoyCssRenamingMap; import com.google.template.soy.tofu.SoyTofu; +import google.registry.ui.ConsoleDebug; + import java.io.IOException; import java.net.URL; import java.util.ArrayList; @@ -129,7 +130,7 @@ public final class SoyTemplateUtils { return builder.build(); } - private static final URL SOY_GLOBALS = getResource("com/google/domain/registry/ui/globals.txt"); + private static final URL SOY_GLOBALS = getResource("google/registry/ui/globals.txt"); private static final Splitter CSS_CLASS_SPLITTER = Splitter.on('-'); private static final Joiner CSS_CLASS_JOINER = Joiner.on('-'); private static final Pattern KEY_VALUE_PATTERN = diff --git a/java/google/registry/ui/server/StateCode.java b/java/google/registry/ui/server/StateCode.java index 03a99c0ca..dcec8be0a 100644 --- a/java/google/registry/ui/server/StateCode.java +++ b/java/google/registry/ui/server/StateCode.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server; +package google.registry.ui.server; import com.google.common.collect.ImmutableBiMap; diff --git a/java/google/registry/ui/server/api/BUILD b/java/google/registry/ui/server/api/BUILD index 3b9d86bae..618e3f250 100644 --- a/java/google/registry/ui/server/api/BUILD +++ b/java/google/registry/ui/server/api/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 java_library( @@ -9,12 +11,12 @@ java_library( "//java/com/google/common/base", "//java/com/google/common/collect", "//java/com/google/common/net", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/flows", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/ui/server", - "//java/com/google/domain/registry/ui/soy/api:soy_java_wrappers", - "//java/com/google/domain/registry/util", + "//java/google/registry/config", + "//java/google/registry/flows", + "//java/google/registry/model", + "//java/google/registry/ui/server", + "//java/google/registry/ui/soy/api:soy_java_wrappers", + "//java/google/registry/util", "//third_party/java/json_simple", "//third_party/java/jsr305_annotations", "//third_party/java/servlet/servlet_api", diff --git a/java/google/registry/ui/server/api/CheckApiServlet.java b/java/google/registry/ui/server/api/CheckApiServlet.java index ea20b22cd..b50d4065f 100644 --- a/java/google/registry/ui/server/api/CheckApiServlet.java +++ b/java/google/registry/ui/server/api/CheckApiServlet.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.api; +package google.registry.ui.server.api; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Strings.nullToEmpty; import static com.google.common.net.HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN; -import static com.google.domain.registry.model.eppcommon.ProtocolDefinition.ServiceExtension.FEE_0_6; -import static com.google.domain.registry.ui.server.SoyTemplateUtils.createTofuSupplier; -import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName; -import static com.google.domain.registry.util.DomainNameUtils.getTldFromDomainName; +import static google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension.FEE_0_6; +import static google.registry.ui.server.SoyTemplateUtils.createTofuSupplier; +import static google.registry.util.DomainNameUtils.canonicalizeDomainName; +import static google.registry.util.DomainNameUtils.getTldFromDomainName; import static java.nio.charset.StandardCharsets.UTF_8; import static org.json.simple.JSONValue.toJSONString; @@ -28,25 +28,26 @@ import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.MediaType; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.flows.EppXmlTransformer; -import com.google.domain.registry.flows.FlowRunner; -import com.google.domain.registry.flows.FlowRunner.CommitMode; -import com.google.domain.registry.flows.FlowRunner.UserPrivileges; -import com.google.domain.registry.flows.SessionMetadata.SessionSource; -import com.google.domain.registry.flows.StatelessRequestSessionMetadata; -import com.google.domain.registry.flows.domain.DomainCheckFlow; -import com.google.domain.registry.model.domain.fee.FeeCheckResponseExtension; -import com.google.domain.registry.model.domain.fee.FeeCheckResponseExtension.FeeCheck; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.eppinput.EppInput; -import com.google.domain.registry.model.eppoutput.CheckData.DomainCheck; -import com.google.domain.registry.model.eppoutput.CheckData.DomainCheckData; -import com.google.domain.registry.model.eppoutput.Response; -import com.google.domain.registry.ui.soy.api.DomainCheckFeeEppSoyInfo; import com.google.template.soy.tofu.SoyTofu; +import google.registry.config.RegistryEnvironment; +import google.registry.flows.EppException; +import google.registry.flows.EppXmlTransformer; +import google.registry.flows.FlowRunner; +import google.registry.flows.FlowRunner.CommitMode; +import google.registry.flows.FlowRunner.UserPrivileges; +import google.registry.flows.SessionMetadata.SessionSource; +import google.registry.flows.StatelessRequestSessionMetadata; +import google.registry.flows.domain.DomainCheckFlow; +import google.registry.model.domain.fee.FeeCheckResponseExtension; +import google.registry.model.domain.fee.FeeCheckResponseExtension.FeeCheck; +import google.registry.model.eppcommon.Trid; +import google.registry.model.eppinput.EppInput; +import google.registry.model.eppoutput.CheckData.DomainCheck; +import google.registry.model.eppoutput.CheckData.DomainCheckData; +import google.registry.model.eppoutput.Response; +import google.registry.ui.soy.api.DomainCheckFeeEppSoyInfo; + import java.io.IOException; import java.util.Map; diff --git a/java/google/registry/ui/server/api/package-info.java b/java/google/registry/ui/server/api/package-info.java index fc410c5a5..849951978 100644 --- a/java/google/registry/ui/server/api/package-info.java +++ b/java/google/registry/ui/server/api/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.ui.server.api; +package google.registry.ui.server.api; diff --git a/java/google/registry/ui/server/package-info.java b/java/google/registry/ui/server/package-info.java index 65e8541fb..6b117050f 100644 --- a/java/google/registry/ui/server/package-info.java +++ b/java/google/registry/ui/server/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.ui.server; +package google.registry.ui.server; diff --git a/java/google/registry/ui/server/registrar/BUILD b/java/google/registry/ui/server/registrar/BUILD index 252e4b09f..c5f93bd36 100644 --- a/java/google/registry/ui/server/registrar/BUILD +++ b/java/google/registry/ui/server/registrar/BUILD @@ -1,12 +1,14 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 java_library( name = "registrar", srcs = glob(["*.java"]), resources = [ - "//java/com/google/domain/registry/ui/css:registrar_bin.css.js", - "//java/com/google/domain/registry/ui/css:registrar_dbg.css.js", + "//java/google/registry/ui/css:registrar_bin.css.js", + "//java/google/registry/ui/css:registrar_dbg.css.js", ], deps = [ "//java/com/google/common/annotations", @@ -14,19 +16,19 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/braintree", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/export/sheet", - "//java/com/google/domain/registry/flows", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/security", - "//java/com/google/domain/registry/security:servlets", - "//java/com/google/domain/registry/ui/forms", - "//java/com/google/domain/registry/ui/server", - "//java/com/google/domain/registry/ui/soy:soy_java_wrappers", - "//java/com/google/domain/registry/ui/soy/registrar:soy_java_wrappers", - "//java/com/google/domain/registry/util", + "//java/google/registry/braintree", + "//java/google/registry/config", + "//java/google/registry/export/sheet", + "//java/google/registry/flows", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/security", + "//java/google/registry/security:servlets", + "//java/google/registry/ui/forms", + "//java/google/registry/ui/server", + "//java/google/registry/ui/soy:soy_java_wrappers", + "//java/google/registry/ui/soy/registrar:soy_java_wrappers", + "//java/google/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/braintree", "//third_party/java/dagger", diff --git a/java/google/registry/ui/server/registrar/ConsoleUiAction.java b/java/google/registry/ui/server/registrar/ConsoleUiAction.java index 16c293757..c8acb4c37 100644 --- a/java/google/registry/ui/server/registrar/ConsoleUiAction.java +++ b/java/google/registry/ui/server/registrar/ConsoleUiAction.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.net.HttpHeaders.X_FRAME_OPTIONS; import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; @@ -23,18 +23,19 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Supplier; import com.google.common.io.Resources; import com.google.common.net.MediaType; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.flows.EppConsoleServlet; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.security.XsrfTokenManager; -import com.google.domain.registry.ui.server.SoyTemplateUtils; -import com.google.domain.registry.ui.soy.registrar.ConsoleSoyInfo; import com.google.template.soy.data.SoyMapData; import com.google.template.soy.shared.SoyCssRenamingMap; import com.google.template.soy.tofu.SoyTofu; +import google.registry.config.ConfigModule.Config; +import google.registry.flows.EppConsoleServlet; +import google.registry.model.registrar.Registrar; +import google.registry.request.Action; +import google.registry.request.Response; +import google.registry.security.XsrfTokenManager; +import google.registry.ui.server.SoyTemplateUtils; +import google.registry.ui.soy.registrar.ConsoleSoyInfo; + import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; @@ -46,14 +47,14 @@ public final class ConsoleUiAction implements Runnable { private static final Supplier TOFU_SUPPLIER = SoyTemplateUtils.createTofuSupplier( - com.google.domain.registry.ui.soy.ConsoleSoyInfo.getInstance(), - com.google.domain.registry.ui.soy.registrar.ConsoleSoyInfo.getInstance()); + google.registry.ui.soy.ConsoleSoyInfo.getInstance(), + google.registry.ui.soy.registrar.ConsoleSoyInfo.getInstance()); @VisibleForTesting // webdriver and screenshot tests need this public static final Supplier CSS_RENAMING_MAP_SUPPLIER = SoyTemplateUtils.createCssRenamingMapSupplier( - Resources.getResource("com/google/domain/registry/ui/css/registrar_bin.css.js"), - Resources.getResource("com/google/domain/registry/ui/css/registrar_dbg.css.js")); + Resources.getResource("google/registry/ui/css/registrar_bin.css.js"), + Resources.getResource("google/registry/ui/css/registrar_dbg.css.js")); @Inject HttpServletRequest req; @Inject Response response; diff --git a/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java b/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java index c84ffbea6..100eeae26 100644 --- a/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java +++ b/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java @@ -12,26 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Strings.emptyToNull; import static com.google.common.base.Verify.verify; -import static com.google.domain.registry.security.JsonResponseHelper.Status.ERROR; -import static com.google.domain.registry.security.JsonResponseHelper.Status.SUCCESS; +import static google.registry.security.JsonResponseHelper.Status.ERROR; +import static google.registry.security.JsonResponseHelper.Status.SUCCESS; import static java.util.Arrays.asList; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.JsonActionRunner; -import com.google.domain.registry.request.JsonActionRunner.JsonAction; -import com.google.domain.registry.security.JsonResponseHelper; -import com.google.domain.registry.ui.forms.FormField; -import com.google.domain.registry.ui.forms.FormFieldException; -import com.google.domain.registry.util.FormattingLogger; import com.braintreegateway.BraintreeGateway; import com.braintreegateway.Result; @@ -40,6 +31,16 @@ import com.braintreegateway.TransactionRequest; import com.braintreegateway.ValidationError; import com.braintreegateway.ValidationErrors; +import google.registry.config.ConfigModule.Config; +import google.registry.model.registrar.Registrar; +import google.registry.request.Action; +import google.registry.request.JsonActionRunner; +import google.registry.request.JsonActionRunner.JsonAction; +import google.registry.security.JsonResponseHelper; +import google.registry.ui.forms.FormField; +import google.registry.ui.forms.FormFieldException; +import google.registry.util.FormattingLogger; + import org.joda.money.CurrencyUnit; import org.joda.money.IllegalCurrencyException; import org.joda.money.Money; diff --git a/java/google/registry/ui/server/registrar/RegistrarPaymentSetupAction.java b/java/google/registry/ui/server/registrar/RegistrarPaymentSetupAction.java index 72e42cfbc..9d38feb1d 100644 --- a/java/google/registry/ui/server/registrar/RegistrarPaymentSetupAction.java +++ b/java/google/registry/ui/server/registrar/RegistrarPaymentSetupAction.java @@ -12,25 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.base.Functions.toStringFunction; -import static com.google.domain.registry.security.JsonResponseHelper.Status.ERROR; -import static com.google.domain.registry.security.JsonResponseHelper.Status.SUCCESS; +import static google.registry.security.JsonResponseHelper.Status.ERROR; +import static google.registry.security.JsonResponseHelper.Status.SUCCESS; import static java.util.Arrays.asList; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.braintree.BraintreeRegistrarSyncer; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.JsonActionRunner; -import com.google.domain.registry.request.JsonActionRunner.JsonAction; -import com.google.domain.registry.security.JsonResponseHelper; import com.braintreegateway.BraintreeGateway; +import google.registry.braintree.BraintreeRegistrarSyncer; +import google.registry.config.ConfigModule.Config; +import google.registry.model.registrar.Registrar; +import google.registry.request.Action; +import google.registry.request.JsonActionRunner; +import google.registry.request.JsonActionRunner.JsonAction; +import google.registry.security.JsonResponseHelper; + import org.joda.money.CurrencyUnit; import java.util.Map; diff --git a/java/google/registry/ui/server/registrar/RegistrarServlet.java b/java/google/registry/ui/server/registrar/RegistrarServlet.java index de4b8e0d0..881cb650f 100644 --- a/java/google/registry/ui/server/registrar/RegistrarServlet.java +++ b/java/google/registry/ui/server/registrar/RegistrarServlet.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.collect.Iterables.any; import static com.google.common.collect.Iterables.concat; import static com.google.common.collect.Sets.difference; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.security.JsonResponseHelper.Status.SUCCESS; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.security.JsonResponseHelper.Status.SUCCESS; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -27,21 +27,22 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; -import com.google.domain.registry.config.RegistryConfig; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.export.sheet.SyncRegistrarsSheetAction; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.security.JsonResponseHelper; -import com.google.domain.registry.ui.forms.FormException; -import com.google.domain.registry.ui.server.RegistrarFormFields; -import com.google.domain.registry.util.CidrAddressBlock; -import com.google.domain.registry.util.CollectionUtils; -import com.google.domain.registry.util.DiffUtils; -import com.google.domain.registry.util.SendEmailUtils; import com.googlecode.objectify.Work; +import google.registry.config.RegistryConfig; +import google.registry.config.RegistryEnvironment; +import google.registry.export.sheet.SyncRegistrarsSheetAction; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.security.JsonResponseHelper; +import google.registry.ui.forms.FormException; +import google.registry.ui.server.RegistrarFormFields; +import google.registry.util.CidrAddressBlock; +import google.registry.util.CollectionUtils; +import google.registry.util.DiffUtils; +import google.registry.util.SendEmailUtils; + import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; diff --git a/java/google/registry/ui/server/registrar/RegistrarUserModule.java b/java/google/registry/ui/server/registrar/RegistrarUserModule.java index a48922b2a..5da636f1e 100644 --- a/java/google/registry/ui/server/registrar/RegistrarUserModule.java +++ b/java/google/registry/ui/server/registrar/RegistrarUserModule.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; - -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.request.HttpException.ForbiddenException; +package google.registry.ui.server.registrar; import dagger.Module; import dagger.Provides; +import google.registry.model.registrar.Registrar; +import google.registry.request.HttpException.ForbiddenException; + import javax.servlet.http.HttpServletRequest; /** Registrar Console module providing reference to logged-in {@link Registrar}. */ diff --git a/java/google/registry/ui/server/registrar/ResourceServlet.java b/java/google/registry/ui/server/registrar/ResourceServlet.java index 30a989e62..1a101c4bd 100644 --- a/java/google/registry/ui/server/registrar/ResourceServlet.java +++ b/java/google/registry/ui/server/registrar/ResourceServlet.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.appengine.api.users.UserServiceFactory.getUserService; -import static com.google.domain.registry.flows.EppConsoleServlet.XSRF_SCOPE; -import static com.google.domain.registry.security.JsonResponseHelper.Status.ERROR; +import static google.registry.flows.EppConsoleServlet.XSRF_SCOPE; +import static google.registry.security.JsonResponseHelper.Status.ERROR; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.request.HttpException.NotFoundException; -import com.google.domain.registry.security.JsonResponseHelper; -import com.google.domain.registry.security.JsonTransportServlet; -import com.google.domain.registry.ui.forms.FormException; -import com.google.domain.registry.ui.forms.FormFieldException; -import com.google.domain.registry.util.NonFinalForTesting; + +import google.registry.request.HttpException.NotFoundException; +import google.registry.security.JsonResponseHelper; +import google.registry.security.JsonTransportServlet; +import google.registry.ui.forms.FormException; +import google.registry.ui.forms.FormFieldException; +import google.registry.util.NonFinalForTesting; import java.util.Map; diff --git a/java/google/registry/ui/server/registrar/SessionUtils.java b/java/google/registry/ui/server/registrar/SessionUtils.java index 26732d792..67ea8ad84 100644 --- a/java/google/registry/ui/server/registrar/SessionUtils.java +++ b/java/google/registry/ui/server/registrar/SessionUtils.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Verify.verify; import static com.google.common.net.HttpHeaders.LOCATION; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import static javax.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; import com.google.appengine.api.users.User; @@ -26,9 +26,10 @@ import com.google.appengine.api.users.UserService; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.util.FormattingLogger; import javax.annotation.CheckReturnValue; import javax.annotation.Nonnull; diff --git a/java/google/registry/ui/server/registrar/package-info.java b/java/google/registry/ui/server/registrar/package-info.java index ed1a68011..1de4a61bd 100644 --- a/java/google/registry/ui/server/registrar/package-info.java +++ b/java/google/registry/ui/server/registrar/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; diff --git a/java/google/registry/ui/soy/BUILD b/java/google/registry/ui/soy/BUILD index 92586347d..6e661dbd6 100644 --- a/java/google/registry/ui/soy/BUILD +++ b/java/google/registry/ui/soy/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 load("//third_party/closure/templates:closure_template_java_library.bzl", "closure_template_java_library") load("//third_party/closure/templates:closure_template_js_library.bzl", "closure_template_js_library") @@ -15,17 +17,17 @@ filegroup( closure_template_java_library( name = "soy_java_wrappers", srcs = glob(["*.soy"]), - java_package = "com.google.domain.registry.ui.soy", + java_package = "google.registry.ui.soy", ) closure_template_js_library( name = "Console", srcs = ["Console.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", + globals = "//java/google/registry/ui:globals.txt", ) closure_template_js_library( name = "Forms", srcs = ["Forms.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", + globals = "//java/google/registry/ui:globals.txt", ) diff --git a/java/google/registry/ui/soy/Console.soy b/java/google/registry/ui/soy/Console.soy index 8a61667eb..851508665 100644 --- a/java/google/registry/ui/soy/Console.soy +++ b/java/google/registry/ui/soy/Console.soy @@ -31,17 +31,17 @@ Domain Registry {if isNonnull($subtitle)} - {$subtitle}{/if} {switch DEBUG} - {case com.google.domain.registry.ui.ConsoleDebug.PRODUCTION} + {case google.registry.ui.ConsoleDebug.PRODUCTION} - {case com.google.domain.registry.ui.ConsoleDebug.DEBUG} + {case google.registry.ui.ConsoleDebug.DEBUG} - {case com.google.domain.registry.ui.ConsoleDebug.RAW} + {case google.registry.ui.ConsoleDebug.RAW} {if $app == 'admin'} + href="/assets/sources/java/google/registry/ui/css/admin_imports_raw.css"> {else} + href="/assets/sources/java/google/registry/ui/css/registrar_imports_raw.css"> {/if} {default} diff --git a/java/google/registry/ui/soy/api/BUILD b/java/google/registry/ui/soy/api/BUILD index c04f31fb1..0dd96abd3 100644 --- a/java/google/registry/ui/soy/api/BUILD +++ b/java/google/registry/ui/soy/api/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 load("//third_party/closure/templates:closure_template_java_library.bzl", "closure_template_java_library") load("//third_party/closure/templates:closure_template_js_library.bzl", "closure_template_js_library") @@ -12,11 +14,11 @@ filegroup( closure_template_java_library( name = "soy_java_wrappers", srcs = glob(["*.soy"]), - java_package = "com.google.domain.registry.ui.soy.api", + java_package = "google.registry.ui.soy.api", ) closure_template_js_library( name = "DomainCheckFeeEpp", srcs = ["DomainCheckFeeEpp.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", + globals = "//java/google/registry/ui:globals.txt", ) diff --git a/java/google/registry/ui/soy/registrar/BUILD b/java/google/registry/ui/soy/registrar/BUILD index b3e450fde..3ef8aa903 100644 --- a/java/google/registry/ui/soy/registrar/BUILD +++ b/java/google/registry/ui/soy/registrar/BUILD @@ -1,4 +1,6 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package(default_visibility = ["//java/google/registry:registry_project"]) + +licenses(["notice"]) # Apache 2.0 load("//third_party/closure/templates:closure_template_java_library.bzl", "closure_template_java_library") load("//third_party/closure/templates:closure_template_js_library.bzl", "closure_template_js_library") @@ -25,84 +27,84 @@ filegroup( closure_template_java_library( name = "soy_java_wrappers", srcs = glob(["*.soy"]), - java_package = "com.google.domain.registry.ui.soy.registrar", + java_package = "google.registry.ui.soy.registrar", ) closure_template_js_library( name = "Console", srcs = ["Console.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", - deps = ["//java/com/google/domain/registry/ui/soy:Console"], + globals = "//java/google/registry/ui:globals.txt", + deps = ["//java/google/registry/ui/soy:Console"], ) closure_template_js_library( name = "ContactEpp", srcs = ["ContactEpp.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", + globals = "//java/google/registry/ui:globals.txt", ) closure_template_js_library( name = "ContactSettings", srcs = ["ContactSettings.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", - deps = ["//java/com/google/domain/registry/ui/soy:Forms"], + globals = "//java/google/registry/ui:globals.txt", + deps = ["//java/google/registry/ui/soy:Forms"], ) closure_template_js_library( name = "Contact", srcs = ["Contact.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", - deps = ["//java/com/google/domain/registry/ui/soy:Forms"], + globals = "//java/google/registry/ui:globals.txt", + deps = ["//java/google/registry/ui/soy:Forms"], ) closure_template_js_library( name = "Domain", srcs = ["Domain.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", - deps = ["//java/com/google/domain/registry/ui/soy:Forms"], + globals = "//java/google/registry/ui:globals.txt", + deps = ["//java/google/registry/ui/soy:Forms"], ) closure_template_js_library( name = "DomainEpp", srcs = ["DomainEpp.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", + globals = "//java/google/registry/ui:globals.txt", ) closure_template_js_library( name = "Epp", srcs = ["Epp.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", + globals = "//java/google/registry/ui:globals.txt", ) closure_template_js_library( name = "HostEpp", srcs = ["HostEpp.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", + globals = "//java/google/registry/ui:globals.txt", ) closure_template_js_library( name = "Host", srcs = ["Host.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", - deps = ["//java/com/google/domain/registry/ui/soy:Forms"], + globals = "//java/google/registry/ui:globals.txt", + deps = ["//java/google/registry/ui/soy:Forms"], ) closure_template_js_library( name = "Payment", srcs = ["Payment.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", - deps = ["//java/com/google/domain/registry/ui/soy:Forms"], + globals = "//java/google/registry/ui:globals.txt", + deps = ["//java/google/registry/ui/soy:Forms"], ) closure_template_js_library( name = "SecuritySettings", srcs = ["SecuritySettings.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", + globals = "//java/google/registry/ui:globals.txt", ) closure_template_js_library( name = "WhoisSettings", srcs = ["WhoisSettings.soy"], - globals = "//java/com/google/domain/registry/ui:globals.txt", - deps = ["//java/com/google/domain/registry/ui/soy:Forms"], + globals = "//java/google/registry/ui:globals.txt", + deps = ["//java/google/registry/ui/soy:Forms"], ) diff --git a/java/google/registry/ui/soy/registrar/Console.soy b/java/google/registry/ui/soy/registrar/Console.soy index 8fc5df8e0..e03f753e9 100644 --- a/java/google/registry/ui/soy/registrar/Console.soy +++ b/java/google/registry/ui/soy/registrar/Console.soy @@ -29,15 +29,15 @@ {switch DEBUG} - {case com.google.domain.registry.ui.ConsoleDebug.PRODUCTION} + {case google.registry.ui.ConsoleDebug.PRODUCTION} {if $isAdmin} {else} {/if} - {case com.google.domain.registry.ui.ConsoleDebug.DEBUG} + {case google.registry.ui.ConsoleDebug.DEBUG} - {case com.google.domain.registry.ui.ConsoleDebug.RAW} + {case google.registry.ui.ConsoleDebug.RAW} diff --git a/java/google/registry/util/AppEngineTimeLimiter.java b/java/google/registry/util/AppEngineTimeLimiter.java index ecd6e2949..aa539f5b3 100644 --- a/java/google/registry/util/AppEngineTimeLimiter.java +++ b/java/google/registry/util/AppEngineTimeLimiter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.appengine.api.ThreadManager.currentRequestThreadFactory; @@ -23,7 +23,6 @@ import java.util.List; import java.util.concurrent.AbstractExecutorService; import java.util.concurrent.TimeUnit; - /** * A factory for {@link TimeLimiter} instances that use request threads, which carry the namespace * and live only as long as the request that spawned them. diff --git a/java/google/registry/util/BUILD b/java/google/registry/util/BUILD index 53735f4f8..6915eb479 100644 --- a/java/google/registry/util/BUILD +++ b/java/google/registry/util/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "util", @@ -19,7 +21,6 @@ java_library( "//java/com/google/common/primitives", "//java/com/google/common/reflect", "//java/com/google/common/util/concurrent", - "//java/com/google/domain/registry/config", "//third_party/java/appengine:appengine-api", "//third_party/java/dagger", "//third_party/java/icu4j", @@ -28,6 +29,7 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", ], ) diff --git a/java/google/registry/util/BasicHttpSession.java b/java/google/registry/util/BasicHttpSession.java index 5fc5dc3ad..2deb14eba 100644 --- a/java/google/registry/util/BasicHttpSession.java +++ b/java/google/registry/util/BasicHttpSession.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import java.util.Enumeration; import java.util.HashMap; diff --git a/java/google/registry/util/CacheUtils.java b/java/google/registry/util/CacheUtils.java index 3d4469afc..ef0742c20 100644 --- a/java/google/registry/util/CacheUtils.java +++ b/java/google/registry/util/CacheUtils.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Suppliers.memoizeWithExpiration; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.joda.time.Duration.ZERO; import com.google.common.base.Supplier; -import com.google.domain.registry.config.RegistryEnvironment; + +import google.registry.config.RegistryEnvironment; import org.joda.time.Duration; diff --git a/java/google/registry/util/CapturingLogHandler.java b/java/google/registry/util/CapturingLogHandler.java index 01e7d5aaf..6c69a2853 100644 --- a/java/google/registry/util/CapturingLogHandler.java +++ b/java/google/registry/util/CapturingLogHandler.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import com.google.common.collect.Iterables; diff --git a/java/google/registry/util/CidrAddressBlock.java b/java/google/registry/util/CidrAddressBlock.java index ff4f2bfac..71f9e3c20 100644 --- a/java/google/registry/util/CidrAddressBlock.java +++ b/java/google/registry/util/CidrAddressBlock.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; diff --git a/java/google/registry/util/Clock.java b/java/google/registry/util/Clock.java index 36d629190..0eb3e669c 100644 --- a/java/google/registry/util/Clock.java +++ b/java/google/registry/util/Clock.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import org.joda.time.DateTime; diff --git a/java/google/registry/util/CollectionUtils.java b/java/google/registry/util/CollectionUtils.java index 3f939716c..43d2c3de5 100644 --- a/java/google/registry/util/CollectionUtils.java +++ b/java/google/registry/util/CollectionUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.collect.Iterables.isEmpty; diff --git a/java/google/registry/util/Concurrent.java b/java/google/registry/util/Concurrent.java index 6d49e3389..ff21d333e 100644 --- a/java/google/registry/util/Concurrent.java +++ b/java/google/registry/util/Concurrent.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.appengine.api.ThreadManager.currentRequestThreadFactory; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/util/DatastoreServiceUtils.java b/java/google/registry/util/DatastoreServiceUtils.java index 1ce0e6f64..c15ce72e7 100644 --- a/java/google/registry/util/DatastoreServiceUtils.java +++ b/java/google/registry/util/DatastoreServiceUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import com.google.appengine.api.datastore.Key; import com.google.common.base.Function; diff --git a/java/google/registry/util/DateTimeUtils.java b/java/google/registry/util/DateTimeUtils.java index fd23b366b..2bedeb091 100644 --- a/java/google/registry/util/DateTimeUtils.java +++ b/java/google/registry/util/DateTimeUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; diff --git a/java/google/registry/util/DiffUtils.java b/java/google/registry/util/DiffUtils.java index 87dd67144..7baf17d04 100644 --- a/java/google/registry/util/DiffUtils.java +++ b/java/google/registry/util/DiffUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.Lists.newArrayList; diff --git a/java/google/registry/util/DomainNameUtils.java b/java/google/registry/util/DomainNameUtils.java index 6f548e840..d040f6d5a 100644 --- a/java/google/registry/util/DomainNameUtils.java +++ b/java/google/registry/util/DomainNameUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; @@ -48,7 +48,7 @@ public final class DomainNameUtils { *

    This function is compatible with multi-part tlds, e.g. {@code co.uk}. This function will * also work on domains for which the registry is not authoritative. If you are certain that the * input will be under a TLD this registry controls, then it is preferable to use - * {@link com.google.domain.registry.model.registry.Registries#findTldForName(InternetDomainName) + * {@link google.registry.model.registry.Registries#findTldForName(InternetDomainName) * Registries#findTldForName}, which will work on hostnames in addition to domains. * * @param fullyQualifiedDomainName must be a punycode SLD (not a host or unicode) diff --git a/java/google/registry/util/FixedClock.java b/java/google/registry/util/FixedClock.java index e251ff3d2..92dcb2642 100644 --- a/java/google/registry/util/FixedClock.java +++ b/java/google/registry/util/FixedClock.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/java/google/registry/util/FormattingLogger.java b/java/google/registry/util/FormattingLogger.java index bb5f7a392..8579f0fb0 100644 --- a/java/google/registry/util/FormattingLogger.java +++ b/java/google/registry/util/FormattingLogger.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static java.util.Arrays.asList; diff --git a/java/google/registry/util/HexDumper.java b/java/google/registry/util/HexDumper.java index 6e0c2f7d8..0e7ab828a 100644 --- a/java/google/registry/util/HexDumper.java +++ b/java/google/registry/util/HexDumper.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/util/Idn.java b/java/google/registry/util/Idn.java index a62c4f6b4..d372b5b64 100644 --- a/java/google/registry/util/Idn.java +++ b/java/google/registry/util/Idn.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import com.google.common.base.Joiner; diff --git a/java/google/registry/util/ImprovedInputStream.java b/java/google/registry/util/ImprovedInputStream.java index 70440aca2..87d01838d 100644 --- a/java/google/registry/util/ImprovedInputStream.java +++ b/java/google/registry/util/ImprovedInputStream.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/util/ImprovedOutputStream.java b/java/google/registry/util/ImprovedOutputStream.java index 3d916104e..2c86afa91 100644 --- a/java/google/registry/util/ImprovedOutputStream.java +++ b/java/google/registry/util/ImprovedOutputStream.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/util/ListNamingUtils.java b/java/google/registry/util/ListNamingUtils.java index 23e20a100..f7dc921c9 100644 --- a/java/google/registry/util/ListNamingUtils.java +++ b/java/google/registry/util/ListNamingUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import com.google.common.io.Files; diff --git a/java/google/registry/util/NetworkUtils.java b/java/google/registry/util/NetworkUtils.java index 0c3a2c68d..7f962d42d 100644 --- a/java/google/registry/util/NetworkUtils.java +++ b/java/google/registry/util/NetworkUtils.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.util.CollectionUtils.union; +import static google.registry.util.CollectionUtils.union; import com.google.common.collect.ImmutableSet; diff --git a/java/google/registry/util/NonFinalForTesting.java b/java/google/registry/util/NonFinalForTesting.java index e6b861c8f..02fb11f77 100644 --- a/java/google/registry/util/NonFinalForTesting.java +++ b/java/google/registry/util/NonFinalForTesting.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; @@ -32,7 +32,7 @@ import java.lang.annotation.Target; *

    When this annotation is used on methods, it means that you should not override the method * and it's only non-{@code final} so it can be mocked. * - * @see com.google.domain.registry.testing.InjectRule + * @see google.registry.testing.InjectRule */ @Documented @Retention(SOURCE) diff --git a/java/google/registry/util/ObjectifyUtils.java b/java/google/registry/util/ObjectifyUtils.java index 4a56e7988..23251d12c 100644 --- a/java/google/registry/util/ObjectifyUtils.java +++ b/java/google/registry/util/ObjectifyUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import com.google.common.base.Function; diff --git a/java/google/registry/util/PathargMatcher.java b/java/google/registry/util/PathargMatcher.java index 462332c0c..eec10cf02 100644 --- a/java/google/registry/util/PathargMatcher.java +++ b/java/google/registry/util/PathargMatcher.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import java.util.regex.Pattern; diff --git a/java/google/registry/util/PipelineUtils.java b/java/google/registry/util/PipelineUtils.java index 3d27d543b..a095a08e1 100644 --- a/java/google/registry/util/PipelineUtils.java +++ b/java/google/registry/util/PipelineUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; /** Utilities for working with pipeline jobs. */ public class PipelineUtils { diff --git a/java/google/registry/util/PosixTarHeader.java b/java/google/registry/util/PosixTarHeader.java index 3dcb855b0..400e3d707 100644 --- a/java/google/registry/util/PosixTarHeader.java +++ b/java/google/registry/util/PosixTarHeader.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/util/PreconditionsUtils.java b/java/google/registry/util/PreconditionsUtils.java index 0cad5b952..8f1e85ee6 100644 --- a/java/google/registry/util/PreconditionsUtils.java +++ b/java/google/registry/util/PreconditionsUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; diff --git a/java/google/registry/util/PredicateUtils.java b/java/google/registry/util/PredicateUtils.java index 8c4fc7912..668bb31f2 100644 --- a/java/google/registry/util/PredicateUtils.java +++ b/java/google/registry/util/PredicateUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import com.google.common.base.Predicate; diff --git a/java/google/registry/util/RegistrarUtils.java b/java/google/registry/util/RegistrarUtils.java index 234a2a861..f92901890 100644 --- a/java/google/registry/util/RegistrarUtils.java +++ b/java/google/registry/util/RegistrarUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.CharMatcher.javaLetterOrDigit; diff --git a/java/google/registry/util/ResourceUtils.java b/java/google/registry/util/ResourceUtils.java index 7f486db62..afa12072d 100644 --- a/java/google/registry/util/ResourceUtils.java +++ b/java/google/registry/util/ResourceUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.io.Resources.asByteSource; import static com.google.common.io.Resources.getResource; diff --git a/java/google/registry/util/Retrier.java b/java/google/registry/util/Retrier.java index 1d6270c2e..162d0b191 100644 --- a/java/google/registry/util/Retrier.java +++ b/java/google/registry/util/Retrier.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.appengine.api.search.checkers.Preconditions.checkArgument; import static com.google.common.base.Throwables.propagate; import static com.google.common.collect.Iterables.any; import static com.google.common.math.IntMath.pow; -import static com.google.domain.registry.util.PredicateUtils.supertypeOf; +import static google.registry.util.PredicateUtils.supertypeOf; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.config.ConfigModule.Config; + +import google.registry.config.ConfigModule.Config; import org.joda.time.Duration; diff --git a/java/google/registry/util/SendEmailService.java b/java/google/registry/util/SendEmailService.java index 5f09aff06..b307b8713 100644 --- a/java/google/registry/util/SendEmailService.java +++ b/java/google/registry/util/SendEmailService.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import java.util.Properties; diff --git a/java/google/registry/util/SendEmailUtils.java b/java/google/registry/util/SendEmailUtils.java index 5d7f2677f..744a12be5 100644 --- a/java/google/registry/util/SendEmailUtils.java +++ b/java/google/registry/util/SendEmailUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.collect.Iterables.toArray; @@ -21,8 +21,9 @@ import com.google.common.base.Joiner; import com.google.common.base.Predicates; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.config.RegistryConfig; -import com.google.domain.registry.config.RegistryEnvironment; + +import google.registry.config.RegistryConfig; +import google.registry.config.RegistryEnvironment; import java.util.List; diff --git a/java/google/registry/util/SerializeUtils.java b/java/google/registry/util/SerializeUtils.java index 02858ac68..caaadb4b6 100644 --- a/java/google/registry/util/SerializeUtils.java +++ b/java/google/registry/util/SerializeUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.io.BaseEncoding.base16; diff --git a/java/google/registry/util/Sleeper.java b/java/google/registry/util/Sleeper.java index cf211575b..45858ad87 100644 --- a/java/google/registry/util/Sleeper.java +++ b/java/google/registry/util/Sleeper.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import org.joda.time.ReadableDuration; @@ -22,7 +22,7 @@ import javax.annotation.concurrent.ThreadSafe; * An object which accepts requests to put the current thread to sleep. * * @see SystemSleeper - * @see com.google.domain.registry.testing.FakeSleeper + * @see google.registry.testing.FakeSleeper */ @ThreadSafe public interface Sleeper { diff --git a/java/google/registry/util/SqlTemplate.java b/java/google/registry/util/SqlTemplate.java index b77c93c66..66d72a8ba 100644 --- a/java/google/registry/util/SqlTemplate.java +++ b/java/google/registry/util/SqlTemplate.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Sets.difference; -import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull; +import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.common.base.CharMatcher; import com.google.common.base.Joiner; diff --git a/java/google/registry/util/SystemClock.java b/java/google/registry/util/SystemClock.java index 181876592..8e50303d6 100644 --- a/java/google/registry/util/SystemClock.java +++ b/java/google/registry/util/SystemClock.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static org.joda.time.DateTimeZone.UTC; diff --git a/java/google/registry/util/SystemSleeper.java b/java/google/registry/util/SystemSleeper.java index 3f449ef56..cd3582aec 100644 --- a/java/google/registry/util/SystemSleeper.java +++ b/java/google/registry/util/SystemSleeper.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; diff --git a/java/google/registry/util/TaskEnqueuer.java b/java/google/registry/util/TaskEnqueuer.java index ba95a840a..4403de732 100644 --- a/java/google/registry/util/TaskEnqueuer.java +++ b/java/google/registry/util/TaskEnqueuer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static java.util.Arrays.asList; diff --git a/java/google/registry/util/TeeOutputStream.java b/java/google/registry/util/TeeOutputStream.java index 83f789f21..5b231a535 100644 --- a/java/google/registry/util/TeeOutputStream.java +++ b/java/google/registry/util/TeeOutputStream.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/java/google/registry/util/TypeUtils.java b/java/google/registry/util/TypeUtils.java index c0e00b722..bdd70fb46 100644 --- a/java/google/registry/util/TypeUtils.java +++ b/java/google/registry/util/TypeUtils.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.util.CollectionUtils.difference; +import static google.registry.util.CollectionUtils.difference; import static java.lang.reflect.Modifier.isFinal; import static java.lang.reflect.Modifier.isStatic; diff --git a/java/google/registry/util/UrlFetchException.java b/java/google/registry/util/UrlFetchException.java index 92047da83..b7ad6b500 100644 --- a/java/google/registry/util/UrlFetchException.java +++ b/java/google/registry/util/UrlFetchException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/java/google/registry/util/UrlFetchUtils.java b/java/google/registry/util/UrlFetchUtils.java index d245be1f4..aa3d065ef 100644 --- a/java/google/registry/util/UrlFetchUtils.java +++ b/java/google/registry/util/UrlFetchUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.io.BaseEncoding.base32; import static com.google.common.io.BaseEncoding.base64; diff --git a/java/google/registry/util/X509Utils.java b/java/google/registry/util/X509Utils.java index f2510efed..96e4b4da1 100644 --- a/java/google/registry/util/X509Utils.java +++ b/java/google/registry/util/X509Utils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/util/XmlEnumUtils.java b/java/google/registry/util/XmlEnumUtils.java index 6d5df0f1c..1a698cd84 100644 --- a/java/google/registry/util/XmlEnumUtils.java +++ b/java/google/registry/util/XmlEnumUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/java/google/registry/util/package-info.java b/java/google/registry/util/package-info.java index 971c404fb..0a9b1dced 100644 --- a/java/google/registry/util/package-info.java +++ b/java/google/registry/util/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.util; +package google.registry.util; diff --git a/java/google/registry/whois/BUILD b/java/google/registry/whois/BUILD index 33a0d4e36..a71efd5d4 100644 --- a/java/google/registry/whois/BUILD +++ b/java/google/registry/whois/BUILD @@ -1,7 +1,9 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "whois", @@ -15,11 +17,6 @@ java_library( "//java/com/google/common/html", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/xml", "//third_party/java/appengine:appengine-api", "//third_party/java/dagger", "//third_party/java/joda_time", @@ -27,5 +24,10 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", + "//java/google/registry/config", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/util", + "//java/google/registry/xml", ], ) diff --git a/java/google/registry/whois/DomainLookupCommand.java b/java/google/registry/whois/DomainLookupCommand.java index c2c86ec71..6e50a378b 100644 --- a/java/google/registry/whois/DomainLookupCommand.java +++ b/java/google/registry/whois/DomainLookupCommand.java @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.model.domain.DomainResource; + +import google.registry.model.domain.DomainResource; import org.joda.time.DateTime; diff --git a/java/google/registry/whois/DomainOrHostLookupCommand.java b/java/google/registry/whois/DomainOrHostLookupCommand.java index 95daee15b..03483399e 100644 --- a/java/google/registry/whois/DomainOrHostLookupCommand.java +++ b/java/google/registry/whois/DomainOrHostLookupCommand.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.model.registry.Registries.findTldForName; -import static com.google.domain.registry.model.registry.Registries.getTlds; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.model.registry.Registries.findTldForName; +import static google.registry.model.registry.Registries.getTlds; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; + +import google.registry.model.EppResource; +import google.registry.util.TypeUtils.TypeInstantiator; import org.joda.time.DateTime; diff --git a/java/google/registry/whois/DomainWhoisResponse.java b/java/google/registry/whois/DomainWhoisResponse.java index e7955bbe9..09cd553b3 100644 --- a/java/google/registry/whois/DomainWhoisResponse.java +++ b/java/google/registry/whois/DomainWhoisResponse.java @@ -12,30 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.tryFind; -import static com.google.domain.registry.util.CollectionUtils.isNullOrEmpty; -import static com.google.domain.registry.xml.UtcDateTimeAdapter.getFormattedString; +import static google.registry.util.CollectionUtils.isNullOrEmpty; +import static google.registry.xml.UtcDateTimeAdapter.getFormattedString; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.contact.ContactPhoneNumber; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.PostalInfo; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.DesignatedContact.Type; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.translators.EnumToAttributeAdapter.EppEnum; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.model.contact.ContactPhoneNumber; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.PostalInfo; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.DesignatedContact.Type; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.host.HostResource; +import google.registry.model.registrar.Registrar; +import google.registry.model.translators.EnumToAttributeAdapter.EppEnum; +import google.registry.util.FormattingLogger; import org.joda.time.DateTime; diff --git a/java/google/registry/whois/NameserverLookupByHostCommand.java b/java/google/registry/whois/NameserverLookupByHostCommand.java index 792c3e0bd..304b28f67 100644 --- a/java/google/registry/whois/NameserverLookupByHostCommand.java +++ b/java/google/registry/whois/NameserverLookupByHostCommand.java @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.model.host.HostResource; + +import google.registry.model.host.HostResource; import org.joda.time.DateTime; diff --git a/java/google/registry/whois/NameserverLookupByIpCommand.java b/java/google/registry/whois/NameserverLookupByIpCommand.java index 5f6667c41..dcdbb65b6 100644 --- a/java/google/registry/whois/NameserverLookupByIpCommand.java +++ b/java/google/registry/whois/NameserverLookupByIpCommand.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.domain.registry.model.EppResourceUtils.queryNotDeleted; +import static google.registry.model.EppResourceUtils.queryNotDeleted; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.common.annotations.VisibleForTesting; @@ -23,8 +23,9 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.registry.Registries; + +import google.registry.model.host.HostResource; +import google.registry.model.registry.Registries; import org.joda.time.DateTime; diff --git a/java/google/registry/whois/NameserverWhoisResponse.java b/java/google/registry/whois/NameserverWhoisResponse.java index d8ba036bf..72a1c562a 100644 --- a/java/google/registry/whois/NameserverWhoisResponse.java +++ b/java/google/registry/whois/NameserverWhoisResponse.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.net.InetAddresses; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.registrar.Registrar; + +import google.registry.model.host.HostResource; +import google.registry.model.registrar.Registrar; import org.joda.time.DateTime; diff --git a/java/google/registry/whois/RegistrarLookupCommand.java b/java/google/registry/whois/RegistrarLookupCommand.java index 94639fbb9..b754b2703 100644 --- a/java/google/registry/whois/RegistrarLookupCommand.java +++ b/java/google/registry/whois/RegistrarLookupCommand.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; -import static com.google.domain.registry.util.CacheUtils.memoizeWithShortExpiration; -import static com.google.domain.registry.util.RegistrarUtils.normalizeRegistrarName; +import static google.registry.util.CacheUtils.memoizeWithShortExpiration; +import static google.registry.util.RegistrarUtils.normalizeRegistrarName; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.common.annotations.VisibleForTesting; @@ -26,8 +26,9 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.model.registrar.Registrar; +import google.registry.util.FormattingLogger; import org.joda.time.DateTime; diff --git a/java/google/registry/whois/RegistrarWhoisResponse.java b/java/google/registry/whois/RegistrarWhoisResponse.java index 82e0446ab..ca14493f1 100644 --- a/java/google/registry/whois/RegistrarWhoisResponse.java +++ b/java/google/registry/whois/RegistrarWhoisResponse.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; import org.joda.time.DateTime; diff --git a/java/google/registry/whois/Whois.java b/java/google/registry/whois/Whois.java index ad11e7985..c0f4c31e2 100644 --- a/java/google/registry/whois/Whois.java +++ b/java/google/registry/whois/Whois.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; -import com.google.domain.registry.util.Clock; +import google.registry.util.Clock; import org.joda.time.DateTime; diff --git a/java/google/registry/whois/WhoisCommand.java b/java/google/registry/whois/WhoisCommand.java index eb8e64d4f..4863d3126 100644 --- a/java/google/registry/whois/WhoisCommand.java +++ b/java/google/registry/whois/WhoisCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import org.joda.time.DateTime; diff --git a/java/google/registry/whois/WhoisException.java b/java/google/registry/whois/WhoisException.java index c277dcc6b..9c3e4cc3d 100644 --- a/java/google/registry/whois/WhoisException.java +++ b/java/google/registry/whois/WhoisException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/google/registry/whois/WhoisHttpServer.java b/java/google/registry/whois/WhoisHttpServer.java index b3ef3809a..7d555a483 100644 --- a/java/google/registry/whois/WhoisHttpServer.java +++ b/java/google/registry/whois/WhoisHttpServer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.base.Strings.nullToEmpty; import static com.google.common.base.Verify.verify; @@ -27,12 +27,13 @@ import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.base.Joiner; import com.google.common.base.Splitter; -import com.google.domain.registry.config.ConfigModule.Config; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.RequestPath; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.config.ConfigModule.Config; +import google.registry.request.Action; +import google.registry.request.RequestPath; +import google.registry.request.Response; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/whois/WhoisModule.java b/java/google/registry/whois/WhoisModule.java index 1a2b36ee0..fd7a0585c 100644 --- a/java/google/registry/whois/WhoisModule.java +++ b/java/google/registry/whois/WhoisModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import dagger.Module; import dagger.Provides; @@ -28,10 +28,10 @@ import javax.servlet.http.HttpServletRequest; *

    Dependencies

    * *
      - *
    • {@link com.google.domain.registry.request.RequestModule RequestModule} + *
    • {@link google.registry.request.RequestModule RequestModule} *
    * - * @see "com.google.domain.registry.module.frontend.FrontendComponent" + * @see "google.registry.module.frontend.FrontendComponent" */ @Module public final class WhoisModule { diff --git a/java/google/registry/whois/WhoisReader.java b/java/google/registry/whois/WhoisReader.java index 0d2f26e55..b72debd8e 100644 --- a/java/google/registry/whois/WhoisReader.java +++ b/java/google/registry/whois/WhoisReader.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Strings.isNullOrEmpty; -import static com.google.domain.registry.model.registry.Registries.findTldForName; -import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName; +import static google.registry.model.registry.Registries.findTldForName; +import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import com.google.common.base.Joiner; diff --git a/java/google/registry/whois/WhoisResponse.java b/java/google/registry/whois/WhoisResponse.java index d2d5c6673..fd593716f 100644 --- a/java/google/registry/whois/WhoisResponse.java +++ b/java/google/registry/whois/WhoisResponse.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import org.joda.time.DateTime; diff --git a/java/google/registry/whois/WhoisResponseImpl.java b/java/google/registry/whois/WhoisResponseImpl.java index 9201c0f1a..62c03934b 100644 --- a/java/google/registry/whois/WhoisResponseImpl.java +++ b/java/google/registry/whois/WhoisResponseImpl.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Strings.isNullOrEmpty; @@ -27,10 +27,11 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; import com.google.common.io.Resources; -import com.google.domain.registry.model.eppcommon.Address; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.util.Idn; -import com.google.domain.registry.xml.UtcDateTimeAdapter; + +import google.registry.model.eppcommon.Address; +import google.registry.model.registrar.Registrar; +import google.registry.util.Idn; +import google.registry.xml.UtcDateTimeAdapter; import org.joda.time.DateTime; @@ -42,7 +43,6 @@ import java.util.Set; import javax.annotation.Nullable; - /** Base class for responses to WHOIS queries. */ abstract class WhoisResponseImpl implements WhoisResponse { diff --git a/java/google/registry/whois/WhoisServer.java b/java/google/registry/whois/WhoisServer.java index 1cf7c5c6d..b78c0cfbe 100644 --- a/java/google/registry/whois/WhoisServer.java +++ b/java/google/registry/whois/WhoisServer.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; -import static com.google.domain.registry.request.Action.Method.POST; +import static google.registry.request.Action.Method.POST; import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.net.MediaType; -import com.google.domain.registry.request.Action; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.request.Action; +import google.registry.request.Response; +import google.registry.util.Clock; +import google.registry.util.FormattingLogger; import org.joda.time.DateTime; diff --git a/java/google/registry/whois/package-info.java b/java/google/registry/whois/package-info.java index 97429cee4..ca1992234 100644 --- a/java/google/registry/whois/package-info.java +++ b/java/google/registry/whois/package-info.java @@ -13,4 +13,4 @@ // limitations under the License. @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.whois; +package google.registry.whois; diff --git a/java/google/registry/xjc/BUILD b/java/google/registry/xjc/BUILD index 4a7ba1d92..bf0498ccb 100644 --- a/java/google/registry/xjc/BUILD +++ b/java/google/registry/xjc/BUILD @@ -1,8 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_visibility = ["//java/google/registry:registry_project"], ) -load("//java/com/google/domain/registry/xjc:generated_files.bzl", "pkginfo_generated_files", "xjc_generated_files") +licenses(["notice"]) # Apache 2.0 + +load("//java/google/registry/xjc:generated_files.bzl", "pkginfo_generated_files", "xjc_generated_files") sh_binary( @@ -10,8 +12,8 @@ sh_binary( srcs = ["list_generated_files.sh"], data = [ "bindings.xjb", - "//java/com/google/domain/registry/xml:xml_schema_files", "//third_party/java/jaxb:jaxb-xjc", + "//java/google/registry/xml:xml_schema_files", ], ) @@ -19,16 +21,17 @@ genrule( name = "jaxb_srcs", srcs = [ "bindings.xjb", - "//java/com/google/domain/registry/xml:xml_schema_files", + "//java/google/registry/xml:xml_schema_files", ], outs = xjc_generated_files, cmd = " && ".join([ "XJC=$$PWD/$(location //third_party/java/jaxb:jaxb-xjc)", - "OUT=$$PWD/$(GENDIR)", + "OUT=$$PWD/$(GENDIR)/java", + "mkdir -p $$OUT", "cp $(SRCS) /tmp", "cd /tmp", - "$$XJC -npa -quiet -extension -d $$OUT/java -b *.xjb *.xsd", - "find $$OUT/java -name '*.java' | xargs sed -i 's/" + + "$$XJC -npa -quiet -extension -d $$OUT -b *.xjb *.xsd", + "find $$OUT -name '*.java' | xargs sed -i 's/" + "public class/" + "@SuppressWarnings({\"unchecked\",\"serial\",\"cast\"}) " + "public class/'", @@ -57,8 +60,8 @@ java_library( srcs = glob(["*.java"]) + xjc_generated_files + pkginfo_generated_files, deps = [ "//java/com/google/common/collect", - "//java/com/google/domain/registry/xml", "//third_party/java/joda_time", "//third_party/java/jsr305_annotations", + "//java/google/registry/xml", ], ) diff --git a/java/google/registry/xjc/README.missing-code b/java/google/registry/xjc/README.missing-code index a06734838..69ca9ade2 100644 --- a/java/google/registry/xjc/README.missing-code +++ b/java/google/registry/xjc/README.missing-code @@ -4,4 +4,4 @@ generated by JAXB from the XML schemas (.xsd) files. Run the command `ant gensrc` and they should be available under: - build/gensrc/com/google/domain/registry/xjc/ + build/gensrc/google/registry/xjc/ diff --git a/java/google/registry/xjc/XjcObject.java b/java/google/registry/xjc/XjcObject.java index 43ea5adf1..26a57d753 100644 --- a/java/google/registry/xjc/XjcObject.java +++ b/java/google/registry/xjc/XjcObject.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.xjc; +package google.registry.xjc; -import com.google.domain.registry.xml.XmlException; +import google.registry.xml.XmlException; import java.io.OutputStream; import java.io.StringWriter; diff --git a/java/google/registry/xjc/XjcXmlTransformer.java b/java/google/registry/xjc/XjcXmlTransformer.java index bf676e721..20159cd88 100644 --- a/java/google/registry/xjc/XjcXmlTransformer.java +++ b/java/google/registry/xjc/XjcXmlTransformer.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.xjc; +package google.registry.xjc; -import static com.google.domain.registry.xml.ValidationMode.LENIENT; -import static com.google.domain.registry.xml.ValidationMode.STRICT; +import static google.registry.xml.ValidationMode.LENIENT; +import static google.registry.xml.ValidationMode.STRICT; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.xml.XmlException; -import com.google.domain.registry.xml.XmlTransformer; + +import google.registry.xml.XmlException; +import google.registry.xml.XmlTransformer; import java.io.InputStream; import java.io.OutputStream; diff --git a/java/google/registry/xjc/bindings.xjb b/java/google/registry/xjc/bindings.xjb index e9881bc07..c3e75b20e 100644 --- a/java/google/registry/xjc/bindings.xjb +++ b/java/google/registry/xjc/bindings.xjb @@ -9,15 +9,15 @@ version="2.1"> - + + adapter="google.registry.xml.UtcDateTimeAdapter"/> + adapter="google.registry.xml.DateAdapter"/> - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -205,7 +205,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -256,7 +256,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -323,7 +323,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -353,7 +353,7 @@ - + diff --git a/java/google/registry/xjc/generated_files.bzl b/java/google/registry/xjc/generated_files.bzl index ddadbefd6..baf6bf582 100644 --- a/java/google/registry/xjc/generated_files.bzl +++ b/java/google/registry/xjc/generated_files.bzl @@ -1,4 +1,4 @@ -# converted from extension //java/com/google/domain/registry/xjc:generated_files +# converted from extension //java/google/registry/xjc:generated_files # # .'``'. ... # :o o `....'` ; @@ -14,8 +14,8 @@ # When you make changes to the XML schemas (*.xsd) or the JAXB bindings file # (bindings.xjb), you must regenerate this file with the following commands: # -# bazel run java/com/google/domain/registry/xjc:list_generated_files | tee /tmp/lol -# mv /tmp/lol java/com/google/domain/registry/xjc/generated_files +# bazel run third_party/java_src/gtld/java/google/registry/xjc:list_generated_files | tee /tmp/lol +# mv /tmp/lol third_party/java_src/gtld/java/google/registry/xjc/generated_files # pkginfo_generated_files = [ diff --git a/java/google/registry/xjc/list_generated_files.sh b/java/google/registry/xjc/list_generated_files.sh index 6ef1835af..e0fc57169 100755 --- a/java/google/registry/xjc/list_generated_files.sh +++ b/java/google/registry/xjc/list_generated_files.sh @@ -22,10 +22,10 @@ base="${PWD}" export LC_ALL=C cd "${tmp}" -cp "${base}/java/com/google/domain/registry/xjc/bindings.xjb" . -cp "${base}"/java/com/google/domain/registry/xml/xsd/*.xsd . +cp "${base}/java/google/registry/xjc/bindings.xjb" . +cp "${base}"/java/google/registry/xml/xsd/*.xsd . "${base}/third_party/java/jaxb/jaxb-xjc" -extension -d "${tmp}" -b *.xjb *.xsd \ - | sed -ne s@com/google/domain/registry/xjc/@@p \ + | sed -ne s@google/registry/xjc/@@p \ | grep -v package-info.java \ | sort \ > xjc_generated_files @@ -46,8 +46,8 @@ cat <javatests/com/google/domain/registry/model/schema.txt"; + "google.registry.tools.RegistryTool -e localhost " + + ">javatests/google/registry/model/schema.txt"; private static final String UPDATE_INSTRUCTIONS = Joiner.on('\n').join( "", diff --git a/javatests/google/registry/model/UpdateAutoTimestampTest.java b/javatests/google/registry/model/UpdateAutoTimestampTest.java index 45b6de27f..fe2954ea8 100644 --- a/javatests/google/registry/model/UpdateAutoTimestampTest.java +++ b/javatests/google/registry/model/UpdateAutoTimestampTest.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model; +package google.registry.model; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import static org.joda.time.DateTimeZone.UTC; -import com.google.domain.registry.model.common.CrossTldSingleton; -import com.google.domain.registry.testing.AppEngineRule; - import com.googlecode.objectify.ObjectifyService; import com.googlecode.objectify.Work; import com.googlecode.objectify.annotation.Entity; +import google.registry.model.common.CrossTldSingleton; +import google.registry.testing.AppEngineRule; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/billing/BillingEventTest.java b/javatests/google/registry/model/billing/BillingEventTest.java index d335ad09f..7da3c7602 100644 --- a/javatests/google/registry/model/billing/BillingEventTest.java +++ b/javatests/google/registry/model/billing/BillingEventTest.java @@ -12,30 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.billing; +package google.registry.model.billing; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistActiveDomain; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.billing.BillingEvent.Flag; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.model.EntityTestCase; +import google.registry.model.billing.BillingEvent.Flag; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.reporting.HistoryEntry; +import google.registry.testing.ExceptionRule; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/model/billing/RegistrarBillingEntryTest.java b/javatests/google/registry/model/billing/RegistrarBillingEntryTest.java index b49bc5c9f..347d2eb89 100644 --- a/javatests/google/registry/model/billing/RegistrarBillingEntryTest.java +++ b/javatests/google/registry/model/billing/RegistrarBillingEntryTest.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.billing; +package google.registry.model.billing; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.Key; +import google.registry.model.EntityTestCase; +import google.registry.model.registrar.Registrar; +import google.registry.testing.ExceptionRule; + import org.joda.money.CurrencyMismatchException; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/javatests/google/registry/model/billing/RegistrarBillingUtilsTest.java b/javatests/google/registry/model/billing/RegistrarBillingUtilsTest.java index e2519281d..e9446529d 100644 --- a/javatests/google/registry/model/billing/RegistrarBillingUtilsTest.java +++ b/javatests/google/registry/model/billing/RegistrarBillingUtilsTest.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.billing; +package google.registry.model.billing; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static java.util.Arrays.asList; import static org.joda.money.CurrencyUnit.JPY; import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableSortedMap; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; import org.joda.money.CurrencyUnit; import org.joda.money.Money; diff --git a/javatests/google/registry/model/billing/RegistrarCreditBalanceTest.java b/javatests/google/registry/model/billing/RegistrarCreditBalanceTest.java index 99be677fd..b56f0f5c8 100644 --- a/javatests/google/registry/model/billing/RegistrarCreditBalanceTest.java +++ b/javatests/google/registry/model/billing/RegistrarCreditBalanceTest.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.billing; +package google.registry.model.billing; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.billing.RegistrarCredit.CreditType; -import com.google.domain.registry.model.billing.RegistrarCreditBalance.BalanceMap; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.model.EntityTestCase; +import google.registry.model.billing.RegistrarCredit.CreditType; +import google.registry.model.billing.RegistrarCreditBalance.BalanceMap; +import google.registry.model.registrar.Registrar; +import google.registry.testing.ExceptionRule; import org.joda.money.CurrencyUnit; import org.joda.money.Money; diff --git a/javatests/google/registry/model/billing/RegistrarCreditTest.java b/javatests/google/registry/model/billing/RegistrarCreditTest.java index 8693bf097..0eeacf42f 100644 --- a/javatests/google/registry/model/billing/RegistrarCreditTest.java +++ b/javatests/google/registry/model/billing/RegistrarCreditTest.java @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.billing; +package google.registry.model.billing; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.money.CurrencyUnit.JPY; import static org.joda.money.CurrencyUnit.USD; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.billing.RegistrarCredit.CreditType; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.testing.ExceptionRule; +import google.registry.model.EntityTestCase; +import google.registry.model.billing.RegistrarCredit.CreditType; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; +import google.registry.testing.ExceptionRule; import org.joda.money.CurrencyUnit; import org.junit.Before; diff --git a/javatests/google/registry/model/common/GaeUserIdConverterTest.java b/javatests/google/registry/model/common/GaeUserIdConverterTest.java index 7eac9f5f5..12a93b252 100644 --- a/javatests/google/registry/model/common/GaeUserIdConverterTest.java +++ b/javatests/google/registry/model/common/GaeUserIdConverterTest.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.common; +package google.registry.model.common; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; - -import com.google.domain.registry.testing.AppEngineRule; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.googlecode.objectify.VoidWork; +import google.registry.testing.AppEngineRule; + import org.junit.After; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/common/PersistedRangeLongTest.java b/javatests/google/registry/model/common/PersistedRangeLongTest.java index 86b488d50..26156f411 100644 --- a/javatests/google/registry/model/common/PersistedRangeLongTest.java +++ b/javatests/google/registry/model/common/PersistedRangeLongTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.common; +package google.registry.model.common; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/model/common/TimeOfYearTest.java b/javatests/google/registry/model/common/TimeOfYearTest.java index 09916e17e..c5e59747a 100644 --- a/javatests/google/registry/model/common/TimeOfYearTest.java +++ b/javatests/google/registry/model/common/TimeOfYearTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.common; +package google.registry.model.common; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/model/common/TimedTransitionPropertyTest.java b/javatests/google/registry/model/common/TimedTransitionPropertyTest.java index af6c647d8..5ced9b81d 100644 --- a/javatests/google/registry/model/common/TimedTransitionPropertyTest.java +++ b/javatests/google/registry/model/common/TimedTransitionPropertyTest.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.common; +package google.registry.model.common; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.time.DateTimeZone.UTC; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSortedMap; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.testing.ExceptionRule; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/model/contact/ContactCommandTest.java b/javatests/google/registry/model/contact/ContactCommandTest.java index 44801250a..905e4da50 100644 --- a/javatests/google/registry/model/contact/ContactCommandTest.java +++ b/javatests/google/registry/model/contact/ContactCommandTest.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.contact; +package google.registry.model.contact; -import static com.google.domain.registry.flows.EppXmlTransformer.marshalInput; -import static com.google.domain.registry.flows.EppXmlTransformer.validateInput; -import static com.google.domain.registry.testing.ContactResourceSubject.assertAboutContacts; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.xml.ValidationMode.LENIENT; -import static com.google.domain.registry.xml.XmlTestUtils.assertXmlEquals; +import static google.registry.flows.EppXmlTransformer.marshalInput; +import static google.registry.flows.EppXmlTransformer.validateInput; +import static google.registry.testing.ContactResourceSubject.assertAboutContacts; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.xml.ValidationMode.LENIENT; +import static google.registry.xml.XmlTestUtils.assertXmlEquals; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.contact.PostalInfo.Type; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.EppLoader; + +import google.registry.model.contact.PostalInfo.Type; +import google.registry.testing.AppEngineRule; +import google.registry.testing.EppLoader; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/contact/ContactResourceTest.java b/javatests/google/registry/model/contact/ContactResourceTest.java index df0733833..b7e041cbc 100644 --- a/javatests/google/registry/model/contact/ContactResourceTest.java +++ b/javatests/google/registry/model/contact/ContactResourceTest.java @@ -12,32 +12,33 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.contact; +package google.registry.model.contact; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.testing.ContactResourceSubject.assertAboutContacts; -import static com.google.domain.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.testing.ContactResourceSubject.assertAboutContacts; +import static google.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.contact.Disclose.PostalInfoChoice; -import com.google.domain.registry.model.contact.PostalInfo.Type; -import com.google.domain.registry.model.eppcommon.AuthInfo.PasswordAuth; -import com.google.domain.registry.model.eppcommon.PresenceMarker; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; -import com.google.domain.registry.model.transfer.TransferStatus; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.Key; +import google.registry.model.EntityTestCase; +import google.registry.model.billing.BillingEvent; +import google.registry.model.contact.Disclose.PostalInfoChoice; +import google.registry.model.contact.PostalInfo.Type; +import google.registry.model.eppcommon.AuthInfo.PasswordAuth; +import google.registry.model.eppcommon.PresenceMarker; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; +import google.registry.model.transfer.TransferStatus; +import google.registry.testing.ExceptionRule; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/domain/DomainApplicationTest.java b/javatests/google/registry/model/domain/DomainApplicationTest.java index 750ed4279..0fea771e9 100644 --- a/javatests/google/registry/model/domain/DomainApplicationTest.java +++ b/javatests/google/registry/model/domain/DomainApplicationTest.java @@ -12,39 +12,40 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveContact; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveHost; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainApplication; +import static google.registry.testing.DatastoreHelper.persistActiveContact; +import static google.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.domain.launch.ApplicationStatus; -import com.google.domain.registry.model.domain.launch.LaunchNotice; -import com.google.domain.registry.model.domain.launch.LaunchPhase; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppcommon.AuthInfo.PasswordAuth; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.smd.EncodedSignedMark; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; -import com.google.domain.registry.model.transfer.TransferStatus; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.Key; +import google.registry.model.EntityTestCase; +import google.registry.model.billing.BillingEvent; +import google.registry.model.domain.launch.ApplicationStatus; +import google.registry.model.domain.launch.LaunchNotice; +import google.registry.model.domain.launch.LaunchPhase; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppcommon.AuthInfo.PasswordAuth; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.host.HostResource; +import google.registry.model.smd.EncodedSignedMark; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; +import google.registry.model.transfer.TransferStatus; +import google.registry.testing.ExceptionRule; + import org.joda.money.Money; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/domain/DomainCommandTest.java b/javatests/google/registry/model/domain/DomainCommandTest.java index 3370d1347..a41e9ae4d 100644 --- a/javatests/google/registry/model/domain/DomainCommandTest.java +++ b/javatests/google/registry/model/domain/DomainCommandTest.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; -import com.google.domain.registry.model.ResourceCommandTestCase; +import google.registry.model.ResourceCommandTestCase; import org.junit.Test; diff --git a/javatests/google/registry/model/domain/DomainResourceTest.java b/javatests/google/registry/model/domain/DomainResourceTest.java index f5bf523a6..03bbb5010 100644 --- a/javatests/google/registry/model/domain/DomainResourceTest.java +++ b/javatests/google/registry/model/domain/DomainResourceTest.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DomainResourceSubject.assertAboutDomains; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainResource; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DomainResourceSubject.assertAboutDomains; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableList; @@ -30,28 +30,29 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.launch.LaunchNotice; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppcommon.AuthInfo.PasswordAuth; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; -import com.google.domain.registry.model.transfer.TransferStatus; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.model.EntityTestCase; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.launch.LaunchNotice; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppcommon.AuthInfo.PasswordAuth; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.host.HostResource; +import google.registry.model.poll.PollMessage; +import google.registry.model.registry.Registry; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; +import google.registry.model.transfer.TransferStatus; +import google.registry.testing.ExceptionRule; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/model/domain/GracePeriodTest.java b/javatests/google/registry/model/domain/GracePeriodTest.java index 4183dde87..3439aab15 100644 --- a/javatests/google/registry/model/domain/GracePeriodTest.java +++ b/javatests/google/registry/model/domain/GracePeriodTest.java @@ -12,22 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.domain; +package google.registry.model.domain; import static com.google.common.truth.Truth.assertThat; import static org.joda.time.DateTimeZone.UTC; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.billing.BillingEvent.Recurring; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; - import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.billing.BillingEvent.Recurring; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.reporting.HistoryEntry; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; + import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/javatests/google/registry/model/eppoutput/ResultTest.java b/javatests/google/registry/model/eppoutput/ResultTest.java index 8b2540c49..185407f60 100644 --- a/javatests/google/registry/model/eppoutput/ResultTest.java +++ b/javatests/google/registry/model/eppoutput/ResultTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.eppoutput; +package google.registry.model.eppoutput; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/model/export/LogsExportCursorTest.java b/javatests/google/registry/model/export/LogsExportCursorTest.java index ea27504aa..7c5f6a57e 100644 --- a/javatests/google/registry/model/export/LogsExportCursorTest.java +++ b/javatests/google/registry/model/export/LogsExportCursorTest.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.export; +package google.registry.model.export; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.common.PersistedRangeLong; + +import google.registry.model.EntityTestCase; +import google.registry.model.common.PersistedRangeLong; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/model/host/HostCommandTest.java b/javatests/google/registry/model/host/HostCommandTest.java index b3c7d4ab4..cec24ec20 100644 --- a/javatests/google/registry/model/host/HostCommandTest.java +++ b/javatests/google/registry/model/host/HostCommandTest.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.host; +package google.registry.model.host; -import com.google.domain.registry.model.ResourceCommandTestCase; +import google.registry.model.ResourceCommandTestCase; import org.junit.Test; diff --git a/javatests/google/registry/model/host/HostResourceTest.java b/javatests/google/registry/model/host/HostResourceTest.java index d12c7569b..f483935ef 100644 --- a/javatests/google/registry/model/host/HostResourceTest.java +++ b/javatests/google/registry/model/host/HostResourceTest.java @@ -12,31 +12,32 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.host; +package google.registry.model.host; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId; -import static com.google.domain.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.HostResourceSubject.assertAboutHosts; +import static google.registry.model.EppResourceUtils.loadByUniqueId; +import static google.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainResource; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.HostResourceSubject.assertAboutHosts; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; -import com.google.domain.registry.model.transfer.TransferStatus; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.model.EntityTestCase; +import google.registry.model.billing.BillingEvent; +import google.registry.model.domain.DomainResource; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; +import google.registry.model.transfer.TransferStatus; +import google.registry.testing.ExceptionRule; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/model/index/DomainApplicationIndexTest.java b/javatests/google/registry/model/index/DomainApplicationIndexTest.java index b5f72ebb1..dad9a9781 100644 --- a/javatests/google/registry/model/index/DomainApplicationIndexTest.java +++ b/javatests/google/registry/model/index/DomainApplicationIndexTest.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.index; +package google.registry.model.index; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.index.DomainApplicationIndex.createUpdatedInstance; -import static com.google.domain.registry.model.index.DomainApplicationIndex.createWithSpecifiedReferences; -import static com.google.domain.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResource; +import static google.registry.model.index.DomainApplicationIndex.createUpdatedInstance; +import static google.registry.model.index.DomainApplicationIndex.createWithSpecifiedReferences; +import static google.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainApplication; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResource; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.Ref; +import google.registry.model.EntityTestCase; +import google.registry.model.domain.DomainApplication; +import google.registry.testing.ExceptionRule; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/index/EppResourceIndexTest.java b/javatests/google/registry/model/index/EppResourceIndexTest.java index 042df4559..4bebc7332 100644 --- a/javatests/google/registry/model/index/EppResourceIndexTest.java +++ b/javatests/google/registry/model/index/EppResourceIndexTest.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.index; +package google.registry.model.index; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveContact; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistActiveContact; +import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.contact.ContactResource; import com.googlecode.objectify.Key; +import google.registry.config.RegistryEnvironment; +import google.registry.model.EntityTestCase; +import google.registry.model.contact.ContactResource; + import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/model/index/ForeignKeyIndexTest.java b/javatests/google/registry/model/index/ForeignKeyIndexTest.java index 19ef56bc5..1bd5afdc5 100644 --- a/javatests/google/registry/model/index/ForeignKeyIndexTest.java +++ b/javatests/google/registry/model/index/ForeignKeyIndexTest.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.index; +package google.registry.model.index; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveHost; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.Ref; +import google.registry.model.EntityTestCase; +import google.registry.model.host.HostResource; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex; +import google.registry.testing.ExceptionRule; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/mark/MarkContactTest.java b/javatests/google/registry/model/mark/MarkContactTest.java index 760e3b0eb..c73bcaac4 100644 --- a/javatests/google/registry/model/mark/MarkContactTest.java +++ b/javatests/google/registry/model/mark/MarkContactTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/model/mark/MarkHolderTest.java b/javatests/google/registry/model/mark/MarkHolderTest.java index 8c3c70b4c..3d33e8e0c 100644 --- a/javatests/google/registry/model/mark/MarkHolderTest.java +++ b/javatests/google/registry/model/mark/MarkHolderTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/model/mark/MarkProtectionTest.java b/javatests/google/registry/model/mark/MarkProtectionTest.java index f6f112d4e..745aa8b84 100644 --- a/javatests/google/registry/model/mark/MarkProtectionTest.java +++ b/javatests/google/registry/model/mark/MarkProtectionTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.mark; +package google.registry.model.mark; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/model/ofy/CommitLogBucketTest.java b/javatests/google/registry/model/ofy/CommitLogBucketTest.java index 319bf7079..cc0674e8b 100644 --- a/javatests/google/registry/model/ofy/CommitLogBucketTest.java +++ b/javatests/google/registry/model/ofy/CommitLogBucketTest.java @@ -12,25 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.CommitLogBucket.getBucketKey; -import static com.google.domain.registry.model.ofy.CommitLogBucket.loadAllBuckets; -import static com.google.domain.registry.model.ofy.CommitLogBucket.loadBucket; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.model.ofy.CommitLogBucket.getBucketKey; +import static google.registry.model.ofy.CommitLogBucket.loadAllBuckets; +import static google.registry.model.ofy.CommitLogBucket.loadBucket; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.config.TestRegistryConfig; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.testing.RegistryConfigRule; import com.googlecode.objectify.annotation.Cache; +import google.registry.config.TestRegistryConfig; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.InjectRule; +import google.registry.testing.RegistryConfigRule; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/ofy/CommitLogCheckpointTest.java b/javatests/google/registry/model/ofy/CommitLogCheckpointTest.java index f56950b7e..30f1119db 100644 --- a/javatests/google/registry/model/ofy/CommitLogCheckpointTest.java +++ b/javatests/google/registry/model/ofy/CommitLogCheckpointTest.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.config.TestRegistryConfig; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.RegistryConfigRule; + +import google.registry.config.TestRegistryConfig; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.RegistryConfigRule; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/model/ofy/CommitLogMutationTest.java b/javatests/google/registry/model/ofy/CommitLogMutationTest.java index 788a9b916..dc628b557 100644 --- a/javatests/google/registry/model/ofy/CommitLogMutationTest.java +++ b/javatests/google/registry/model/ofy/CommitLogMutationTest.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; import com.google.appengine.api.datastore.Entity; import com.google.appengine.api.datastore.EntityTranslator; import com.google.appengine.api.datastore.KeyFactory; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.testing.AppEngineRule; import com.googlecode.objectify.Key; import com.googlecode.objectify.Work; +import google.registry.model.ImmutableObject; +import google.registry.model.registry.Registry; +import google.registry.testing.AppEngineRule; + import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Before; diff --git a/javatests/google/registry/model/ofy/ObjectifyServiceTest.java b/javatests/google/registry/model/ofy/ObjectifyServiceTest.java index 774546053..6440a3105 100644 --- a/javatests/google/registry/model/ofy/ObjectifyServiceTest.java +++ b/javatests/google/registry/model/ofy/ObjectifyServiceTest.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; -import com.google.domain.registry.testing.AppEngineRule; +import google.registry.testing.AppEngineRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/ofy/OfyCommitLogTest.java b/javatests/google/registry/model/ofy/OfyCommitLogTest.java index 7f1cd985c..4ee5b4fcc 100644 --- a/javatests/google/registry/model/ofy/OfyCommitLogTest.java +++ b/javatests/google/registry/model/ofy/OfyCommitLogTest.java @@ -12,23 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.appengine.api.datastore.EntityTranslator.convertToPb; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.CommitLogBucket.getBucketKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; import static com.googlecode.objectify.ObjectifyService.register; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.CommitLogBucket.getBucketKey; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.BackupGroupRoot; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.common.EntityGroupRoot; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; @@ -36,6 +29,14 @@ import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.BackupGroupRoot; +import google.registry.model.ImmutableObject; +import google.registry.model.common.EntityGroupRoot; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/ofy/OfyFilterTest.java b/javatests/google/registry/model/ofy/OfyFilterTest.java index 9985bfb4c..b99d91758 100644 --- a/javatests/google/registry/model/ofy/OfyFilterTest.java +++ b/javatests/google/registry/model/ofy/OfyFilterTest.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.initOfy; +import static google.registry.model.ofy.ObjectifyService.initOfy; import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig; import com.google.appengine.tools.development.testing.LocalServiceTestHelper; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.Registrar.Type; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.Key; import com.googlecode.objectify.ObjectifyFactory; import com.googlecode.objectify.ObjectifyFilter; import com.googlecode.objectify.ObjectifyService; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.Registrar.Type; +import google.registry.testing.ExceptionRule; + import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -83,7 +84,7 @@ public class OfyFilterTest { Key.create(registrar); } catch (IllegalStateException e) { assertThat(e).hasMessage( - "class com.google.domain.registry.model.registrar.Registrar has not been registered"); + "class google.registry.model.registrar.Registrar has not been registered"); } } diff --git a/javatests/google/registry/model/ofy/OfyTest.java b/javatests/google/registry/model/ofy/OfyTest.java index 4b9415e47..09c78be3f 100644 --- a/javatests/google/registry/model/ofy/OfyTest.java +++ b/javatests/google/registry/model/ofy/OfyTest.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.ofy; +package google.registry.model.ofy; import static com.google.appengine.api.datastore.DatastoreServiceFactory.getDatastoreService; import static com.google.common.truth.Truth.assertThat; import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.ofy.Ofy.getBaseEntityClassFromEntityOrKey; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newContactResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveContact; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.Ofy.getBaseEntityClassFromEntityOrKey; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newContactResource; +import static google.registry.testing.DatastoreHelper.persistActiveContact; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.junit.Assert.fail; @@ -33,17 +33,6 @@ import com.google.appengine.api.datastore.DatastoreFailureException; import com.google.appengine.api.datastore.DatastoreTimeoutException; import com.google.appengine.api.datastore.Entity; import com.google.appengine.api.taskqueue.TransientFailureException; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.DatastoreHelper; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.util.SystemClock; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; @@ -53,6 +42,18 @@ import com.googlecode.objectify.annotation.OnLoad; import com.googlecode.objectify.annotation.OnSave; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.ImmutableObject; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.DomainResource; +import google.registry.model.eppcommon.Trid; +import google.registry.model.reporting.HistoryEntry; +import google.registry.testing.AppEngineRule; +import google.registry.testing.DatastoreHelper; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.util.SystemClock; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/poll/MessageQueueInfoTest.java b/javatests/google/registry/model/poll/MessageQueueInfoTest.java index 1eded9b82..67b8faf1a 100644 --- a/javatests/google/registry/model/poll/MessageQueueInfoTest.java +++ b/javatests/google/registry/model/poll/MessageQueueInfoTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.poll; +package google.registry.model.poll; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java b/javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java index e5d25ad44..1f9d7799f 100644 --- a/javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java +++ b/javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java @@ -12,29 +12,29 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.poll; +package google.registry.model.poll; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveContact; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveHost; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistActiveContact; +import static google.registry.testing.DatastoreHelper.persistActiveDomain; +import static google.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.persistResource; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.poll.PollMessageExternalKeyConverter.PollMessageExternalKeyParseException; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; - import com.googlecode.objectify.Key; +import google.registry.model.domain.Period; +import google.registry.model.eppcommon.Trid; +import google.registry.model.ofy.Ofy; +import google.registry.model.poll.PollMessageExternalKeyConverter.PollMessageExternalKeyParseException; +import google.registry.model.reporting.HistoryEntry; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/poll/PollMessageTest.java b/javatests/google/registry/model/poll/PollMessageTest.java index a01337baa..11189ce17 100644 --- a/javatests/google/registry/model/poll/PollMessageTest.java +++ b/javatests/google/registry/model/poll/PollMessageTest.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.poll; +package google.registry.model.poll; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistActiveDomain; +import static google.registry.testing.DatastoreHelper.persistResource; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.reporting.HistoryEntry; +import google.registry.model.EntityTestCase; +import google.registry.model.domain.Period; +import google.registry.model.eppcommon.Trid; +import google.registry.model.reporting.HistoryEntry; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/model/rde/RdeNamingUtilsTest.java b/javatests/google/registry/model/rde/RdeNamingUtilsTest.java index 41c598318..0fe446397 100644 --- a/javatests/google/registry/model/rde/RdeNamingUtilsTest.java +++ b/javatests/google/registry/model/rde/RdeNamingUtilsTest.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.rde; +package google.registry.model.rde; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.rde.RdeMode.FULL; -import static com.google.domain.registry.model.rde.RdeMode.THIN; -import static com.google.domain.registry.model.rde.RdeNamingUtils.makePartialName; -import static com.google.domain.registry.model.rde.RdeNamingUtils.makeRydeFilename; +import static google.registry.model.rde.RdeMode.FULL; +import static google.registry.model.rde.RdeMode.THIN; +import static google.registry.model.rde.RdeNamingUtils.makePartialName; +import static google.registry.model.rde.RdeNamingUtils.makeRydeFilename; -import com.google.domain.registry.testing.ExceptionRule; +import google.registry.testing.ExceptionRule; import org.joda.time.DateTime; import org.junit.Rule; diff --git a/javatests/google/registry/model/rde/RdeRevisionTest.java b/javatests/google/registry/model/rde/RdeRevisionTest.java index 90c88e7b6..907ce74b0 100644 --- a/javatests/google/registry/model/rde/RdeRevisionTest.java +++ b/javatests/google/registry/model/rde/RdeRevisionTest.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.rde; +package google.registry.model.rde; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.rde.RdeMode.FULL; -import static com.google.domain.registry.model.rde.RdeRevision.getNextRevision; -import static com.google.domain.registry.model.rde.RdeRevision.saveRevision; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.rde.RdeMode.FULL; +import static google.registry.model.rde.RdeRevision.getNextRevision; +import static google.registry.model.rde.RdeRevision.saveRevision; import com.google.common.base.VerifyException; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.VoidWork; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; + import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/registrar/RegistrarTest.java b/javatests/google/registry/model/registrar/RegistrarTest.java index 77510f235..7cf89ee3d 100644 --- a/javatests/google/registry/model/registrar/RegistrarTest.java +++ b/javatests/google/registry/model/registrar/RegistrarTest.java @@ -12,28 +12,29 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registrar; +package google.registry.model.registrar; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT2; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT2_HASH; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; -import static com.google.domain.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT2; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT2_HASH; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; +import static google.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.common.EntityGroupRoot; -import com.google.domain.registry.model.registrar.Registrar.CertificateState; -import com.google.domain.registry.model.registrar.Registrar.State; -import com.google.domain.registry.model.registrar.Registrar.Type; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.util.CidrAddressBlock; + +import google.registry.model.EntityTestCase; +import google.registry.model.common.EntityGroupRoot; +import google.registry.model.registrar.Registrar.CertificateState; +import google.registry.model.registrar.Registrar.State; +import google.registry.model.registrar.Registrar.Type; +import google.registry.testing.ExceptionRule; +import google.registry.util.CidrAddressBlock; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/registry/RegistriesTest.java b/javatests/google/registry/model/registry/RegistriesTest.java index 3371fcee3..62f6e41f4 100644 --- a/javatests/google/registry/model/registry/RegistriesTest.java +++ b/javatests/google/registry/model/registry/RegistriesTest.java @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry; +package google.registry.model.registry; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.createTlds; import com.google.common.net.InternetDomainName; -import com.google.domain.registry.testing.AppEngineRule; + +import google.registry.testing.AppEngineRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/registry/RegistryCursorTest.java b/javatests/google/registry/model/registry/RegistryCursorTest.java index 3d0648f83..1452f69a6 100644 --- a/javatests/google/registry/model/registry/RegistryCursorTest.java +++ b/javatests/google/registry/model/registry/RegistryCursorTest.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry; +package google.registry.model.registry; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.RegistryCursor.CursorType.BRDA; -import static com.google.domain.registry.model.registry.RegistryCursor.CursorType.RDE_UPLOAD; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; - -import com.google.domain.registry.model.EntityTestCase; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.RegistryCursor.CursorType.BRDA; +import static google.registry.model.registry.RegistryCursor.CursorType.RDE_UPLOAD; +import static google.registry.testing.DatastoreHelper.createTld; import com.googlecode.objectify.VoidWork; +import google.registry.model.EntityTestCase; + import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/model/registry/RegistryTest.java b/javatests/google/registry/model/registry/RegistryTest.java index 27ca41ee4..de0d55b95 100644 --- a/javatests/google/registry/model/registry/RegistryTest.java +++ b/javatests/google/registry/model/registry/RegistryTest.java @@ -12,33 +12,34 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry; +package google.registry.model.registry; import static com.google.common.collect.Iterables.transform; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.label.ReservedListTest.GET_NAME_FUNCTION; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistPremiumList; -import static com.google.domain.registry.testing.DatastoreHelper.persistReservedList; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.label.ReservedListTest.GET_NAME_FUNCTION; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistPremiumList; +import static google.registry.testing.DatastoreHelper.persistReservedList; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.money.CurrencyUnit.EUR; import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.registry.Registry.RegistryNotFoundException; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.model.registry.label.ReservedList; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.Key; +import google.registry.model.EntityTestCase; +import google.registry.model.registry.Registry.RegistryNotFoundException; +import google.registry.model.registry.Registry.TldState; +import google.registry.model.registry.label.PremiumList; +import google.registry.model.registry.label.ReservedList; +import google.registry.testing.ExceptionRule; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/model/registry/label/PremiumListTest.java b/javatests/google/registry/model/registry/label/PremiumListTest.java index e546cc32a..7226d1ad8 100644 --- a/javatests/google/registry/model/registry/label/PremiumListTest.java +++ b/javatests/google/registry/model/registry/label/PremiumListTest.java @@ -12,26 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry.label; +package google.registry.model.registry.label; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.label.PremiumList.getPremiumPrice; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistPremiumList; -import static com.google.domain.registry.testing.DatastoreHelper.persistReservedList; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.label.PremiumList.getPremiumPrice; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistPremiumList; +import static google.registry.testing.DatastoreHelper.persistReservedList; +import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.label.PremiumList.PremiumListEntry; -import com.google.domain.registry.model.registry.label.PremiumList.PremiumListRevision; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.Key; +import google.registry.model.registry.Registry; +import google.registry.model.registry.label.PremiumList.PremiumListEntry; +import google.registry.model.registry.label.PremiumList.PremiumListRevision; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/model/registry/label/ReservedListTest.java b/javatests/google/registry/model/registry/label/ReservedListTest.java index 38953f521..21299aed1 100644 --- a/javatests/google/registry/model/registry/label/ReservedListTest.java +++ b/javatests/google/registry/model/registry/label/ReservedListTest.java @@ -12,33 +12,34 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.registry.label; +package google.registry.model.registry.label; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static com.google.domain.registry.model.registry.label.ReservationType.ALLOWED_IN_SUNRISE; -import static com.google.domain.registry.model.registry.label.ReservationType.FULLY_BLOCKED; -import static com.google.domain.registry.model.registry.label.ReservationType.RESERVED_FOR_ANCHOR_TENANT; -import static com.google.domain.registry.model.registry.label.ReservationType.UNRESERVED; -import static com.google.domain.registry.model.registry.label.ReservedList.getReservation; -import static com.google.domain.registry.model.registry.label.ReservedList.matchesAnchorTenantReservation; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistReservedList; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.registry.label.ReservationType.ALLOWED_IN_SUNRISE; +import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED; +import static google.registry.model.registry.label.ReservationType.RESERVED_FOR_ANCHOR_TENANT; +import static google.registry.model.registry.label.ReservationType.UNRESERVED; +import static google.registry.model.registry.label.ReservedList.getReservation; +import static google.registry.model.registry.label.ReservedList.matchesAnchorTenantReservation; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistReservedList; +import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.label.ReservedList.ReservedListEntry; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; import com.googlecode.objectify.Key; +import google.registry.model.ofy.Ofy; +import google.registry.model.registry.Registry; +import google.registry.model.registry.label.ReservedList.ReservedListEntry; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/model/reporting/HistoryEntryTest.java b/javatests/google/registry/model/reporting/HistoryEntryTest.java index c416926c7..3736e5f50 100644 --- a/javatests/google/registry/model/reporting/HistoryEntryTest.java +++ b/javatests/google/registry/model/reporting/HistoryEntryTest.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.reporting; +package google.registry.model.reporting; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainResource; +import static google.registry.testing.DatastoreHelper.persistResource; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.domain.registry.model.EntityTestCase; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.eppcommon.Trid; +import google.registry.model.EntityTestCase; +import google.registry.model.domain.Period; +import google.registry.model.eppcommon.Trid; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/model/schema.txt b/javatests/google/registry/model/schema.txt index b33953e3b..65c3b9a9c 100644 --- a/javatests/google/registry/model/schema.txt +++ b/javatests/google/registry/model/schema.txt @@ -2,25 +2,25 @@ enum com.google.common.collect.BoundType { CLOSED; OPEN; } -class com.google.domain.registry.model.CreateAutoTimestamp { +class google.registry.model.CreateAutoTimestamp { org.joda.time.DateTime timestamp; } -class com.google.domain.registry.model.UpdateAutoTimestamp { +class google.registry.model.UpdateAutoTimestamp { org.joda.time.DateTime timestamp; } -class com.google.domain.registry.model.billing.BillingEvent$Cancellation { +class google.registry.model.billing.BillingEvent$Cancellation { @Id long id; - @Parent com.googlecode.objectify.Key parent; - com.google.domain.registry.model.billing.BillingEvent$Reason reason; - com.googlecode.objectify.Ref refOneTime; - com.googlecode.objectify.Ref refRecurring; + @Parent com.googlecode.objectify.Key parent; + com.googlecode.objectify.Ref refOneTime; + com.googlecode.objectify.Ref refRecurring; + google.registry.model.billing.BillingEvent$Reason reason; java.lang.String clientId; java.lang.String targetId; - java.util.Set flags; + java.util.Set flags; org.joda.time.DateTime billingTime; org.joda.time.DateTime eventTime; } -enum com.google.domain.registry.model.billing.BillingEvent$Flag { +enum google.registry.model.billing.BillingEvent$Flag { ALLOCATION; ANCHOR_TENANT; AUTO_RENEW; @@ -28,31 +28,31 @@ enum com.google.domain.registry.model.billing.BillingEvent$Flag { SUNRISE; SYNTHETIC; } -class com.google.domain.registry.model.billing.BillingEvent$Modification { +class google.registry.model.billing.BillingEvent$Modification { @Id long id; - @Parent com.googlecode.objectify.Key parent; - com.google.domain.registry.model.billing.BillingEvent$Reason reason; - com.googlecode.objectify.Ref eventRef; + @Parent com.googlecode.objectify.Key parent; + com.googlecode.objectify.Ref eventRef; + google.registry.model.billing.BillingEvent$Reason reason; java.lang.String clientId; java.lang.String description; java.lang.String targetId; - java.util.Set flags; + java.util.Set flags; org.joda.money.Money cost; org.joda.time.DateTime eventTime; } -class com.google.domain.registry.model.billing.BillingEvent$OneTime { +class google.registry.model.billing.BillingEvent$OneTime { @Id long id; - @Parent com.googlecode.objectify.Key parent; - com.google.domain.registry.model.billing.BillingEvent$Reason reason; + @Parent com.googlecode.objectify.Key parent; + google.registry.model.billing.BillingEvent$Reason reason; java.lang.Integer periodYears; java.lang.String clientId; java.lang.String targetId; - java.util.Set flags; + java.util.Set flags; org.joda.money.Money cost; org.joda.time.DateTime billingTime; org.joda.time.DateTime eventTime; } -enum com.google.domain.registry.model.billing.BillingEvent$Reason { +enum google.registry.model.billing.BillingEvent$Reason { AUTO_RENEW; CREATE; ERROR; @@ -61,20 +61,20 @@ enum com.google.domain.registry.model.billing.BillingEvent$Reason { SERVER_STATUS; TRANSFER; } -class com.google.domain.registry.model.billing.BillingEvent$Recurring { +class google.registry.model.billing.BillingEvent$Recurring { @Id long id; - @Parent com.googlecode.objectify.Key parent; - com.google.domain.registry.model.billing.BillingEvent$Reason reason; - com.google.domain.registry.model.common.TimeOfYear recurrenceTimeOfYear; + @Parent com.googlecode.objectify.Key parent; + google.registry.model.billing.BillingEvent$Reason reason; + google.registry.model.common.TimeOfYear recurrenceTimeOfYear; java.lang.String clientId; java.lang.String targetId; - java.util.Set flags; + java.util.Set flags; org.joda.time.DateTime eventTime; org.joda.time.DateTime recurrenceEndTime; } -class com.google.domain.registry.model.billing.RegistrarBillingEntry { +class google.registry.model.billing.RegistrarBillingEntry { @Id long id; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; java.lang.String description; java.lang.String transactionId; org.joda.money.CurrencyUnit currency; @@ -82,175 +82,175 @@ class com.google.domain.registry.model.billing.RegistrarBillingEntry { org.joda.money.Money balance; org.joda.time.DateTime created; } -class com.google.domain.registry.model.billing.RegistrarCredit { +class google.registry.model.billing.RegistrarCredit { @Id long id; - @Parent com.googlecode.objectify.Ref parent; - com.google.domain.registry.model.billing.RegistrarCredit$CreditType type; + @Parent com.googlecode.objectify.Ref parent; + google.registry.model.billing.RegistrarCredit$CreditType type; java.lang.String description; java.lang.String tld; org.joda.money.CurrencyUnit currency; org.joda.time.DateTime creationTime; } -enum com.google.domain.registry.model.billing.RegistrarCredit$CreditType { +enum google.registry.model.billing.RegistrarCredit$CreditType { AUCTION; PROMOTION; } -class com.google.domain.registry.model.billing.RegistrarCreditBalance { +class google.registry.model.billing.RegistrarCreditBalance { @Id long id; - @Parent com.googlecode.objectify.Ref parent; + @Parent com.googlecode.objectify.Ref parent; org.joda.money.Money amount; org.joda.time.DateTime effectiveTime; org.joda.time.DateTime writtenTime; } -class com.google.domain.registry.model.common.EntityGroupRoot { +class google.registry.model.common.EntityGroupRoot { @Id java.lang.String id; - com.google.domain.registry.model.UpdateAutoTimestamp updateTimestamp; + google.registry.model.UpdateAutoTimestamp updateTimestamp; } -class com.google.domain.registry.model.common.GaeUserIdConverter { +class google.registry.model.common.GaeUserIdConverter { @Id long id; com.google.appengine.api.users.User user; } -class com.google.domain.registry.model.common.PersistedRangeLong { +class google.registry.model.common.PersistedRangeLong { com.google.common.collect.BoundType lowerBoundType; com.google.common.collect.BoundType upperBoundType; java.lang.Long lowerBound; java.lang.Long upperBound; } -class com.google.domain.registry.model.common.TimeOfYear { +class google.registry.model.common.TimeOfYear { java.lang.String timeString; } -class com.google.domain.registry.model.contact.ContactAddress { +class google.registry.model.contact.ContactAddress { java.lang.String city; java.lang.String countryCode; java.lang.String state; java.lang.String zip; java.util.List street; } -class com.google.domain.registry.model.contact.ContactAuthInfo { - com.google.domain.registry.model.eppcommon.AuthInfo$PasswordAuth pw; +class google.registry.model.contact.ContactAuthInfo { + google.registry.model.eppcommon.AuthInfo$PasswordAuth pw; } -class com.google.domain.registry.model.contact.ContactPhoneNumber { +class google.registry.model.contact.ContactPhoneNumber { java.lang.String extension; java.lang.String phoneNumber; } -class com.google.domain.registry.model.contact.ContactResource { +class google.registry.model.contact.ContactResource { @Id java.lang.String repoId; - com.google.common.collect.ImmutableSortedMap> revisions; - com.google.domain.registry.model.CreateAutoTimestamp creationTime; - com.google.domain.registry.model.UpdateAutoTimestamp updateTimestamp; - com.google.domain.registry.model.contact.ContactAuthInfo authInfo; - com.google.domain.registry.model.contact.ContactPhoneNumber fax; - com.google.domain.registry.model.contact.ContactPhoneNumber voice; - com.google.domain.registry.model.contact.Disclose disclose; - com.google.domain.registry.model.contact.PostalInfo internationalizedPostalInfo; - com.google.domain.registry.model.contact.PostalInfo localizedPostalInfo; - com.google.domain.registry.model.transfer.TransferData transferData; + com.google.common.collect.ImmutableSortedMap> revisions; + google.registry.model.CreateAutoTimestamp creationTime; + google.registry.model.UpdateAutoTimestamp updateTimestamp; + google.registry.model.contact.ContactAuthInfo authInfo; + google.registry.model.contact.ContactPhoneNumber fax; + google.registry.model.contact.ContactPhoneNumber voice; + google.registry.model.contact.Disclose disclose; + google.registry.model.contact.PostalInfo internationalizedPostalInfo; + google.registry.model.contact.PostalInfo localizedPostalInfo; + google.registry.model.transfer.TransferData transferData; java.lang.String contactId; java.lang.String creationClientId; java.lang.String currentSponsorClientId; java.lang.String email; java.lang.String lastEppUpdateClientId; - java.util.Set status; + java.util.Set status; org.joda.time.DateTime deletionTime; org.joda.time.DateTime lastEppUpdateTime; org.joda.time.DateTime lastTransferTime; } -class com.google.domain.registry.model.contact.Disclose { - com.google.domain.registry.model.eppcommon.PresenceMarker email; - com.google.domain.registry.model.eppcommon.PresenceMarker fax; - com.google.domain.registry.model.eppcommon.PresenceMarker voice; +class google.registry.model.contact.Disclose { + google.registry.model.eppcommon.PresenceMarker email; + google.registry.model.eppcommon.PresenceMarker fax; + google.registry.model.eppcommon.PresenceMarker voice; java.lang.Boolean flag; - java.util.List addr; - java.util.List name; - java.util.List org; + java.util.List addr; + java.util.List name; + java.util.List org; } -class com.google.domain.registry.model.contact.Disclose$PostalInfoChoice { - com.google.domain.registry.model.contact.PostalInfo$Type type; +class google.registry.model.contact.Disclose$PostalInfoChoice { + google.registry.model.contact.PostalInfo$Type type; } -class com.google.domain.registry.model.contact.PostalInfo { - com.google.domain.registry.model.contact.ContactAddress address; - com.google.domain.registry.model.contact.PostalInfo$Type type; +class google.registry.model.contact.PostalInfo { + google.registry.model.contact.ContactAddress address; + google.registry.model.contact.PostalInfo$Type type; java.lang.String name; java.lang.String org; } -enum com.google.domain.registry.model.contact.PostalInfo$Type { +enum google.registry.model.contact.PostalInfo$Type { INTERNATIONALIZED; LOCALIZED; } -class com.google.domain.registry.model.domain.DesignatedContact { - com.google.domain.registry.model.domain.DesignatedContact$Type type; - com.google.domain.registry.model.domain.ReferenceUnion contactId; +class google.registry.model.domain.DesignatedContact { + google.registry.model.domain.DesignatedContact$Type type; + google.registry.model.domain.ReferenceUnion contactId; } -enum com.google.domain.registry.model.domain.DesignatedContact$Type { +enum google.registry.model.domain.DesignatedContact$Type { ADMIN; BILLING; REGISTRANT; TECH; } -class com.google.domain.registry.model.domain.DomainApplication { +class google.registry.model.domain.DomainApplication { @Id java.lang.String repoId; - com.google.common.collect.ImmutableSortedMap> revisions; - com.google.domain.registry.model.CreateAutoTimestamp creationTime; - com.google.domain.registry.model.UpdateAutoTimestamp updateTimestamp; - com.google.domain.registry.model.domain.DomainAuthInfo authInfo; - com.google.domain.registry.model.domain.launch.ApplicationStatus applicationStatus; - com.google.domain.registry.model.domain.launch.LaunchNotice launchNotice; - com.google.domain.registry.model.domain.launch.LaunchPhase phase; - com.google.domain.registry.model.eppcommon.Trid creationTrid; - com.google.domain.registry.model.transfer.TransferData transferData; + com.google.common.collect.ImmutableSortedMap> revisions; + google.registry.model.CreateAutoTimestamp creationTime; + google.registry.model.UpdateAutoTimestamp updateTimestamp; + google.registry.model.domain.DomainAuthInfo authInfo; + google.registry.model.domain.launch.ApplicationStatus applicationStatus; + google.registry.model.domain.launch.LaunchNotice launchNotice; + google.registry.model.domain.launch.LaunchPhase phase; + google.registry.model.eppcommon.Trid creationTrid; + google.registry.model.transfer.TransferData transferData; java.lang.String creationClientId; java.lang.String currentSponsorClientId; java.lang.String fullyQualifiedDomainName; java.lang.String idnTableName; java.lang.String lastEppUpdateClientId; java.lang.String tld; - java.util.List encodedSignedMarks; - java.util.Set allContacts; - java.util.Set> nameservers; - java.util.Set dsData; - java.util.Set status; + java.util.List encodedSignedMarks; + java.util.Set allContacts; + java.util.Set> nameservers; + java.util.Set dsData; + java.util.Set status; org.joda.money.Money auctionPrice; org.joda.time.DateTime deletionTime; org.joda.time.DateTime lastEppUpdateTime; org.joda.time.DateTime lastTransferTime; } -class com.google.domain.registry.model.domain.DomainAuthInfo { - com.google.domain.registry.model.eppcommon.AuthInfo$PasswordAuth pw; +class google.registry.model.domain.DomainAuthInfo { + google.registry.model.eppcommon.AuthInfo$PasswordAuth pw; } -class com.google.domain.registry.model.domain.DomainBase { +class google.registry.model.domain.DomainBase { @Id java.lang.String repoId; - com.google.common.collect.ImmutableSortedMap> revisions; - com.google.domain.registry.model.CreateAutoTimestamp creationTime; - com.google.domain.registry.model.UpdateAutoTimestamp updateTimestamp; - com.google.domain.registry.model.domain.DomainAuthInfo authInfo; - com.google.domain.registry.model.domain.launch.LaunchNotice launchNotice; - com.google.domain.registry.model.transfer.TransferData transferData; + com.google.common.collect.ImmutableSortedMap> revisions; + google.registry.model.CreateAutoTimestamp creationTime; + google.registry.model.UpdateAutoTimestamp updateTimestamp; + google.registry.model.domain.DomainAuthInfo authInfo; + google.registry.model.domain.launch.LaunchNotice launchNotice; + google.registry.model.transfer.TransferData transferData; java.lang.String creationClientId; java.lang.String currentSponsorClientId; java.lang.String fullyQualifiedDomainName; java.lang.String idnTableName; java.lang.String lastEppUpdateClientId; java.lang.String tld; - java.util.Set allContacts; - java.util.Set> nameservers; - java.util.Set dsData; - java.util.Set status; + java.util.Set allContacts; + java.util.Set> nameservers; + java.util.Set dsData; + java.util.Set status; org.joda.time.DateTime deletionTime; org.joda.time.DateTime lastEppUpdateTime; org.joda.time.DateTime lastTransferTime; } -class com.google.domain.registry.model.domain.DomainResource { +class google.registry.model.domain.DomainResource { @Id java.lang.String repoId; - com.google.common.collect.ImmutableSortedMap> revisions; - com.google.domain.registry.model.CreateAutoTimestamp creationTime; - com.google.domain.registry.model.UpdateAutoTimestamp updateTimestamp; - com.google.domain.registry.model.domain.DomainAuthInfo authInfo; - com.google.domain.registry.model.domain.launch.LaunchNotice launchNotice; - com.google.domain.registry.model.transfer.TransferData transferData; - com.googlecode.objectify.Key deletePollMessage; - com.googlecode.objectify.Ref autorenewBillingEvent; - com.googlecode.objectify.Ref application; - com.googlecode.objectify.Ref autorenewPollMessage; + com.google.common.collect.ImmutableSortedMap> revisions; + com.googlecode.objectify.Key deletePollMessage; + com.googlecode.objectify.Ref autorenewBillingEvent; + com.googlecode.objectify.Ref application; + com.googlecode.objectify.Ref autorenewPollMessage; + google.registry.model.CreateAutoTimestamp creationTime; + google.registry.model.UpdateAutoTimestamp updateTimestamp; + google.registry.model.domain.DomainAuthInfo authInfo; + google.registry.model.domain.launch.LaunchNotice launchNotice; + google.registry.model.transfer.TransferData transferData; java.lang.String creationClientId; java.lang.String currentSponsorClientId; java.lang.String fullyQualifiedDomainName; @@ -258,11 +258,11 @@ class com.google.domain.registry.model.domain.DomainResource { java.lang.String lastEppUpdateClientId; java.lang.String smdId; java.lang.String tld; - java.util.Set allContacts; - java.util.Set gracePeriods; - java.util.Set> nameservers; - java.util.Set dsData; - java.util.Set status; + java.util.Set allContacts; + java.util.Set gracePeriods; + java.util.Set> nameservers; + java.util.Set dsData; + java.util.Set status; java.util.Set subordinateHosts; org.joda.time.DateTime applicationTime; org.joda.time.DateTime deletionTime; @@ -270,25 +270,25 @@ class com.google.domain.registry.model.domain.DomainResource { org.joda.time.DateTime lastTransferTime; org.joda.time.DateTime registrationExpirationTime; } -class com.google.domain.registry.model.domain.GracePeriod { - com.google.domain.registry.model.domain.rgp.GracePeriodStatus type; - com.googlecode.objectify.Ref billingEventOneTime; - com.googlecode.objectify.Ref billingEventRecurring; +class google.registry.model.domain.GracePeriod { + com.googlecode.objectify.Ref billingEventOneTime; + com.googlecode.objectify.Ref billingEventRecurring; + google.registry.model.domain.rgp.GracePeriodStatus type; java.lang.String clientId; org.joda.time.DateTime expirationTime; } -class com.google.domain.registry.model.domain.Period { - com.google.domain.registry.model.domain.Period$Unit unit; +class google.registry.model.domain.Period { + google.registry.model.domain.Period$Unit unit; java.lang.Integer value; } -enum com.google.domain.registry.model.domain.Period$Unit { +enum google.registry.model.domain.Period$Unit { MONTHS; YEARS; } -class com.google.domain.registry.model.domain.ReferenceUnion { +class google.registry.model.domain.ReferenceUnion { com.googlecode.objectify.Ref linked; } -enum com.google.domain.registry.model.domain.launch.ApplicationStatus { +enum google.registry.model.domain.launch.ApplicationStatus { ALLOCATED; INVALID; PENDING_ALLOCATION; @@ -296,26 +296,26 @@ enum com.google.domain.registry.model.domain.launch.ApplicationStatus { REJECTED; VALIDATED; } -class com.google.domain.registry.model.domain.launch.LaunchInfoResponseExtension { - com.google.domain.registry.model.domain.launch.ApplicationStatus applicationStatus; - com.google.domain.registry.model.domain.launch.LaunchPhase phase; +class google.registry.model.domain.launch.LaunchInfoResponseExtension { + google.registry.model.domain.launch.ApplicationStatus applicationStatus; + google.registry.model.domain.launch.LaunchPhase phase; java.lang.String applicationId; - java.util.List marks; + java.util.List marks; } -class com.google.domain.registry.model.domain.launch.LaunchNotice { - com.google.domain.registry.model.domain.launch.LaunchNotice$NoticeIdType noticeId; +class google.registry.model.domain.launch.LaunchNotice { + google.registry.model.domain.launch.LaunchNotice$NoticeIdType noticeId; org.joda.time.DateTime acceptedTime; org.joda.time.DateTime expirationTime; } -class com.google.domain.registry.model.domain.launch.LaunchNotice$NoticeIdType { +class google.registry.model.domain.launch.LaunchNotice$NoticeIdType { java.lang.String tcnId; java.lang.String validatorId; } -class com.google.domain.registry.model.domain.launch.LaunchPhase { +class google.registry.model.domain.launch.LaunchPhase { java.lang.String phase; java.lang.String subphase; } -enum com.google.domain.registry.model.domain.rgp.GracePeriodStatus { +enum google.registry.model.domain.rgp.GracePeriodStatus { ADD; AUTO_RENEW; PENDING_DELETE; @@ -325,20 +325,20 @@ enum com.google.domain.registry.model.domain.rgp.GracePeriodStatus { SUNRUSH_ADD; TRANSFER; } -class com.google.domain.registry.model.domain.secdns.DelegationSignerData { +class google.registry.model.domain.secdns.DelegationSignerData { byte[] digest; int algorithm; int digestType; int keyTag; } -class com.google.domain.registry.model.eppcommon.AuthInfo$PasswordAuth { +class google.registry.model.eppcommon.AuthInfo$PasswordAuth { java.lang.String repoId; java.lang.String value; } -class com.google.domain.registry.model.eppcommon.PresenceMarker { +class google.registry.model.eppcommon.PresenceMarker { boolean marked; } -enum com.google.domain.registry.model.eppcommon.StatusValue { +enum google.registry.model.eppcommon.StatusValue { CLIENT_DELETE_PROHIBITED; CLIENT_HOLD; CLIENT_RENEW_PROHIBITED; @@ -357,238 +357,238 @@ enum com.google.domain.registry.model.eppcommon.StatusValue { SERVER_TRANSFER_PROHIBITED; SERVER_UPDATE_PROHIBITED; } -class com.google.domain.registry.model.eppcommon.Trid { +class google.registry.model.eppcommon.Trid { java.lang.String clientTransactionId; java.lang.String serverTransactionId; } -class com.google.domain.registry.model.export.LogsExportCursor { +class google.registry.model.export.LogsExportCursor { @Id long id; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; java.util.List filesPendingImport; - java.util.Set exportedRanges; + java.util.Set exportedRanges; } -class com.google.domain.registry.model.host.HostResource { +class google.registry.model.host.HostResource { @Id java.lang.String repoId; - com.google.common.collect.ImmutableSortedMap> revisions; - com.google.domain.registry.model.CreateAutoTimestamp creationTime; - com.google.domain.registry.model.UpdateAutoTimestamp updateTimestamp; - com.google.domain.registry.model.transfer.TransferData transferData; - com.googlecode.objectify.Ref superordinateDomain; + com.google.common.collect.ImmutableSortedMap> revisions; + com.googlecode.objectify.Ref superordinateDomain; + google.registry.model.CreateAutoTimestamp creationTime; + google.registry.model.UpdateAutoTimestamp updateTimestamp; + google.registry.model.transfer.TransferData transferData; java.lang.String creationClientId; java.lang.String currentSponsorClientId; java.lang.String fullyQualifiedHostName; java.lang.String lastEppUpdateClientId; - java.util.Set status; + java.util.Set status; java.util.Set inetAddresses; org.joda.time.DateTime deletionTime; org.joda.time.DateTime lastEppUpdateTime; org.joda.time.DateTime lastSuperordinateChange; org.joda.time.DateTime lastTransferTime; } -class com.google.domain.registry.model.index.DomainApplicationIndex { +class google.registry.model.index.DomainApplicationIndex { @Id java.lang.String fullyQualifiedDomainName; - com.google.domain.registry.model.UpdateAutoTimestamp updateTimestamp; - java.util.Set> references; + google.registry.model.UpdateAutoTimestamp updateTimestamp; + java.util.Set> references; } -class com.google.domain.registry.model.index.EppResourceIndex { +class google.registry.model.index.EppResourceIndex { @Id java.lang.String id; - @Parent com.googlecode.objectify.Key bucket; - com.google.domain.registry.model.UpdateAutoTimestamp updateTimestamp; - com.googlecode.objectify.Ref reference; + @Parent com.googlecode.objectify.Key bucket; + com.googlecode.objectify.Ref reference; + google.registry.model.UpdateAutoTimestamp updateTimestamp; java.lang.String kind; } -class com.google.domain.registry.model.index.EppResourceIndexBucket { +class google.registry.model.index.EppResourceIndexBucket { @Id long bucketId; } -class com.google.domain.registry.model.index.ForeignKeyIndex$ForeignKeyContactIndex { +class google.registry.model.index.ForeignKeyIndex$ForeignKeyContactIndex { @Id java.lang.String foreignKey; - com.google.domain.registry.model.UpdateAutoTimestamp updateTimestamp; com.googlecode.objectify.Ref topReference; + google.registry.model.UpdateAutoTimestamp updateTimestamp; org.joda.time.DateTime deletionTime; } -class com.google.domain.registry.model.index.ForeignKeyIndex$ForeignKeyDomainIndex { +class google.registry.model.index.ForeignKeyIndex$ForeignKeyDomainIndex { @Id java.lang.String foreignKey; - com.google.domain.registry.model.UpdateAutoTimestamp updateTimestamp; com.googlecode.objectify.Ref topReference; + google.registry.model.UpdateAutoTimestamp updateTimestamp; org.joda.time.DateTime deletionTime; } -class com.google.domain.registry.model.index.ForeignKeyIndex$ForeignKeyHostIndex { +class google.registry.model.index.ForeignKeyIndex$ForeignKeyHostIndex { @Id java.lang.String foreignKey; - com.google.domain.registry.model.UpdateAutoTimestamp updateTimestamp; com.googlecode.objectify.Ref topReference; + google.registry.model.UpdateAutoTimestamp updateTimestamp; org.joda.time.DateTime deletionTime; } -class com.google.domain.registry.model.mark.CourtMark { +class google.registry.model.mark.CourtMark { java.lang.String countryCode; java.lang.String courtName; java.lang.String goodsAndServices; java.lang.String id; java.lang.String markName; java.lang.String referenceNumber; - java.util.List contacts; - java.util.List markHolders; + java.util.List contacts; + java.util.List markHolders; java.util.List labels; java.util.List regions; org.joda.time.DateTime protectionDate; } -class com.google.domain.registry.model.mark.Mark { - java.util.List courtMarks; - java.util.List trademarks; - java.util.List treatyOrStatuteMarks; +class google.registry.model.mark.Mark { + java.util.List courtMarks; + java.util.List trademarks; + java.util.List treatyOrStatuteMarks; } -class com.google.domain.registry.model.mark.MarkAddress { +class google.registry.model.mark.MarkAddress { java.lang.String city; java.lang.String countryCode; java.lang.String state; java.lang.String zip; java.util.List street; } -class com.google.domain.registry.model.mark.MarkContact { - com.google.domain.registry.model.mark.MarkAddress address; - com.google.domain.registry.model.mark.MarkContact$ContactType type; - com.google.domain.registry.model.mark.MarkPhoneNumber fax; - com.google.domain.registry.model.mark.MarkPhoneNumber voice; +class google.registry.model.mark.MarkContact { + google.registry.model.mark.MarkAddress address; + google.registry.model.mark.MarkContact$ContactType type; + google.registry.model.mark.MarkPhoneNumber fax; + google.registry.model.mark.MarkPhoneNumber voice; java.lang.String email; java.lang.String name; java.lang.String organization; } -enum com.google.domain.registry.model.mark.MarkContact$ContactType { +enum google.registry.model.mark.MarkContact$ContactType { AGENT; OWNER; THIRD_PARTY; } -class com.google.domain.registry.model.mark.MarkHolder { - com.google.domain.registry.model.mark.MarkAddress address; - com.google.domain.registry.model.mark.MarkHolder$EntitlementType entitlement; - com.google.domain.registry.model.mark.MarkPhoneNumber fax; - com.google.domain.registry.model.mark.MarkPhoneNumber voice; +class google.registry.model.mark.MarkHolder { + google.registry.model.mark.MarkAddress address; + google.registry.model.mark.MarkHolder$EntitlementType entitlement; + google.registry.model.mark.MarkPhoneNumber fax; + google.registry.model.mark.MarkPhoneNumber voice; java.lang.String email; java.lang.String name; java.lang.String organization; } -enum com.google.domain.registry.model.mark.MarkHolder$EntitlementType { +enum google.registry.model.mark.MarkHolder$EntitlementType { ASSIGNEE; LICENSEE; OWNER; } -class com.google.domain.registry.model.mark.MarkPhoneNumber { +class google.registry.model.mark.MarkPhoneNumber { java.lang.String extension; java.lang.String phoneNumber; } -class com.google.domain.registry.model.mark.MarkProtection { +class google.registry.model.mark.MarkProtection { java.lang.String countryCode; java.lang.String region; java.util.List rulingCountryCodes; } -class com.google.domain.registry.model.mark.Trademark { +class google.registry.model.mark.Trademark { java.lang.String applicationId; java.lang.String goodsAndServices; java.lang.String id; java.lang.String jurisdiction; java.lang.String markName; java.lang.String registrationNumber; - java.util.List contacts; - java.util.List markHolders; + java.util.List contacts; + java.util.List markHolders; java.util.List markClasses; java.util.List labels; org.joda.time.DateTime applicationDate; org.joda.time.DateTime expirationDate; org.joda.time.DateTime registrationDate; } -class com.google.domain.registry.model.mark.TreatyOrStatuteMark { +class google.registry.model.mark.TreatyOrStatuteMark { java.lang.String goodsAndServices; java.lang.String id; java.lang.String markName; java.lang.String referenceNumber; java.lang.String title; - java.util.List contacts; - java.util.List markHolders; - java.util.List markProtections; + java.util.List contacts; + java.util.List markHolders; + java.util.List markProtections; java.util.List labels; org.joda.time.DateTime executionDate; org.joda.time.DateTime protectionDate; } -class com.google.domain.registry.model.ofy.CommitLogBucket { +class google.registry.model.ofy.CommitLogBucket { @Id long bucketNum; org.joda.time.DateTime lastWrittenTime; } -class com.google.domain.registry.model.ofy.CommitLogCheckpoint { +class google.registry.model.ofy.CommitLogCheckpoint { @Id long checkpointTime; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; java.util.List bucketTimestamps; } -class com.google.domain.registry.model.ofy.CommitLogCheckpointRoot { +class google.registry.model.ofy.CommitLogCheckpointRoot { @Id long id; org.joda.time.DateTime lastWrittenTime; } -class com.google.domain.registry.model.ofy.CommitLogManifest { +class google.registry.model.ofy.CommitLogManifest { @Id long commitTime; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; java.util.Set> deletions; } -class com.google.domain.registry.model.ofy.CommitLogMutation { +class google.registry.model.ofy.CommitLogMutation { @Id java.lang.String entityKey; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; byte[] entityProtoBytes; } -class com.google.domain.registry.model.poll.PendingActionNotificationResponse$ContactPendingActionNotificationResponse { - com.google.domain.registry.model.eppcommon.Trid trid; - com.google.domain.registry.model.poll.PendingActionNotificationResponse$NameOrId nameOrId; +class google.registry.model.poll.PendingActionNotificationResponse$ContactPendingActionNotificationResponse { + google.registry.model.eppcommon.Trid trid; + google.registry.model.poll.PendingActionNotificationResponse$NameOrId nameOrId; org.joda.time.DateTime processedDate; } -class com.google.domain.registry.model.poll.PendingActionNotificationResponse$DomainPendingActionNotificationResponse { - com.google.domain.registry.model.eppcommon.Trid trid; - com.google.domain.registry.model.poll.PendingActionNotificationResponse$NameOrId nameOrId; +class google.registry.model.poll.PendingActionNotificationResponse$DomainPendingActionNotificationResponse { + google.registry.model.eppcommon.Trid trid; + google.registry.model.poll.PendingActionNotificationResponse$NameOrId nameOrId; org.joda.time.DateTime processedDate; } -class com.google.domain.registry.model.poll.PendingActionNotificationResponse$NameOrId { +class google.registry.model.poll.PendingActionNotificationResponse$NameOrId { boolean actionResult; java.lang.String value; } -class com.google.domain.registry.model.poll.PollMessage { +class google.registry.model.poll.PollMessage { @Id long id; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; java.lang.String clientId; java.lang.String msg; org.joda.time.DateTime eventTime; } -class com.google.domain.registry.model.poll.PollMessage$Autorenew { +class google.registry.model.poll.PollMessage$Autorenew { @Id long id; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; java.lang.String clientId; java.lang.String msg; java.lang.String targetId; org.joda.time.DateTime autorenewEndTime; org.joda.time.DateTime eventTime; } -class com.google.domain.registry.model.poll.PollMessage$OneTime { +class google.registry.model.poll.PollMessage$OneTime { @Id long id; - @Parent com.googlecode.objectify.Key parent; - com.google.domain.registry.model.domain.launch.LaunchInfoResponseExtension launchInfoResponseExtension; + @Parent com.googlecode.objectify.Key parent; + google.registry.model.domain.launch.LaunchInfoResponseExtension launchInfoResponseExtension; java.lang.String clientId; java.lang.String msg; - java.util.List contactPendingActionNotificationResponses; - java.util.List domainPendingActionNotificationResponses; - java.util.List contactTransferResponses; - java.util.List domainTransferResponses; + java.util.List contactPendingActionNotificationResponses; + java.util.List domainPendingActionNotificationResponses; + java.util.List contactTransferResponses; + java.util.List domainTransferResponses; org.joda.time.DateTime eventTime; } -class com.google.domain.registry.model.rde.RdeRevision { +class google.registry.model.rde.RdeRevision { @Id java.lang.String id; int revision; } -class com.google.domain.registry.model.registrar.Registrar { +class google.registry.model.registrar.Registrar { @Id java.lang.String clientIdentifier; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; boolean blockPremiumNames; boolean contactsRequireSyncing; - com.google.domain.registry.model.CreateAutoTimestamp creationTime; - com.google.domain.registry.model.UpdateAutoTimestamp lastUpdateTime; - com.google.domain.registry.model.registrar.Registrar$BillingMethod billingMethod; - com.google.domain.registry.model.registrar.Registrar$State state; - com.google.domain.registry.model.registrar.Registrar$Type type; - com.google.domain.registry.model.registrar.RegistrarAddress internationalizedAddress; - com.google.domain.registry.model.registrar.RegistrarAddress localizedAddress; + google.registry.model.CreateAutoTimestamp creationTime; + google.registry.model.UpdateAutoTimestamp lastUpdateTime; + google.registry.model.registrar.Registrar$BillingMethod billingMethod; + google.registry.model.registrar.Registrar$State state; + google.registry.model.registrar.Registrar$Type type; + google.registry.model.registrar.RegistrarAddress internationalizedAddress; + google.registry.model.registrar.RegistrarAddress localizedAddress; java.lang.Long billingIdentifier; java.lang.Long ianaIdentifier; java.lang.String clientCertificate; @@ -607,20 +607,20 @@ class com.google.domain.registry.model.registrar.Registrar { java.lang.String salt; java.lang.String url; java.lang.String whoisServer; - java.util.List ipAddressWhitelist; + java.util.List ipAddressWhitelist; java.util.Set allowedTlds; org.joda.time.DateTime lastCertificateUpdateTime; } -enum com.google.domain.registry.model.registrar.Registrar$BillingMethod { +enum google.registry.model.registrar.Registrar$BillingMethod { BRAINTREE; EXTERNAL; } -enum com.google.domain.registry.model.registrar.Registrar$State { +enum google.registry.model.registrar.Registrar$State { ACTIVE; PENDING; SUSPENDED; } -enum com.google.domain.registry.model.registrar.Registrar$Type { +enum google.registry.model.registrar.Registrar$Type { EXTERNAL_MONITORING; INTERNAL; MONITORING; @@ -629,25 +629,25 @@ enum com.google.domain.registry.model.registrar.Registrar$Type { REAL; TEST; } -class com.google.domain.registry.model.registrar.RegistrarAddress { +class google.registry.model.registrar.RegistrarAddress { java.lang.String city; java.lang.String countryCode; java.lang.String state; java.lang.String zip; java.util.List street; } -class com.google.domain.registry.model.registrar.RegistrarContact { +class google.registry.model.registrar.RegistrarContact { @Id java.lang.String emailAddress; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; boolean visibleInWhoisAsAdmin; boolean visibleInWhoisAsTech; java.lang.String faxNumber; java.lang.String gaeUserId; java.lang.String name; java.lang.String phoneNumber; - java.util.Set types; + java.util.Set types; } -enum com.google.domain.registry.model.registrar.RegistrarContact$Type { +enum google.registry.model.registrar.RegistrarContact$Type { ABUSE; ADMIN; BILLING; @@ -656,23 +656,23 @@ enum com.google.domain.registry.model.registrar.RegistrarContact$Type { TECH; WHOIS; } -class com.google.domain.registry.model.registry.Registry { +class google.registry.model.registry.Registry { @Id java.lang.String tldStrId; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; boolean dnsPaused; boolean escrowEnabled; boolean premiumPriceAckRequired; - com.google.domain.registry.model.CreateAutoTimestamp creationTime; - com.google.domain.registry.model.common.TimedTransitionProperty tldStateTransitions; - com.google.domain.registry.model.common.TimedTransitionProperty renewBillingCostTransitions; - com.google.domain.registry.model.registry.Registry$TldType tldType; - com.googlecode.objectify.Key premiumList; + com.googlecode.objectify.Key premiumList; + google.registry.model.CreateAutoTimestamp creationTime; + google.registry.model.common.TimedTransitionProperty tldStateTransitions; + google.registry.model.common.TimedTransitionProperty renewBillingCostTransitions; + google.registry.model.registry.Registry$TldType tldType; java.lang.String driveFolderId; java.lang.String lordnUsername; java.lang.String roidSuffix; java.lang.String tldStr; java.lang.String tldUnicode; - java.util.Set> reservedLists; + java.util.Set> reservedLists; java.util.Set allowedFullyQualifiedHostNames; java.util.Set allowedRegistrantContactIds; org.joda.money.CurrencyUnit currency; @@ -690,11 +690,11 @@ class com.google.domain.registry.model.registry.Registry { org.joda.time.Duration sunrushAddGracePeriodLength; org.joda.time.Duration transferGracePeriodLength; } -class com.google.domain.registry.model.registry.Registry$BillingCostTransition { +class google.registry.model.registry.Registry$BillingCostTransition { org.joda.money.Money billingCost; org.joda.time.DateTime transitionTime; } -enum com.google.domain.registry.model.registry.Registry$TldState { +enum google.registry.model.registry.Registry$TldState { GENERAL_AVAILABILITY; LANDRUSH; PDT; @@ -703,38 +703,38 @@ enum com.google.domain.registry.model.registry.Registry$TldState { SUNRISE; SUNRUSH; } -class com.google.domain.registry.model.registry.Registry$TldStateTransition { - com.google.domain.registry.model.registry.Registry$TldState tldState; +class google.registry.model.registry.Registry$TldStateTransition { + google.registry.model.registry.Registry$TldState tldState; org.joda.time.DateTime transitionTime; } -enum com.google.domain.registry.model.registry.Registry$TldType { +enum google.registry.model.registry.Registry$TldType { REAL; TEST; } -class com.google.domain.registry.model.registry.RegistryCursor { +class google.registry.model.registry.RegistryCursor { @Id java.lang.String cursorType; - @Parent com.googlecode.objectify.Key registry; + @Parent com.googlecode.objectify.Key registry; org.joda.time.DateTime date; } -class com.google.domain.registry.model.registry.label.PremiumList { +class google.registry.model.registry.label.PremiumList { @Id java.lang.String name; - @Parent com.googlecode.objectify.Key parent; - com.googlecode.objectify.Key revisionKey; + @Parent com.googlecode.objectify.Key parent; + com.googlecode.objectify.Key revisionKey; java.lang.String description; org.joda.time.DateTime creationTime; org.joda.time.DateTime lastUpdateTime; } -class com.google.domain.registry.model.registry.label.PremiumList$PremiumListEntry { +class google.registry.model.registry.label.PremiumList$PremiumListEntry { @Id java.lang.String label; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; java.lang.String comment; org.joda.money.Money price; } -class com.google.domain.registry.model.registry.label.PremiumList$PremiumListRevision { +class google.registry.model.registry.label.PremiumList$PremiumListRevision { @Id long revisionId; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; } -enum com.google.domain.registry.model.registry.label.ReservationType { +enum google.registry.model.registry.label.ReservationType { ALLOWED_IN_SUNRISE; FULLY_BLOCKED; MISTAKEN_PREMIUM; @@ -742,35 +742,35 @@ enum com.google.domain.registry.model.registry.label.ReservationType { RESERVED_FOR_ANCHOR_TENANT; UNRESERVED; } -class com.google.domain.registry.model.registry.label.ReservedList { +class google.registry.model.registry.label.ReservedList { @Id java.lang.String name; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; boolean shouldPublish; java.lang.String description; - java.util.Map reservedListMap; + java.util.Map reservedListMap; org.joda.time.DateTime creationTime; org.joda.time.DateTime lastUpdateTime; } -class com.google.domain.registry.model.registry.label.ReservedList$ReservedListEntry { +class google.registry.model.registry.label.ReservedList$ReservedListEntry { @Id java.lang.String label; - com.google.domain.registry.model.registry.label.ReservationType reservationType; + google.registry.model.registry.label.ReservationType reservationType; java.lang.String authCode; java.lang.String comment; } -class com.google.domain.registry.model.reporting.HistoryEntry { +class google.registry.model.reporting.HistoryEntry { @Id long id; - @Parent com.googlecode.objectify.Ref parent; + @Parent com.googlecode.objectify.Ref parent; boolean bySuperuser; byte[] xmlBytes; - com.google.domain.registry.model.domain.Period period; - com.google.domain.registry.model.eppcommon.Trid trid; - com.google.domain.registry.model.reporting.HistoryEntry$Type type; + google.registry.model.domain.Period period; + google.registry.model.eppcommon.Trid trid; + google.registry.model.reporting.HistoryEntry$Type type; java.lang.Boolean requestedByRegistrar; java.lang.String clientId; java.lang.String reason; org.joda.time.DateTime modificationTime; } -enum com.google.domain.registry.model.reporting.HistoryEntry$Type { +enum google.registry.model.reporting.HistoryEntry$Type { CONTACT_CREATE; CONTACT_DELETE; CONTACT_DELETE_FAILURE; @@ -801,71 +801,71 @@ enum com.google.domain.registry.model.reporting.HistoryEntry$Type { HOST_UPDATE; SYNTHETIC; } -class com.google.domain.registry.model.server.Lock { +class google.registry.model.server.Lock { @Id java.lang.String lockId; java.util.LinkedHashSet queue; org.joda.time.DateTime expirationTime; } -class com.google.domain.registry.model.server.ServerSecret { +class google.registry.model.server.ServerSecret { @Id long id; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; long leastSignificant; long mostSignificant; } -class com.google.domain.registry.model.smd.EncodedSignedMark { +class google.registry.model.smd.EncodedSignedMark { com.google.appengine.api.datastore.Text encodedData; java.lang.String encoding; } -class com.google.domain.registry.model.smd.SignedMarkRevocationList { +class google.registry.model.smd.SignedMarkRevocationList { @Id long id; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; java.util.Map revokes; org.joda.time.DateTime creationTime; } -class com.google.domain.registry.model.tmch.ClaimsListShard { +class google.registry.model.tmch.ClaimsListShard { @Id long id; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; java.util.Map labelsToKeys; org.joda.time.DateTime creationTime; } -class com.google.domain.registry.model.tmch.ClaimsListShard$ClaimsListRevision { +class google.registry.model.tmch.ClaimsListShard$ClaimsListRevision { @Id long versionId; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; } -class com.google.domain.registry.model.tmch.ClaimsListShard$ClaimsListSingleton { +class google.registry.model.tmch.ClaimsListShard$ClaimsListSingleton { @Id long id; - @Parent com.googlecode.objectify.Key parent; - com.googlecode.objectify.Key activeRevision; + @Parent com.googlecode.objectify.Key parent; + com.googlecode.objectify.Key activeRevision; } -class com.google.domain.registry.model.tmch.TmchCrl { +class google.registry.model.tmch.TmchCrl { @Id long id; - @Parent com.googlecode.objectify.Key parent; + @Parent com.googlecode.objectify.Key parent; java.lang.String crl; org.joda.time.DateTime updated; } -class com.google.domain.registry.model.transfer.TransferData { - com.google.domain.registry.model.eppcommon.Trid transferRequestTrid; - com.google.domain.registry.model.transfer.TransferStatus transferStatus; - com.googlecode.objectify.Ref serverApproveBillingEvent; - com.googlecode.objectify.Ref serverApproveAutorenewEvent; - com.googlecode.objectify.Ref serverApproveAutorenewPollMessage; +class google.registry.model.transfer.TransferData { + com.googlecode.objectify.Ref serverApproveBillingEvent; + com.googlecode.objectify.Ref serverApproveAutorenewEvent; + com.googlecode.objectify.Ref serverApproveAutorenewPollMessage; + google.registry.model.eppcommon.Trid transferRequestTrid; + google.registry.model.transfer.TransferStatus transferStatus; java.lang.Integer extendedRegistrationYears; java.lang.String gainingClientId; java.lang.String losingClientId; - java.util.Set> serverApproveEntities; + java.util.Set> serverApproveEntities; org.joda.time.DateTime pendingTransferExpirationTime; org.joda.time.DateTime transferRequestTime; } -class com.google.domain.registry.model.transfer.TransferResponse$ContactTransferResponse { - com.google.domain.registry.model.transfer.TransferStatus transferStatus; +class google.registry.model.transfer.TransferResponse$ContactTransferResponse { + google.registry.model.transfer.TransferStatus transferStatus; java.lang.String contactId; java.lang.String gainingClientId; java.lang.String losingClientId; org.joda.time.DateTime pendingTransferExpirationTime; org.joda.time.DateTime transferRequestTime; } -class com.google.domain.registry.model.transfer.TransferResponse$DomainTransferResponse { - com.google.domain.registry.model.transfer.TransferStatus transferStatus; +class google.registry.model.transfer.TransferResponse$DomainTransferResponse { + google.registry.model.transfer.TransferStatus transferStatus; java.lang.String fullyQualifiedDomainName; java.lang.String gainingClientId; java.lang.String losingClientId; @@ -873,7 +873,7 @@ class com.google.domain.registry.model.transfer.TransferResponse$DomainTransferR org.joda.time.DateTime pendingTransferExpirationTime; org.joda.time.DateTime transferRequestTime; } -enum com.google.domain.registry.model.transfer.TransferStatus { +enum google.registry.model.transfer.TransferStatus { CLIENT_APPROVED; CLIENT_CANCELLED; CLIENT_REJECTED; diff --git a/javatests/google/registry/model/server/LockTest.java b/javatests/google/registry/model/server/LockTest.java index c4a9197a4..0b17f65af 100644 --- a/javatests/google/registry/model/server/LockTest.java +++ b/javatests/google/registry/model/server/LockTest.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.server; +package google.registry.model.server; import static com.google.common.truth.Truth.assertThat; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; +import google.registry.model.ofy.Ofy; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; import org.joda.time.Duration; import org.junit.Rule; diff --git a/javatests/google/registry/model/smd/IssuerInfoTest.java b/javatests/google/registry/model/smd/IssuerInfoTest.java index 94027c533..e138421d2 100644 --- a/javatests/google/registry/model/smd/IssuerInfoTest.java +++ b/javatests/google/registry/model/smd/IssuerInfoTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.smd; +package google.registry.model.smd; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/model/smd/SignedMarkRevocationListTest.java b/javatests/google/registry/model/smd/SignedMarkRevocationListTest.java index 3b26c5b7a..98b63b784 100644 --- a/javatests/google/registry/model/smd/SignedMarkRevocationListTest.java +++ b/javatests/google/registry/model/smd/SignedMarkRevocationListTest.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.smd; +package google.registry.model.smd; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.smd.SignedMarkRevocationList.SHARD_SIZE; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.smd.SignedMarkRevocationList.SHARD_SIZE; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.time.Duration.standardDays; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; import com.googlecode.objectify.VoidWork; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; + import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/tmch/ClaimsListShardTest.java b/javatests/google/registry/model/tmch/ClaimsListShardTest.java index da523c897..a8f6a5292 100644 --- a/javatests/google/registry/model/tmch/ClaimsListShardTest.java +++ b/javatests/google/registry/model/tmch/ClaimsListShardTest.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.tmch; +package google.registry.model.tmch; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.tmch.ClaimsListShard.ClaimsListRevision; -import com.google.domain.registry.model.tmch.ClaimsListShard.UnshardedSaveException; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; import com.googlecode.objectify.Key; import com.googlecode.objectify.VoidWork; +import google.registry.model.tmch.ClaimsListShard.ClaimsListRevision; +import google.registry.model.tmch.ClaimsListShard.UnshardedSaveException; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; + import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/tmch/TmchCrlTest.java b/javatests/google/registry/model/tmch/TmchCrlTest.java index faea08592..f28415a80 100644 --- a/javatests/google/registry/model/tmch/TmchCrlTest.java +++ b/javatests/google/registry/model/tmch/TmchCrlTest.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.tmch; +package google.registry.model.tmch; import static com.google.common.truth.Truth.assertThat; -import com.google.domain.registry.testing.AppEngineRule; +import google.registry.testing.AppEngineRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/model/transfer/TransferDataTest.java b/javatests/google/registry/model/transfer/TransferDataTest.java index 8f712dd77..b26c052af 100644 --- a/javatests/google/registry/model/transfer/TransferDataTest.java +++ b/javatests/google/registry/model/transfer/TransferDataTest.java @@ -12,29 +12,30 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.transfer; +package google.registry.model.transfer; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Flag; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.DatastoreHelper; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Flag; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.domain.DomainResource; +import google.registry.model.poll.PollMessage; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; +import google.registry.testing.AppEngineRule; +import google.registry.testing.DatastoreHelper; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java b/javatests/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java index 06df4c958..76cf08b30 100644 --- a/javatests/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java +++ b/javatests/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java @@ -12,24 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import static org.joda.time.Duration.standardDays; import static org.joda.time.Duration.standardHours; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedMap; -import com.google.domain.registry.config.TestRegistryConfig; -import com.google.domain.registry.model.common.CrossTldSingleton; -import com.google.domain.registry.model.ofy.CommitLogManifest; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.testing.RegistryConfigRule; import com.googlecode.objectify.ObjectifyService; import com.googlecode.objectify.Ref; @@ -37,6 +28,16 @@ import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; import com.googlecode.objectify.annotation.Entity; +import google.registry.config.TestRegistryConfig; +import google.registry.model.common.CrossTldSingleton; +import google.registry.model.ofy.CommitLogManifest; +import google.registry.model.ofy.Ofy; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; +import google.registry.testing.RegistryConfigRule; + import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; diff --git a/javatests/google/registry/model/translators/StatusValueAdapterTest.java b/javatests/google/registry/model/translators/StatusValueAdapterTest.java index 56e1342ba..17645d426 100644 --- a/javatests/google/registry/model/translators/StatusValueAdapterTest.java +++ b/javatests/google/registry/model/translators/StatusValueAdapterTest.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.model.translators; +package google.registry.model.translators; import static com.google.common.truth.Truth.assertThat; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.flows.EppXmlTransformer; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppinput.EppInput; -import com.google.domain.registry.model.eppinput.EppInput.ResourceCommandWrapper; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Response; -import com.google.domain.registry.model.host.HostCommand; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.EppLoader; -import com.google.domain.registry.xml.ValidationMode; + +import google.registry.flows.EppXmlTransformer; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppinput.EppInput; +import google.registry.model.eppinput.EppInput.ResourceCommandWrapper; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Response; +import google.registry.model.host.HostCommand; +import google.registry.model.host.HostResource; +import google.registry.testing.AppEngineRule; +import google.registry.testing.EppLoader; +import google.registry.xml.ValidationMode; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/module/backend/BUILD b/javatests/google/registry/module/backend/BUILD index 03c20dc56..cb7733054 100644 --- a/javatests/google/registry/module/backend/BUILD +++ b/javatests/google/registry/module/backend/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "backend", @@ -12,11 +15,11 @@ java_library( "//third_party/java/appengine:appengine-api-testonly", ], deps = [ - "//java/com/google/domain/registry/module/backend", "//third_party/java/junit", "//third_party/java/mockito", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/module/backend", ], ) diff --git a/javatests/google/registry/module/backend/BackendServletTest.java b/javatests/google/registry/module/backend/BackendServletTest.java index 63419845b..b145655cf 100644 --- a/javatests/google/registry/module/backend/BackendServletTest.java +++ b/javatests/google/registry/module/backend/BackendServletTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.backend; +package google.registry.module.backend; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/module/frontend/BUILD b/javatests/google/registry/module/frontend/BUILD index 395a189ee..8ed9baf2b 100644 --- a/javatests/google/registry/module/frontend/BUILD +++ b/javatests/google/registry/module/frontend/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "frontend", @@ -12,11 +15,11 @@ java_library( "//third_party/java/appengine:appengine-api-testonly", ], deps = [ - "//java/com/google/domain/registry/module/frontend", "//third_party/java/junit", "//third_party/java/mockito", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/module/frontend", ], ) diff --git a/javatests/google/registry/module/frontend/FrontendServletTest.java b/javatests/google/registry/module/frontend/FrontendServletTest.java index e9a591262..452855fbd 100644 --- a/javatests/google/registry/module/frontend/FrontendServletTest.java +++ b/javatests/google/registry/module/frontend/FrontendServletTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.frontend; +package google.registry.module.frontend; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/module/tools/BUILD b/javatests/google/registry/module/tools/BUILD index 685f4474d..6eded4e47 100644 --- a/javatests/google/registry/module/tools/BUILD +++ b/javatests/google/registry/module/tools/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "tools", @@ -12,11 +15,11 @@ java_library( "//third_party/java/appengine:appengine-api-testonly", ], deps = [ - "//java/com/google/domain/registry/module/tools", "//third_party/java/junit", "//third_party/java/mockito", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/module/tools", ], ) diff --git a/javatests/google/registry/module/tools/ToolsServletTest.java b/javatests/google/registry/module/tools/ToolsServletTest.java index c7e534aa9..434be32c3 100644 --- a/javatests/google/registry/module/tools/ToolsServletTest.java +++ b/javatests/google/registry/module/tools/ToolsServletTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.module.tools; +package google.registry.module.tools; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/monitoring/whitebox/BUILD b/javatests/google/registry/monitoring/whitebox/BUILD index 59149cb91..76022fa85 100644 --- a/javatests/google/registry/monitoring/whitebox/BUILD +++ b/javatests/google/registry/monitoring/whitebox/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -17,14 +20,6 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/net", "//java/com/google/common/testing", - "//java/com/google/domain/registry/bigquery", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/mapreduce", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/monitoring/whitebox", - "//java/com/google/domain/registry/util", - "//javatests/com/google/domain/registry/testing", - "//javatests/com/google/domain/registry/testing/mapreduce", "//third_party/java/appengine:appengine-api-testonly", "//third_party/java/appengine:appengine-stubs", "//third_party/java/appengine:appengine-testing", @@ -35,6 +30,14 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/bigquery", + "//java/google/registry/config", + "//java/google/registry/mapreduce", + "//java/google/registry/model", + "//java/google/registry/monitoring/whitebox", + "//java/google/registry/util", + "//javatests/google/registry/testing", + "//javatests/google/registry/testing/mapreduce", ], ) diff --git a/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java b/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java index cc41ceed7..1f081cc88 100644 --- a/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java +++ b/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.monitoring.whitebox; +package google.registry.monitoring.whitebox; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.mockito.Matchers.anyString; @@ -30,8 +30,9 @@ import com.google.api.services.bigquery.model.TableDataInsertAllResponse; import com.google.api.services.bigquery.model.TableDataInsertAllResponse.InsertErrors; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; -import com.google.domain.registry.bigquery.BigqueryFactory; -import com.google.domain.registry.testing.AppEngineRule; + +import google.registry.bigquery.BigqueryFactory; +import google.registry.testing.AppEngineRule; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/monitoring/whitebox/MetricsTest.java b/javatests/google/registry/monitoring/whitebox/MetricsTest.java index 3d0e827c8..126b0f538 100644 --- a/javatests/google/registry/monitoring/whitebox/MetricsTest.java +++ b/javatests/google/registry/monitoring/whitebox/MetricsTest.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.monitoring.whitebox; +package google.registry.monitoring.whitebox; -import static com.google.domain.registry.testing.TaskQueueHelper.assertTasksEnqueued; +import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; import com.google.common.base.Suppliers; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.testing.TaskQueueHelper.TaskMatcher; + +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; +import google.registry.testing.TaskQueueHelper.TaskMatcher; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/monitoring/whitebox/VerifyEntityIntegrityActionTest.java b/javatests/google/registry/monitoring/whitebox/VerifyEntityIntegrityActionTest.java index 144c739ac..7b1dca249 100644 --- a/javatests/google/registry/monitoring/whitebox/VerifyEntityIntegrityActionTest.java +++ b/javatests/google/registry/monitoring/whitebox/VerifyEntityIntegrityActionTest.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.monitoring.whitebox; +package google.registry.monitoring.whitebox; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.deleteResource; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveContact; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveHost; -import static com.google.domain.registry.testing.DatastoreHelper.persistDeletedContact; -import static com.google.domain.registry.testing.DatastoreHelper.persistDomainAsDeleted; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.deleteResource; +import static google.registry.testing.DatastoreHelper.newDomainResource; +import static google.registry.testing.DatastoreHelper.persistActiveContact; +import static google.registry.testing.DatastoreHelper.persistActiveDomain; +import static google.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.persistDeletedContact; +import static google.registry.testing.DatastoreHelper.persistDomainAsDeleted; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; @@ -40,27 +40,28 @@ import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.bigquery.BigqueryFactory; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.FakeSleeper; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.testing.mapreduce.MapreduceTestCase; -import com.google.domain.registry.util.Retrier; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.bigquery.BigqueryFactory; +import google.registry.config.RegistryEnvironment; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.host.HostResource; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.FakeSleeper; +import google.registry.testing.InjectRule; +import google.registry.testing.mapreduce.MapreduceTestCase; +import google.registry.util.Retrier; + import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Before; diff --git a/javatests/google/registry/rdap/BUILD b/javatests/google/registry/rdap/BUILD index 7b60ac32e..d22521567 100644 --- a/javatests/google/registry/rdap/BUILD +++ b/javatests/google/registry/rdap/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -14,10 +17,6 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/rdap", - "//java/com/google/domain/registry/request", - "//javatests/com/google/domain/registry/testing", "//third_party/java/appengine:appengine-api-testonly", "//third_party/java/dagger", "//third_party/java/joda_time", @@ -28,6 +27,10 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/model", + "//java/google/registry/rdap", + "//java/google/registry/request", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/rdap/RdapActionBaseTest.java b/javatests/google/registry/rdap/RdapActionBaseTest.java index c89796097..4f6de6149 100644 --- a/javatests/google/registry/rdap/RdapActionBaseTest.java +++ b/javatests/google/registry/rdap/RdapActionBaseTest.java @@ -12,23 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import static com.google.common.net.HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.HEAD; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.TestDataHelper.loadFileWithSubstitutions; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.HEAD; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.rdap.RdapJsonFormatter.BoilerplateType; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.model.ofy.Ofy; +import google.registry.rdap.RdapJsonFormatter.BoilerplateType; +import google.registry.request.HttpException; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.InjectRule; import org.joda.time.DateTime; import org.json.simple.JSONValue; diff --git a/javatests/google/registry/rdap/RdapDomainActionTest.java b/javatests/google/registry/rdap/RdapDomainActionTest.java index c8d58b972..17bba1a0d 100644 --- a/javatests/google/registry/rdap/RdapDomainActionTest.java +++ b/javatests/google/registry/rdap/RdapDomainActionTest.java @@ -12,34 +12,35 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeHistoryEntry; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; -import static com.google.domain.registry.testing.TestDataHelper.loadFileWithSubstitutions; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources; +import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeHistoryEntry; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; +import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.Period; +import google.registry.model.host.HostResource; +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; +import google.registry.model.reporting.HistoryEntry; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.InjectRule; import org.joda.time.DateTime; import org.json.simple.JSONValue; diff --git a/javatests/google/registry/rdap/RdapDomainSearchActionTest.java b/javatests/google/registry/rdap/RdapDomainSearchActionTest.java index 50b25b51c..3a64540c6 100644 --- a/javatests/google/registry/rdap/RdapDomainSearchActionTest.java +++ b/javatests/google/registry/rdap/RdapDomainSearchActionTest.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistDomainAsDeleted; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeHistoryEntry; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; -import static com.google.domain.registry.testing.TestDataHelper.loadFileWithSubstitutions; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistDomainAsDeleted; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources; +import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeHistoryEntry; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; +import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -33,20 +33,21 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; import com.google.common.net.InetAddresses; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.InjectRule; import com.googlecode.objectify.Ref; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.Period; +import google.registry.model.host.HostResource; +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; +import google.registry.model.reporting.HistoryEntry; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.InjectRule; + import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.junit.Before; diff --git a/javatests/google/registry/rdap/RdapEntityActionTest.java b/javatests/google/registry/rdap/RdapEntityActionTest.java index bad870324..e0ea7eda4 100644 --- a/javatests/google/registry/rdap/RdapEntityActionTest.java +++ b/javatests/google/registry/rdap/RdapEntityActionTest.java @@ -12,30 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeContactResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeHostResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; -import static com.google.domain.registry.testing.TestDataHelper.loadFileWithSubstitutions; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources; +import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeContactResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeHostResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; +import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.model.contact.ContactResource; +import google.registry.model.host.HostResource; +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.InjectRule; import org.joda.time.DateTime; import org.json.simple.JSONValue; diff --git a/javatests/google/registry/rdap/RdapEntitySearchActionTest.java b/javatests/google/registry/rdap/RdapEntitySearchActionTest.java index d0999d00f..9ff2aa1f2 100644 --- a/javatests/google/registry/rdap/RdapEntitySearchActionTest.java +++ b/javatests/google/registry/rdap/RdapEntitySearchActionTest.java @@ -12,28 +12,29 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeContactResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; -import static com.google.domain.registry.testing.TestDataHelper.loadFileWithSubstitutions; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources; +import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeContactResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; +import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.model.contact.ContactResource; +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.InjectRule; import org.joda.time.DateTime; import org.json.simple.JSONValue; diff --git a/javatests/google/registry/rdap/RdapHelpActionTest.java b/javatests/google/registry/rdap/RdapHelpActionTest.java index 5e610e936..c8a59dc10 100644 --- a/javatests/google/registry/rdap/RdapHelpActionTest.java +++ b/javatests/google/registry/rdap/RdapHelpActionTest.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.TestDataHelper.loadFileWithSubstitutions; +import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.model.ofy.Ofy; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.InjectRule; import org.joda.time.DateTime; import org.json.simple.JSONValue; diff --git a/javatests/google/registry/rdap/RdapJsonFormatterTest.java b/javatests/google/registry/rdap/RdapJsonFormatterTest.java index 8dbccd614..822501e18 100644 --- a/javatests/google/registry/rdap/RdapJsonFormatterTest.java +++ b/javatests/google/registry/rdap/RdapJsonFormatterTest.java @@ -12,38 +12,39 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeHistoryEntry; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; -import static com.google.domain.registry.testing.TestDataHelper.loadFileWithSubstitutions; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources; +import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeHistoryEntry; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; +import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.rdap.RdapJsonFormatter.MakeRdapJsonNoticeParameters; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.Period; +import google.registry.model.host.HostResource; +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.model.registry.Registry.TldState; +import google.registry.model.reporting.HistoryEntry; +import google.registry.rdap.RdapJsonFormatter.MakeRdapJsonNoticeParameters; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; import org.joda.time.DateTime; import org.json.simple.JSONValue; diff --git a/javatests/google/registry/rdap/RdapNameserverActionTest.java b/javatests/google/registry/rdap/RdapNameserverActionTest.java index 0c84c9650..de92659c7 100644 --- a/javatests/google/registry/rdap/RdapNameserverActionTest.java +++ b/javatests/google/registry/rdap/RdapNameserverActionTest.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource; -import static com.google.domain.registry.testing.TestDataHelper.loadFileWithSubstitutions; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource; +import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.appengine.api.NamespaceManager; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.model.ofy.Ofy; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.InjectRule; import org.joda.time.DateTime; import org.json.simple.JSONValue; diff --git a/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java b/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java index 332e8ee2a..a06622d47 100644 --- a/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java +++ b/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java @@ -12,35 +12,36 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeContactResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; -import static com.google.domain.registry.testing.TestDataHelper.loadFileWithSubstitutions; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources; +import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeContactResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; +import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.InjectRule; import com.googlecode.objectify.Ref; +import google.registry.model.domain.DomainResource; +import google.registry.model.host.HostResource; +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.InjectRule; + import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.junit.Before; diff --git a/javatests/google/registry/rdap/RdapSearchPatternTest.java b/javatests/google/registry/rdap/RdapSearchPatternTest.java index 72509308e..ee1213374 100644 --- a/javatests/google/registry/rdap/RdapSearchPatternTest.java +++ b/javatests/google/registry/rdap/RdapSearchPatternTest.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import static com.google.common.truth.Truth.assertThat; -import com.google.domain.registry.request.HttpException.UnprocessableEntityException; -import com.google.domain.registry.testing.ExceptionRule; +import google.registry.request.HttpException.UnprocessableEntityException; +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/rdap/RdapTestHelper.java b/javatests/google/registry/rdap/RdapTestHelper.java index f1f1d6b18..c13c2eef3 100644 --- a/javatests/google/registry/rdap/RdapTestHelper.java +++ b/javatests/google/registry/rdap/RdapTestHelper.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rdap; +package google.registry.rdap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/javatests/google/registry/rde/BUILD b/javatests/google/registry/rde/BUILD index 09b77bad6..b1853744b 100644 --- a/javatests/google/registry/rde/BUILD +++ b/javatests/google/registry/rde/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -14,21 +17,6 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/gcs", - "//java/com/google/domain/registry/keyring/api", - "//java/com/google/domain/registry/mapreduce", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/rde", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/tldconfig/idn", - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/xjc", - "//java/com/google/domain/registry/xml", - "//javatests/com/google/domain/registry/testing", - "//javatests/com/google/domain/registry/testing/mapreduce", - "//javatests/com/google/domain/registry/testing/sftp", - "//javatests/com/google/domain/registry/xml", "//third_party/java/appengine:appengine-api-testonly", "//third_party/java/appengine_gcs_client", "//third_party/java/bouncycastle", @@ -45,6 +33,21 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/config", + "//java/google/registry/gcs", + "//java/google/registry/keyring/api", + "//java/google/registry/mapreduce", + "//java/google/registry/model", + "//java/google/registry/rde", + "//java/google/registry/request", + "//java/google/registry/tldconfig/idn", + "//java/google/registry/util", + "//java/google/registry/xjc", + "//java/google/registry/xml", + "//javatests/google/registry/testing", + "//javatests/google/registry/testing/mapreduce", + "//javatests/google/registry/testing/sftp", + "//javatests/google/registry/xml", ], ) diff --git a/javatests/google/registry/rde/BouncyCastleTest.java b/javatests/google/registry/rde/BouncyCastleTest.java index d4a91d16b..15a9bd036 100644 --- a/javatests/google/registry/rde/BouncyCastleTest.java +++ b/javatests/google/registry/rde/BouncyCastleTest.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.util.HexDumper.dumpHex; +import static google.registry.util.HexDumper.dumpHex; import static java.nio.charset.StandardCharsets.UTF_8; import static org.bouncycastle.bcpg.CompressionAlgorithmTags.ZIP; import static org.bouncycastle.bcpg.HashAlgorithmTags.SHA256; @@ -23,8 +23,9 @@ import static org.bouncycastle.bcpg.PublicKeyAlgorithmTags.RSA_GENERAL; import static org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags.AES_128; import com.google.common.io.CharStreams; -import com.google.domain.registry.testing.BouncyCastleProviderRule; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.testing.BouncyCastleProviderRule; +import google.registry.util.FormattingLogger; import org.bouncycastle.openpgp.PGPCompressedData; import org.bouncycastle.openpgp.PGPCompressedDataGenerator; diff --git a/javatests/google/registry/rde/BrdaCopyActionTest.java b/javatests/google/registry/rde/BrdaCopyActionTest.java index d517a7428..06472189b 100644 --- a/javatests/google/registry/rde/BrdaCopyActionTest.java +++ b/javatests/google/registry/rde/BrdaCopyActionTest.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static com.google.domain.registry.testing.GcsTestingUtils.readGcsFile; -import static com.google.domain.registry.testing.SystemInfo.hasCommand; +import static google.registry.testing.GcsTestingUtils.readGcsFile; +import static google.registry.testing.SystemInfo.hasCommand; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; import static org.junit.Assume.assumeTrue; @@ -28,13 +28,14 @@ import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.common.io.ByteSource; import com.google.common.io.CharStreams; import com.google.common.io.Files; -import com.google.domain.registry.gcs.GcsUtils; -import com.google.domain.registry.keyring.api.Keyring; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.BouncyCastleProviderRule; -import com.google.domain.registry.testing.GcsTestingUtils; -import com.google.domain.registry.testing.GpgSystemCommandRule; -import com.google.domain.registry.testing.Providers; + +import google.registry.gcs.GcsUtils; +import google.registry.keyring.api.Keyring; +import google.registry.testing.AppEngineRule; +import google.registry.testing.BouncyCastleProviderRule; +import google.registry.testing.GcsTestingUtils; +import google.registry.testing.GpgSystemCommandRule; +import google.registry.testing.Providers; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; diff --git a/javatests/google/registry/rde/ContactResourceToXjcConverterTest.java b/javatests/google/registry/rde/ContactResourceToXjcConverterTest.java index 13313e8cb..ce46a89fd 100644 --- a/javatests/google/registry/rde/ContactResourceToXjcConverterTest.java +++ b/javatests/google/registry/rde/ContactResourceToXjcConverterTest.java @@ -12,40 +12,41 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.createTld; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.contact.ContactAddress; -import com.google.domain.registry.model.contact.ContactAuthInfo; -import com.google.domain.registry.model.contact.ContactPhoneNumber; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.Disclose; -import com.google.domain.registry.model.contact.PostalInfo; -import com.google.domain.registry.model.eppcommon.AuthInfo.PasswordAuth; -import com.google.domain.registry.model.eppcommon.PresenceMarker; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferStatus; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.xjc.contact.XjcContactPostalInfoEnumType; -import com.google.domain.registry.xjc.contact.XjcContactPostalInfoType; -import com.google.domain.registry.xjc.contact.XjcContactStatusType; -import com.google.domain.registry.xjc.contact.XjcContactStatusValueType; -import com.google.domain.registry.xjc.eppcom.XjcEppcomTrStatusType; -import com.google.domain.registry.xjc.rde.XjcRdeContentsType; -import com.google.domain.registry.xjc.rde.XjcRdeDeposit; -import com.google.domain.registry.xjc.rde.XjcRdeDepositTypeType; -import com.google.domain.registry.xjc.rde.XjcRdeMenuType; -import com.google.domain.registry.xjc.rdecontact.XjcRdeContact; -import com.google.domain.registry.xjc.rdecontact.XjcRdeContactElement; + +import google.registry.model.contact.ContactAddress; +import google.registry.model.contact.ContactAuthInfo; +import google.registry.model.contact.ContactPhoneNumber; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.Disclose; +import google.registry.model.contact.PostalInfo; +import google.registry.model.eppcommon.AuthInfo.PasswordAuth; +import google.registry.model.eppcommon.PresenceMarker; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferStatus; +import google.registry.testing.AppEngineRule; +import google.registry.xjc.contact.XjcContactPostalInfoEnumType; +import google.registry.xjc.contact.XjcContactPostalInfoType; +import google.registry.xjc.contact.XjcContactStatusType; +import google.registry.xjc.contact.XjcContactStatusValueType; +import google.registry.xjc.eppcom.XjcEppcomTrStatusType; +import google.registry.xjc.rde.XjcRdeContentsType; +import google.registry.xjc.rde.XjcRdeDeposit; +import google.registry.xjc.rde.XjcRdeDepositTypeType; +import google.registry.xjc.rde.XjcRdeMenuType; +import google.registry.xjc.rdecontact.XjcRdeContact; +import google.registry.xjc.rdecontact.XjcRdeContactElement; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/rde/DomainResourceToXjcConverterTest.java b/javatests/google/registry/rde/DomainResourceToXjcConverterTest.java index bb53f4a01..08429a0fc 100644 --- a/javatests/google/registry/rde/DomainResourceToXjcConverterTest.java +++ b/javatests/google/registry/rde/DomainResourceToXjcConverterTest.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.io.BaseEncoding.base16; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistEppResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.xjc.rgp.XjcRgpStatusValueType.RENEW_PERIOD; -import static com.google.domain.registry.xjc.rgp.XjcRgpStatusValueType.TRANSFER_PERIOD; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainResource; +import static google.registry.testing.DatastoreHelper.persistEppResource; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.xjc.rgp.XjcRgpStatusValueType.RENEW_PERIOD; +import static google.registry.xjc.rgp.XjcRgpStatusValueType.TRANSFER_PERIOD; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.money.CurrencyUnit.USD; @@ -31,50 +31,51 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Flag; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.contact.ContactAddress; -import com.google.domain.registry.model.contact.ContactPhoneNumber; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.PostalInfo; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.DomainAuthInfo; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppcommon.AuthInfo.PasswordAuth; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.poll.PollMessage.Autorenew; -import com.google.domain.registry.model.rde.RdeMode; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; -import com.google.domain.registry.model.transfer.TransferStatus; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.util.Idn; -import com.google.domain.registry.xjc.domain.XjcDomainContactType; -import com.google.domain.registry.xjc.domain.XjcDomainStatusType; -import com.google.domain.registry.xjc.domain.XjcDomainStatusValueType; -import com.google.domain.registry.xjc.rde.XjcRdeContentsType; -import com.google.domain.registry.xjc.rde.XjcRdeDeposit; -import com.google.domain.registry.xjc.rde.XjcRdeDepositTypeType; -import com.google.domain.registry.xjc.rde.XjcRdeMenuType; -import com.google.domain.registry.xjc.rdedomain.XjcRdeDomain; -import com.google.domain.registry.xjc.rdedomain.XjcRdeDomainElement; -import com.google.domain.registry.xjc.rgp.XjcRgpStatusType; -import com.google.domain.registry.xjc.rgp.XjcRgpStatusValueType; -import com.google.domain.registry.xjc.secdns.XjcSecdnsDsDataType; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Flag; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.contact.ContactAddress; +import google.registry.model.contact.ContactPhoneNumber; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.PostalInfo; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.DomainAuthInfo; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppcommon.AuthInfo.PasswordAuth; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.host.HostResource; +import google.registry.model.poll.PollMessage; +import google.registry.model.poll.PollMessage.Autorenew; +import google.registry.model.rde.RdeMode; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; +import google.registry.model.transfer.TransferStatus; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.util.Idn; +import google.registry.xjc.domain.XjcDomainContactType; +import google.registry.xjc.domain.XjcDomainStatusType; +import google.registry.xjc.domain.XjcDomainStatusValueType; +import google.registry.xjc.rde.XjcRdeContentsType; +import google.registry.xjc.rde.XjcRdeDeposit; +import google.registry.xjc.rde.XjcRdeDepositTypeType; +import google.registry.xjc.rde.XjcRdeMenuType; +import google.registry.xjc.rdedomain.XjcRdeDomain; +import google.registry.xjc.rdedomain.XjcRdeDomainElement; +import google.registry.xjc.rgp.XjcRgpStatusType; +import google.registry.xjc.rgp.XjcRgpStatusValueType; +import google.registry.xjc.secdns.XjcSecdnsDsDataType; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/rde/EscrowTaskRunnerTest.java b/javatests/google/registry/rde/EscrowTaskRunnerTest.java index f421a9327..f9eb02f7a 100644 --- a/javatests/google/registry/rde/EscrowTaskRunnerTest.java +++ b/javatests/google/registry/rde/EscrowTaskRunnerTest.java @@ -12,27 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.Duration.standardDays; import static org.joda.time.Duration.standardSeconds; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.model.server.Lock; -import com.google.domain.registry.rde.EscrowTaskRunner.EscrowTask; -import com.google.domain.registry.request.HttpException.NoContentException; -import com.google.domain.registry.request.HttpException.ServiceUnavailableException; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; +import google.registry.model.server.Lock; +import google.registry.rde.EscrowTaskRunner.EscrowTask; +import google.registry.request.HttpException.NoContentException; +import google.registry.request.HttpException.ServiceUnavailableException; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/javatests/google/registry/rde/GhostrydeGpgIntegrationTest.java b/javatests/google/registry/rde/GhostrydeGpgIntegrationTest.java index aa302badc..b20ff586a 100644 --- a/javatests/google/registry/rde/GhostrydeGpgIntegrationTest.java +++ b/javatests/google/registry/rde/GhostrydeGpgIntegrationTest.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Strings.repeat; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static com.google.domain.registry.testing.SystemInfo.hasCommand; +import static google.registry.testing.SystemInfo.hasCommand; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assume.assumeTrue; import com.google.common.io.CharStreams; -import com.google.domain.registry.keyring.api.Keyring; -import com.google.domain.registry.testing.BouncyCastleProviderRule; -import com.google.domain.registry.testing.GpgSystemCommandRule; + +import google.registry.keyring.api.Keyring; +import google.registry.testing.BouncyCastleProviderRule; +import google.registry.testing.GpgSystemCommandRule; import org.bouncycastle.openpgp.PGPPublicKey; import org.joda.time.DateTime; diff --git a/javatests/google/registry/rde/GhostrydeTest.java b/javatests/google/registry/rde/GhostrydeTest.java index ca94ffab0..5b8f9c5ef 100644 --- a/javatests/google/registry/rde/GhostrydeTest.java +++ b/javatests/google/registry/rde/GhostrydeTest.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Strings.repeat; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.keyring.api.PgpHelper.KeyRequirement.ENCRYPT; +import static google.registry.keyring.api.PgpHelper.KeyRequirement.ENCRYPT; import static java.nio.charset.StandardCharsets.UTF_8; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; @@ -24,10 +24,11 @@ import static org.hamcrest.Matchers.lessThan; import static org.junit.Assume.assumeThat; import com.google.common.io.ByteStreams; -import com.google.domain.registry.keyring.api.Keyring; -import com.google.domain.registry.rde.Ghostryde.DecodeResult; -import com.google.domain.registry.testing.BouncyCastleProviderRule; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.keyring.api.Keyring; +import google.registry.rde.Ghostryde.DecodeResult; +import google.registry.testing.BouncyCastleProviderRule; +import google.registry.testing.ExceptionRule; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPKeyPair; diff --git a/javatests/google/registry/rde/HostResourceToXjcConverterTest.java b/javatests/google/registry/rde/HostResourceToXjcConverterTest.java index 6b6bdcb9c..eb6537199 100644 --- a/javatests/google/registry/rde/HostResourceToXjcConverterTest.java +++ b/javatests/google/registry/rde/HostResourceToXjcConverterTest.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.xjc.XjcXmlTransformer.marshalStrict; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.xjc.XjcXmlTransformer.marshalStrict; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.xjc.host.XjcHostStatusValueType; -import com.google.domain.registry.xjc.rdehost.XjcRdeHost; -import com.google.domain.registry.xjc.rdehost.XjcRdeHostElement; + +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.host.HostResource; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.xjc.host.XjcHostStatusValueType; +import google.registry.xjc.rdehost.XjcRdeHost; +import google.registry.xjc.rdehost.XjcRdeHostElement; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/rde/PendingDepositCheckerTest.java b/javatests/google/registry/rde/PendingDepositCheckerTest.java index a9dfc3340..dc7bbb13c 100644 --- a/javatests/google/registry/rde/PendingDepositCheckerTest.java +++ b/javatests/google/registry/rde/PendingDepositCheckerTest.java @@ -12,30 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.rde.RdeMode.FULL; -import static com.google.domain.registry.model.rde.RdeMode.THIN; -import static com.google.domain.registry.model.registry.RegistryCursor.CursorType.BRDA; -import static com.google.domain.registry.model.registry.RegistryCursor.CursorType.RDE_STAGING; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.rde.RdeMode.FULL; +import static google.registry.model.rde.RdeMode.THIN; +import static google.registry.model.registry.RegistryCursor.CursorType.BRDA; +import static google.registry.model.registry.RegistryCursor.CursorType.RDE_STAGING; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeConstants.TUESDAY; import static org.joda.time.Duration.standardDays; import com.google.common.collect.ImmutableSetMultimap; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; import com.googlecode.objectify.VoidWork; +import google.registry.model.ofy.Ofy; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Ignore; diff --git a/javatests/google/registry/rde/RdeFixtures.java b/javatests/google/registry/rde/RdeFixtures.java index d50999b35..75708f94e 100644 --- a/javatests/google/registry/rde/RdeFixtures.java +++ b/javatests/google/registry/rde/RdeFixtures.java @@ -12,50 +12,51 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.io.BaseEncoding.base16; -import static com.google.domain.registry.testing.DatastoreHelper.generateNewContactHostRoid; -import static com.google.domain.registry.testing.DatastoreHelper.generateNewDomainRoid; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistResourceWithCommitLog; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleResource; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.testing.DatastoreHelper.generateNewContactHostRoid; +import static google.registry.testing.DatastoreHelper.generateNewDomainRoid; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistResourceWithCommitLog; +import static google.registry.testing.DatastoreHelper.persistSimpleResource; +import static google.registry.util.DateTimeUtils.END_OF_TIME; import static org.joda.money.CurrencyUnit.USD; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Flag; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.contact.ContactAddress; -import com.google.domain.registry.model.contact.ContactPhoneNumber; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.PostalInfo; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.DomainAuthInfo; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppcommon.AuthInfo.PasswordAuth; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.poll.PollMessage.Autorenew; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; -import com.google.domain.registry.model.transfer.TransferStatus; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.util.Idn; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Flag; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.contact.ContactAddress; +import google.registry.model.contact.ContactPhoneNumber; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.PostalInfo; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.DomainAuthInfo; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppcommon.AuthInfo.PasswordAuth; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.host.HostResource; +import google.registry.model.poll.PollMessage; +import google.registry.model.poll.PollMessage.Autorenew; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; +import google.registry.model.transfer.TransferStatus; +import google.registry.testing.FakeClock; +import google.registry.util.Idn; + import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/javatests/google/registry/rde/RdeKeyringModule.java b/javatests/google/registry/rde/RdeKeyringModule.java index 88ea8b6b3..36343fb38 100644 --- a/javatests/google/registry/rde/RdeKeyringModule.java +++ b/javatests/google/registry/rde/RdeKeyringModule.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; -import static com.google.domain.registry.keyring.api.PgpHelper.KeyRequirement.ENCRYPT; -import static com.google.domain.registry.keyring.api.PgpHelper.KeyRequirement.SIGN; +import static google.registry.keyring.api.PgpHelper.KeyRequirement.ENCRYPT; +import static google.registry.keyring.api.PgpHelper.KeyRequirement.SIGN; import com.google.common.io.ByteSource; -import com.google.domain.registry.keyring.api.Keyring; -import com.google.domain.registry.keyring.api.PgpHelper; -import com.google.domain.registry.keyring.api.PgpHelper.KeyRequirement; import dagger.Module; import dagger.Provides; +import google.registry.keyring.api.Keyring; +import google.registry.keyring.api.PgpHelper; +import google.registry.keyring.api.PgpHelper.KeyRequirement; + import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; diff --git a/javatests/google/registry/rde/RdeMarshallerTest.java b/javatests/google/registry/rde/RdeMarshallerTest.java index 88e874616..b7aa885a8 100644 --- a/javatests/google/registry/rde/RdeMarshallerTest.java +++ b/javatests/google/registry/rde/RdeMarshallerTest.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.truth.Truth.assertThat; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.xml.XmlTestUtils; +import google.registry.model.registrar.Registrar; +import google.registry.testing.AppEngineRule; +import google.registry.xml.XmlTestUtils; import org.joda.time.DateTime; import org.joda.time.format.ISODateTimeFormat; diff --git a/javatests/google/registry/rde/RdeReportActionTest.java b/javatests/google/registry/rde/RdeReportActionTest.java index 986b4334c..56e3fcbbd 100644 --- a/javatests/google/registry/rde/RdeReportActionTest.java +++ b/javatests/google/registry/rde/RdeReportActionTest.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.appengine.api.urlfetch.HTTPMethod.PUT; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.GcsTestingUtils.writeGcsFile; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.GcsTestingUtils.writeGcsFile; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.joda.time.Duration.standardDays; @@ -39,20 +39,21 @@ import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteSource; -import com.google.domain.registry.config.RegistryConfig; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.gcs.GcsUtils; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.request.HttpException.InternalServerErrorException; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.BouncyCastleProviderRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.xjc.XjcXmlTransformer; -import com.google.domain.registry.xjc.rdereport.XjcRdeReportReport; -import com.google.domain.registry.xml.XmlException; + +import google.registry.config.RegistryConfig; +import google.registry.config.RegistryEnvironment; +import google.registry.gcs.GcsUtils; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; +import google.registry.request.HttpException.InternalServerErrorException; +import google.registry.testing.AppEngineRule; +import google.registry.testing.BouncyCastleProviderRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeResponse; +import google.registry.xjc.XjcXmlTransformer; +import google.registry.xjc.rdereport.XjcRdeReportReport; +import google.registry.xml.XmlException; import org.bouncycastle.openpgp.PGPPublicKey; import org.joda.time.DateTime; diff --git a/javatests/google/registry/rde/RdeStagingActionTest.java b/javatests/google/registry/rde/RdeStagingActionTest.java index df716080a..26651da8a 100644 --- a/javatests/google/registry/rde/RdeStagingActionTest.java +++ b/javatests/google/registry/rde/RdeStagingActionTest.java @@ -12,24 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.registry.RegistryCursor.CursorType.BRDA; -import static com.google.domain.registry.model.registry.RegistryCursor.CursorType.RDE_STAGING; -import static com.google.domain.registry.rde.RdeFixtures.makeContactResource; -import static com.google.domain.registry.rde.RdeFixtures.makeDomainResource; -import static com.google.domain.registry.rde.RdeFixtures.makeHostResource; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistResourceWithCommitLog; -import static com.google.domain.registry.testing.GcsTestingUtils.readGcsFile; -import static com.google.domain.registry.testing.TaskQueueHelper.assertAtLeastOneTaskIsEnqueued; -import static com.google.domain.registry.testing.TaskQueueHelper.assertNoTasksEnqueued; -import static com.google.domain.registry.testing.TaskQueueHelper.assertTasksEnqueued; -import static com.google.domain.registry.tldconfig.idn.IdnTableEnum.EXTENDED_LATIN; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.registry.RegistryCursor.CursorType.BRDA; +import static google.registry.model.registry.RegistryCursor.CursorType.RDE_STAGING; +import static google.registry.rde.RdeFixtures.makeContactResource; +import static google.registry.rde.RdeFixtures.makeDomainResource; +import static google.registry.rde.RdeFixtures.makeHostResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistResourceWithCommitLog; +import static google.registry.testing.GcsTestingUtils.readGcsFile; +import static google.registry.testing.TaskQueueHelper.assertAtLeastOneTaskIsEnqueued; +import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued; +import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; +import static google.registry.tldconfig.idn.IdnTableEnum.EXTENDED_LATIN; +import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; @@ -40,39 +40,40 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; -import com.google.domain.registry.keyring.api.Keyring; -import com.google.domain.registry.keyring.api.PgpHelper; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.testing.TaskQueueHelper.TaskMatcher; -import com.google.domain.registry.testing.mapreduce.MapreduceTestCase; -import com.google.domain.registry.tldconfig.idn.IdnTableEnum; -import com.google.domain.registry.util.Retrier; -import com.google.domain.registry.util.SystemSleeper; -import com.google.domain.registry.util.TaskEnqueuer; -import com.google.domain.registry.xjc.XjcXmlTransformer; -import com.google.domain.registry.xjc.rde.XjcRdeContentType; -import com.google.domain.registry.xjc.rde.XjcRdeDeposit; -import com.google.domain.registry.xjc.rde.XjcRdeDepositTypeType; -import com.google.domain.registry.xjc.rdedomain.XjcRdeDomain; -import com.google.domain.registry.xjc.rdeheader.XjcRdeHeader; -import com.google.domain.registry.xjc.rdeheader.XjcRdeHeaderCount; -import com.google.domain.registry.xjc.rdehost.XjcRdeHost; -import com.google.domain.registry.xjc.rdeidn.XjcRdeIdn; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrar; -import com.google.domain.registry.xml.XmlException; -import com.google.domain.registry.xml.XmlTestUtils; import com.googlecode.objectify.VoidWork; +import google.registry.keyring.api.Keyring; +import google.registry.keyring.api.PgpHelper; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.model.host.HostResource; +import google.registry.model.ofy.Ofy; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; +import google.registry.request.RequestParameters; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.InjectRule; +import google.registry.testing.TaskQueueHelper.TaskMatcher; +import google.registry.testing.mapreduce.MapreduceTestCase; +import google.registry.tldconfig.idn.IdnTableEnum; +import google.registry.util.Retrier; +import google.registry.util.SystemSleeper; +import google.registry.util.TaskEnqueuer; +import google.registry.xjc.XjcXmlTransformer; +import google.registry.xjc.rde.XjcRdeContentType; +import google.registry.xjc.rde.XjcRdeDeposit; +import google.registry.xjc.rde.XjcRdeDepositTypeType; +import google.registry.xjc.rdedomain.XjcRdeDomain; +import google.registry.xjc.rdeheader.XjcRdeHeader; +import google.registry.xjc.rdeheader.XjcRdeHeaderCount; +import google.registry.xjc.rdehost.XjcRdeHost; +import google.registry.xjc.rdeidn.XjcRdeIdn; +import google.registry.xjc.rderegistrar.XjcRdeRegistrar; +import google.registry.xml.XmlException; +import google.registry.xml.XmlTestUtils; + import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; diff --git a/javatests/google/registry/rde/RdeTestData.java b/javatests/google/registry/rde/RdeTestData.java index be536094b..6f4ba6eea 100644 --- a/javatests/google/registry/rde/RdeTestData.java +++ b/javatests/google/registry/rde/RdeTestData.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/javatests/google/registry/rde/RdeTestSuite.java b/javatests/google/registry/rde/RdeTestSuite.java index 0feaac1ad..2f0a43e5c 100644 --- a/javatests/google/registry/rde/RdeTestSuite.java +++ b/javatests/google/registry/rde/RdeTestSuite.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/javatests/google/registry/rde/RdeUploadActionTest.java b/javatests/google/registry/rde/RdeUploadActionTest.java index 3f82bcb4b..bd1d2b086 100644 --- a/javatests/google/registry/rde/RdeUploadActionTest.java +++ b/javatests/google/registry/rde/RdeUploadActionTest.java @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.rde.RdeMode.FULL; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleResource; -import static com.google.domain.registry.testing.GcsTestingUtils.readGcsFile; -import static com.google.domain.registry.testing.GcsTestingUtils.writeGcsFile; -import static com.google.domain.registry.testing.SystemInfo.hasCommand; -import static com.google.domain.registry.testing.TaskQueueHelper.assertNoTasksEnqueued; -import static com.google.domain.registry.testing.TaskQueueHelper.assertTasksEnqueued; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.rde.RdeMode.FULL; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleResource; +import static google.registry.testing.GcsTestingUtils.readGcsFile; +import static google.registry.testing.GcsTestingUtils.writeGcsFile; +import static google.registry.testing.SystemInfo.hasCommand; +import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued; +import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.Duration.standardDays; import static org.joda.time.Duration.standardSeconds; @@ -42,30 +42,31 @@ import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.common.io.ByteSource; import com.google.common.io.CharStreams; import com.google.common.io.Files; -import com.google.domain.registry.gcs.GcsUtils; -import com.google.domain.registry.keyring.api.Keyring; -import com.google.domain.registry.model.rde.RdeRevision; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.rde.JSchSshSession.JSchSshSessionFactory; -import com.google.domain.registry.request.HttpException.ServiceUnavailableException; -import com.google.domain.registry.request.RequestParameters; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.BouncyCastleProviderRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.GpgSystemCommandRule; -import com.google.domain.registry.testing.IoSpyRule; -import com.google.domain.registry.testing.Providers; -import com.google.domain.registry.testing.TaskQueueHelper.TaskMatcher; -import com.google.domain.registry.testing.sftp.SftpServerRule; -import com.google.domain.registry.util.Retrier; -import com.google.domain.registry.util.TaskEnqueuer; import com.googlecode.objectify.VoidWork; +import google.registry.gcs.GcsUtils; +import google.registry.keyring.api.Keyring; +import google.registry.model.rde.RdeRevision; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; +import google.registry.rde.JSchSshSession.JSchSshSessionFactory; +import google.registry.request.HttpException.ServiceUnavailableException; +import google.registry.request.RequestParameters; +import google.registry.testing.AppEngineRule; +import google.registry.testing.BouncyCastleProviderRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.GpgSystemCommandRule; +import google.registry.testing.IoSpyRule; +import google.registry.testing.Providers; +import google.registry.testing.TaskQueueHelper.TaskMatcher; +import google.registry.testing.sftp.SftpServerRule; +import google.registry.util.Retrier; +import google.registry.util.TaskEnqueuer; + import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPublicKey; import org.joda.time.DateTime; diff --git a/javatests/google/registry/rde/RegistrarToXjcConverterTest.java b/javatests/google/registry/rde/RegistrarToXjcConverterTest.java index b3c45c03b..b9c8751a4 100644 --- a/javatests/google/registry/rde/RegistrarToXjcConverterTest.java +++ b/javatests/google/registry/rde/RegistrarToXjcConverterTest.java @@ -12,25 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps; -import static com.google.domain.registry.xjc.XjcXmlTransformer.marshalStrict; +import static google.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps; +import static google.registry.xjc.XjcXmlTransformer.marshalStrict; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarAddress; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrar; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrarAddrType; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoEnumType; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoType; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrarStatusType; + +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarAddress; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; +import google.registry.xjc.rderegistrar.XjcRdeRegistrar; +import google.registry.xjc.rderegistrar.XjcRdeRegistrarAddrType; +import google.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoEnumType; +import google.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoType; +import google.registry.xjc.rderegistrar.XjcRdeRegistrarStatusType; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/rde/RydeGpgIntegrationTest.java b/javatests/google/registry/rde/RydeGpgIntegrationTest.java index 9ee57b330..3e83b1a3e 100644 --- a/javatests/google/registry/rde/RydeGpgIntegrationTest.java +++ b/javatests/google/registry/rde/RydeGpgIntegrationTest.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.rde; +package google.registry.rde; import static com.google.common.base.Strings.repeat; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static com.google.domain.registry.testing.SystemInfo.hasCommand; +import static google.registry.testing.SystemInfo.hasCommand; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assume.assumeTrue; import com.google.common.io.CharStreams; -import com.google.domain.registry.keyring.api.Keyring; -import com.google.domain.registry.testing.BouncyCastleProviderRule; -import com.google.domain.registry.testing.GpgSystemCommandRule; -import com.google.domain.registry.testing.Providers; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.keyring.api.Keyring; +import google.registry.testing.BouncyCastleProviderRule; +import google.registry.testing.GpgSystemCommandRule; +import google.registry.testing.Providers; +import google.registry.util.FormattingLogger; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPublicKey; diff --git a/javatests/google/registry/rde/testdata/pgp-private-keyring-escrow.asc b/javatests/google/registry/rde/testdata/pgp-private-keyring-escrow.asc index 9bb722083..614672028 100644 --- a/javatests/google/registry/rde/testdata/pgp-private-keyring-escrow.asc +++ b/javatests/google/registry/rde/testdata/pgp-private-keyring-escrow.asc @@ -1,6 +1,6 @@ gpg -a --export-secret-keys --export-options export-minimal \ rde-unittest@escrow.test \ - >javatests/com/google/domain/registry/rde/testdata/pgp-private-keyring-escrow.asc + >javatests/google/registry/rde/testdata/pgp-private-keyring-escrow.asc -----BEGIN PGP PRIVATE KEY BLOCK----- Version: GnuPG v1 diff --git a/javatests/google/registry/rde/testdata/pgp-private-keyring-registry.asc b/javatests/google/registry/rde/testdata/pgp-private-keyring-registry.asc index 118d66e2b..318ce4bc2 100644 --- a/javatests/google/registry/rde/testdata/pgp-private-keyring-registry.asc +++ b/javatests/google/registry/rde/testdata/pgp-private-keyring-registry.asc @@ -1,7 +1,7 @@ gpg -a --export-secret-keys --export-options export-minimal \ rde-unittest@registry.test \ rde-unittest-dsa@registry.test \ - >javatests/com/google/domain/registry/rde/testdata/pgp-private-keyring-registry.asc + >javatests/google/registry/rde/testdata/pgp-private-keyring-registry.asc -----BEGIN PGP PRIVATE KEY BLOCK----- Version: GnuPG v1 diff --git a/javatests/google/registry/rde/testdata/pgp-public-keyring.asc b/javatests/google/registry/rde/testdata/pgp-public-keyring.asc index 94646d5ad..4ac258a5d 100644 --- a/javatests/google/registry/rde/testdata/pgp-public-keyring.asc +++ b/javatests/google/registry/rde/testdata/pgp-public-keyring.asc @@ -2,7 +2,7 @@ gpg -a --export --export-options export-minimal \ rde-unittest@registry.test \ rde-unittest-dsa@registry.test \ rde-unittest@escrow.test \ - >javatests/com/google/domain/registry/rde/testdata/pgp-public-keyring.asc + >javatests/google/registry/rde/testdata/pgp-public-keyring.asc -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1 diff --git a/javatests/google/registry/request/BUILD b/javatests/google/registry/request/BUILD index 5f0dac969..21be471d8 100644 --- a/javatests/google/registry/request/BUILD +++ b/javatests/google/registry/request/BUILD @@ -1,4 +1,9 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package( + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], +) + +licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -11,10 +16,6 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/net", "//java/com/google/common/testing", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/security", - "//javatests/com/google/domain/registry/security", - "//javatests/com/google/domain/registry/testing", "//third_party/java/appengine:appengine-api-testonly", "//third_party/java/joda_time", "//third_party/java/json_simple", @@ -23,6 +24,10 @@ java_library( "//third_party/java/mockito", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/request", + "//java/google/registry/security", + "//javatests/google/registry/security", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/request/JsonResponseTest.java b/javatests/google/registry/request/JsonResponseTest.java index 76fc36088..dd1eb9b75 100644 --- a/javatests/google/registry/request/JsonResponseTest.java +++ b/javatests/google/registry/request/JsonResponseTest.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.request.JsonResponse.JSON_SAFETY_PREFIX; +import static google.registry.request.JsonResponse.JSON_SAFETY_PREFIX; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeResponse; + +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeResponse; import org.json.simple.JSONValue; import org.junit.Rule; diff --git a/javatests/google/registry/request/RequestHandlerTest.java b/javatests/google/registry/request/RequestHandlerTest.java index 01d00e8c7..aa8a1c493 100644 --- a/javatests/google/registry/request/RequestHandlerTest.java +++ b/javatests/google/registry/request/RequestHandlerTest.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.request.Action.Method.GET; -import static com.google.domain.registry.request.Action.Method.POST; -import static com.google.domain.registry.security.XsrfTokenManager.generateToken; +import static google.registry.request.Action.Method.GET; +import static google.registry.request.Action.Method.POST; +import static google.registry.security.XsrfTokenManager.generateToken; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; @@ -26,10 +26,11 @@ import static org.mockito.Mockito.when; import com.google.appengine.api.users.UserService; import com.google.common.collect.ImmutableList; import com.google.common.testing.NullPointerTester; -import com.google.domain.registry.request.HttpException.ServiceUnavailableException; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.testing.UserInfo; + +import google.registry.request.HttpException.ServiceUnavailableException; +import google.registry.testing.AppEngineRule; +import google.registry.testing.InjectRule; +import google.registry.testing.UserInfo; import org.junit.After; import org.junit.Before; diff --git a/javatests/google/registry/request/RequestModuleTest.java b/javatests/google/registry/request/RequestModuleTest.java index 99c9baad6..55c07702d 100644 --- a/javatests/google/registry/request/RequestModuleTest.java +++ b/javatests/google/registry/request/RequestModuleTest.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.request.RequestModule.provideJsonPayload; +import static google.registry.request.RequestModule.provideJsonPayload; import com.google.common.net.MediaType; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.UnsupportedMediaTypeException; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.UnsupportedMediaTypeException; +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/request/RequestParametersTest.java b/javatests/google/registry/request/RequestParametersTest.java index 09f3d5c35..65862ea1c 100644 --- a/javatests/google/registry/request/RequestParametersTest.java +++ b/javatests/google/registry/request/RequestParametersTest.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.request.RequestParameters.extractBooleanParameter; -import static com.google.domain.registry.request.RequestParameters.extractEnumParameter; -import static com.google.domain.registry.request.RequestParameters.extractOptionalParameter; -import static com.google.domain.registry.request.RequestParameters.extractRequiredDatetimeParameter; -import static com.google.domain.registry.request.RequestParameters.extractRequiredMaybeEmptyParameter; -import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter; +import static google.registry.request.RequestParameters.extractBooleanParameter; +import static google.registry.request.RequestParameters.extractEnumParameter; +import static google.registry.request.RequestParameters.extractOptionalParameter; +import static google.registry.request.RequestParameters.extractRequiredDatetimeParameter; +import static google.registry.request.RequestParameters.extractRequiredMaybeEmptyParameter; +import static google.registry.request.RequestParameters.extractRequiredParameter; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.request.HttpException.BadRequestException; +import google.registry.testing.ExceptionRule; import org.joda.time.DateTime; import org.junit.Rule; diff --git a/javatests/google/registry/request/ResponseImplTest.java b/javatests/google/registry/request/ResponseImplTest.java index dc9893918..fd9cc1253 100644 --- a/javatests/google/registry/request/ResponseImplTest.java +++ b/javatests/google/registry/request/ResponseImplTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; import static com.google.common.truth.Truth.assertThat; @@ -20,7 +20,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import com.google.domain.registry.testing.ExceptionRule; +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/request/RouterTest.java b/javatests/google/registry/request/RouterTest.java index ac4474d96..989900acf 100644 --- a/javatests/google/registry/request/RouterTest.java +++ b/javatests/google/registry/request/RouterTest.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.request; +package google.registry.request; import static com.google.common.truth.Truth.assertThat; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/security/BUILD b/javatests/google/registry/security/BUILD index 53c559028..dfa4a7a5f 100644 --- a/javatests/google/registry/security/BUILD +++ b/javatests/google/registry/security/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -15,9 +18,6 @@ java_library( "//java/com/google/common/base", "//java/com/google/common/collect", "//java/com/google/common/net", - "//java/com/google/domain/registry/security", - "//java/com/google/domain/registry/util", - "//javatests/com/google/domain/registry/testing", "//third_party/java/appengine:appengine-api-testonly", "//third_party/java/appengine:appengine-testing", "//third_party/java/joda_time", @@ -26,6 +26,9 @@ java_library( "//third_party/java/mockito", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/security", + "//java/google/registry/util", + "//javatests/google/registry/testing", ], ) @@ -35,14 +38,14 @@ java_library( deps = [ "//java/com/google/common/collect", "//java/com/google/common/net", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/security", - "//java/com/google/domain/registry/security:servlets", - "//javatests/com/google/domain/registry/testing", "//third_party/java/junit", "//third_party/java/mockito", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/request", + "//java/google/registry/security", + "//java/google/registry/security:servlets", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/security/JsonHttpTest.java b/javatests/google/registry/security/JsonHttpTest.java index f7c1f46ac..e37edd754 100644 --- a/javatests/google/registry/security/JsonHttpTest.java +++ b/javatests/google/registry/security/JsonHttpTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.security; +package google.registry.security; import static com.google.common.net.HttpHeaders.CONTENT_DISPOSITION; import static com.google.common.net.HttpHeaders.X_CONTENT_TYPE_OPTIONS; diff --git a/javatests/google/registry/security/JsonHttpTestUtils.java b/javatests/google/registry/security/JsonHttpTestUtils.java index ac8829105..08a104852 100644 --- a/javatests/google/registry/security/JsonHttpTestUtils.java +++ b/javatests/google/registry/security/JsonHttpTestUtils.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.security; +package google.registry.security; import static com.google.common.base.Suppliers.memoize; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assert_; -import static com.google.domain.registry.security.JsonHttp.JSON_SAFETY_PREFIX; +import static google.registry.security.JsonHttp.JSON_SAFETY_PREFIX; import com.google.common.base.Supplier; diff --git a/javatests/google/registry/security/JsonTransportServletTest.java b/javatests/google/registry/security/JsonTransportServletTest.java index 8686e93c1..49ae319e2 100644 --- a/javatests/google/registry/security/JsonTransportServletTest.java +++ b/javatests/google/registry/security/JsonTransportServletTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.security; +package google.registry.security; import static com.google.common.net.HttpHeaders.CONTENT_DISPOSITION; import static com.google.common.net.HttpHeaders.X_CONTENT_TYPE_OPTIONS; @@ -26,9 +26,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.request.HttpException; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.request.HttpException; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/security/XsrfProtectedServletTest.java b/javatests/google/registry/security/XsrfProtectedServletTest.java index e519cafb1..42848dfe8 100644 --- a/javatests/google/registry/security/XsrfProtectedServletTest.java +++ b/javatests/google/registry/security/XsrfProtectedServletTest.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.security; +package google.registry.security; -import static com.google.domain.registry.security.XsrfTokenManager.X_CSRF_TOKEN; -import static com.google.domain.registry.security.XsrfTokenManager.generateToken; +import static google.registry.security.XsrfTokenManager.X_CSRF_TOKEN; +import static google.registry.security.XsrfTokenManager.generateToken; import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.mockito.Matchers.anyString; @@ -23,8 +23,8 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.UserInfo; +import google.registry.testing.AppEngineRule; +import google.registry.testing.UserInfo; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/security/XsrfTokenManagerTest.java b/javatests/google/registry/security/XsrfTokenManagerTest.java index c823cd941..f4b392f1b 100644 --- a/javatests/google/registry/security/XsrfTokenManagerTest.java +++ b/javatests/google/registry/security/XsrfTokenManagerTest.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.security; +package google.registry.security; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.security.XsrfTokenManager.generateToken; -import static com.google.domain.registry.security.XsrfTokenManager.validateToken; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.security.XsrfTokenManager.generateToken; +import static google.registry.security.XsrfTokenManager.validateToken; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.base.Splitter; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.testing.UserInfo; + +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; +import google.registry.testing.UserInfo; import org.joda.time.Duration; import org.junit.Before; diff --git a/javatests/google/registry/server/BUILD b/javatests/google/registry/server/BUILD index c308a26ab..8f2f1b2c7 100644 --- a/javatests/google/registry/server/BUILD +++ b/javatests/google/registry/server/BUILD @@ -1,9 +1,13 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package( + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], +) + +licenses(["notice"]) # Apache 2.0 java_library( name = "TestServer", - visibility = ["//visibility:public"], srcs = [ "HealthzServlet.java", "Route.java", @@ -12,17 +16,18 @@ java_library( "TestServer.java", "UrlChecker.java", ], + visibility = ["//visibility:public"], deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", "//java/com/google/common/net", "//java/com/google/common/primitives", "//java/com/google/common/util/concurrent", - "//java/com/google/domain/registry/util", "//third_party/java/auto:auto_value", "//third_party/java/jetty/v6_1_22", "//third_party/java/jsr305_annotations", "//third_party/java/servlet/servlet_api", + "//java/google/registry/util", ], ) @@ -31,44 +36,44 @@ java_library( srcs = ["Fixture.java"], deps = [ "//java/com/google/common/collect", - "//java/com/google/domain/registry/model", - "//javatests/com/google/domain/registry/testing", "//third_party/java/appengine:appengine-api", "//third_party/java/joda_time", + "//java/google/registry/model", + "//javatests/google/registry/testing", ], ) java_library( name = "RegistryTestServer", srcs = ["RegistryTestServer.java"], - data = ["//java/com/google/domain/registry/ui:runfiles_debug"], + data = ["//java/google/registry/ui:runfiles_debug"], deps = [ ":TestServer", "//java/com/google/common/collect", "//java/com/google/common/net", - "//java/com/google/domain/registry/flows", - "//java/com/google/domain/registry/module/backend", - "//java/com/google/domain/registry/module/frontend", - "//java/com/google/domain/registry/ui/server/api", - "//java/com/google/domain/registry/ui/server/registrar", "//third_party/java/jsr305_annotations", "//third_party/java/servlet/servlet_api", + "//java/google/registry/flows", + "//java/google/registry/module/backend", + "//java/google/registry/module/frontend", + "//java/google/registry/ui/server/api", + "//java/google/registry/ui/server/registrar", ], ) java_binary( name = "server", srcs = ["RegistryTestServerMain.java"], - main_class = "com.google.domain.registry.server.RegistryTestServerMain", + main_class = "google.registry.server.RegistryTestServerMain", deps = [ ":Fixture", ":RegistryTestServer", "//java/com/google/common/collect", "//java/com/google/common/net", - "//java/com/google/domain/registry/tools/params", - "//java/com/google/domain/registry/ui", - "//javatests/com/google/domain/registry/testing", "//third_party/java/jcommander", "//third_party/java/junit", + "//java/google/registry/tools/params", + "//java/google/registry/ui", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/server/Fixture.java b/javatests/google/registry/server/Fixture.java index a608aa121..3b3b0bf9f 100644 --- a/javatests/google/registry/server/Fixture.java +++ b/javatests/google/registry/server/Fixture.java @@ -12,28 +12,29 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.server; +package google.registry.server; -import static com.google.domain.registry.model.domain.DesignatedContact.Type.ADMIN; -import static com.google.domain.registry.model.domain.DesignatedContact.Type.BILLING; -import static com.google.domain.registry.model.domain.DesignatedContact.Type.TECH; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.testing.DatastoreHelper.newContactResource; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveHost; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.domain.DesignatedContact.Type.ADMIN; +import static google.registry.model.domain.DesignatedContact.Type.BILLING; +import static google.registry.model.domain.DesignatedContact.Type.TECH; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.newContactResource; +import static google.registry.testing.DatastoreHelper.newDomainResource; +import static google.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.contact.ContactAddress; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.PostalInfo; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.model.contact.ContactAddress; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.PostalInfo; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; import org.joda.time.DateTime; diff --git a/javatests/google/registry/server/HealthzServlet.java b/javatests/google/registry/server/HealthzServlet.java index 09e08f97e..174d16e93 100644 --- a/javatests/google/registry/server/HealthzServlet.java +++ b/javatests/google/registry/server/HealthzServlet.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.server; +package google.registry.server; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; import static javax.servlet.http.HttpServletResponse.SC_OK; diff --git a/javatests/google/registry/server/RegistryTestServer.java b/javatests/google/registry/server/RegistryTestServer.java index c980fda6d..eb65cf240 100644 --- a/javatests/google/registry/server/RegistryTestServer.java +++ b/javatests/google/registry/server/RegistryTestServer.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.server; +package google.registry.server; -import static com.google.domain.registry.server.Route.route; +import static google.registry.server.Route.route; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -29,57 +29,57 @@ public final class RegistryTestServer { public static final ImmutableMap RUNFILES = new ImmutableMap.Builder() - .put("/index.html", Paths.get("java/com/google/domain/registry/ui/html/index.html")) - .put("/error.html", Paths.get("java/com/google/domain/registry/ui/html/error.html")) - .put("/assets/js/*", Paths.get("java/com/google/domain/registry/ui")) - .put("/assets/css/*", Paths.get("java/com/google/domain/registry/ui/css")) + .put("/index.html", Paths.get("third_party/java_src/gtld/java/google/registry/ui/html/index.html")) + .put("/error.html", Paths.get("third_party/java_src/gtld/java/google/registry/ui/html/error.html")) + .put("/assets/js/*", Paths.get("third_party/java_src/gtld/java/google/registry/ui")) + .put("/assets/css/*", Paths.get("third_party/java_src/gtld/java/google/registry/ui/css")) .put("/assets/sources/deps-runfiles.js", - Paths.get("java/com/google/domain/registry/ui/deps-runfiles.js")) + Paths.get("third_party/java_src/gtld/java/google/registry/ui/deps-runfiles.js")) .put("/assets/sources/*", Paths.get("")) - .put("/assets/*", Paths.get("java/com/google/domain/registry/ui/assets")) + .put("/assets/*", Paths.get("third_party/java_src/gtld/java/google/registry/ui/assets")) .build(); private static final ImmutableList ROUTES = ImmutableList.of( // Frontend Services - route("/whois/*", com.google.domain.registry.module.frontend.FrontendServlet.class), - route("/rdap/*", com.google.domain.registry.module.frontend.FrontendServlet.class), - route("/registrar-xhr", com.google.domain.registry.flows.EppConsoleServlet.class), - route("/check", com.google.domain.registry.ui.server.api.CheckApiServlet.class), + route("/whois/*", google.registry.module.frontend.FrontendServlet.class), + route("/rdap/*", google.registry.module.frontend.FrontendServlet.class), + route("/registrar-xhr", google.registry.flows.EppConsoleServlet.class), + route("/check", google.registry.ui.server.api.CheckApiServlet.class), // Proxy Services - route("/_dr/epp", com.google.domain.registry.flows.EppTlsServlet.class), - route("/_dr/whois", com.google.domain.registry.module.frontend.FrontendServlet.class), + route("/_dr/epp", google.registry.flows.EppTlsServlet.class), + route("/_dr/whois", google.registry.module.frontend.FrontendServlet.class), // Registry Data Escrow (RDE) - route("/_dr/cron/rdeCreate", com.google.domain.registry.module.backend.BackendServlet.class), - route("/_dr/task/rdeStaging", com.google.domain.registry.module.backend.BackendServlet.class), - route("/_dr/task/rdeUpload", com.google.domain.registry.module.backend.BackendServlet.class), - route("/_dr/task/rdeReport", com.google.domain.registry.module.backend.BackendServlet.class), - route("/_dr/task/brdaCopy", com.google.domain.registry.module.backend.BackendServlet.class), + route("/_dr/cron/rdeCreate", google.registry.module.backend.BackendServlet.class), + route("/_dr/task/rdeStaging", google.registry.module.backend.BackendServlet.class), + route("/_dr/task/rdeUpload", google.registry.module.backend.BackendServlet.class), + route("/_dr/task/rdeReport", google.registry.module.backend.BackendServlet.class), + route("/_dr/task/brdaCopy", google.registry.module.backend.BackendServlet.class), // Trademark Clearinghouse (TMCH) - route("/_dr/cron/tmchDnl", com.google.domain.registry.module.backend.BackendServlet.class), - route("/_dr/task/tmchSmdrl", com.google.domain.registry.module.backend.BackendServlet.class), - route("/_dr/task/tmchCrl", com.google.domain.registry.module.backend.BackendServlet.class), + route("/_dr/cron/tmchDnl", google.registry.module.backend.BackendServlet.class), + route("/_dr/task/tmchSmdrl", google.registry.module.backend.BackendServlet.class), + route("/_dr/task/tmchCrl", google.registry.module.backend.BackendServlet.class), // Notification of Registered Domain Names (NORDN) route("/_dr/task/nordnUpload", - com.google.domain.registry.module.backend.BackendServlet.class), + google.registry.module.backend.BackendServlet.class), route("/_dr/task/nordnVerify", - com.google.domain.registry.module.backend.BackendServlet.class), + google.registry.module.backend.BackendServlet.class), // Process DNS pull queue route("/_dr/task/writeDns", - com.google.domain.registry.module.backend.BackendServlet.class), + google.registry.module.backend.BackendServlet.class), // Registrar Console - route("/registrar", com.google.domain.registry.module.frontend.FrontendServlet.class), + route("/registrar", google.registry.module.frontend.FrontendServlet.class), route("/registrar-settings", - com.google.domain.registry.ui.server.registrar.RegistrarServlet.class), + google.registry.ui.server.registrar.RegistrarServlet.class), route("/registrar-payment", - com.google.domain.registry.module.frontend.FrontendServlet.class), + google.registry.module.frontend.FrontendServlet.class), route("/registrar-payment-setup", - com.google.domain.registry.module.frontend.FrontendServlet.class)); + google.registry.module.frontend.FrontendServlet.class)); private final TestServer server; diff --git a/javatests/google/registry/server/RegistryTestServerMain.java b/javatests/google/registry/server/RegistryTestServerMain.java index 68fe24a23..b64d79250 100644 --- a/javatests/google/registry/server/RegistryTestServerMain.java +++ b/javatests/google/registry/server/RegistryTestServerMain.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.server; +package google.registry.server; import com.google.common.collect.ImmutableList; import com.google.common.net.HostAndPort; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.UserInfo; -import com.google.domain.registry.tools.params.HostAndPortParameter; -import com.google.domain.registry.ui.ConsoleDebug; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; +import google.registry.testing.AppEngineRule; +import google.registry.testing.UserInfo; +import google.registry.tools.params.HostAndPortParameter; +import google.registry.ui.ConsoleDebug; + import org.junit.runner.Description; import org.junit.runners.model.Statement; diff --git a/javatests/google/registry/server/Route.java b/javatests/google/registry/server/Route.java index 6f28da0b7..7a3392d25 100644 --- a/javatests/google/registry/server/Route.java +++ b/javatests/google/registry/server/Route.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.server; +package google.registry.server; import com.google.auto.value.AutoValue; diff --git a/javatests/google/registry/server/ServletWrapperDelegatorServlet.java b/javatests/google/registry/server/ServletWrapperDelegatorServlet.java index e9872377c..3476e9b6b 100644 --- a/javatests/google/registry/server/ServletWrapperDelegatorServlet.java +++ b/javatests/google/registry/server/ServletWrapperDelegatorServlet.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.server; +package google.registry.server; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Suppliers.memoize; diff --git a/javatests/google/registry/server/StaticResourceServlet.java b/javatests/google/registry/server/StaticResourceServlet.java index c1a8e1a0b..6bebd4d30 100644 --- a/javatests/google/registry/server/StaticResourceServlet.java +++ b/javatests/google/registry/server/StaticResourceServlet.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.server; +package google.registry.server; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; @@ -25,7 +25,8 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; import com.google.common.primitives.Ints; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.util.FormattingLogger; import org.mortbay.jetty.servlet.ServletHolder; diff --git a/javatests/google/registry/server/TestServer.java b/javatests/google/registry/server/TestServer.java index b4dd65518..3a7c8fb08 100644 --- a/javatests/google/registry/server/TestServer.java +++ b/javatests/google/registry/server/TestServer.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.server; +package google.registry.server; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.domain.registry.util.NetworkUtils.getCanonicalHostName; +import static google.registry.util.NetworkUtils.getCanonicalHostName; import com.google.common.base.Throwables; import com.google.common.net.HostAndPort; diff --git a/javatests/google/registry/server/UrlChecker.java b/javatests/google/registry/server/UrlChecker.java index f41d8380f..786465a78 100644 --- a/javatests/google/registry/server/UrlChecker.java +++ b/javatests/google/registry/server/UrlChecker.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.server; +package google.registry.server; import com.google.common.base.Throwables; import com.google.common.util.concurrent.SimpleTimeLimiter; diff --git a/javatests/google/registry/storage/drive/BUILD b/javatests/google/registry/storage/drive/BUILD index 0289e2740..a08dafda7 100644 --- a/javatests/google/registry/storage/drive/BUILD +++ b/javatests/google/registry/storage/drive/BUILD @@ -1,4 +1,9 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package( + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], +) + +licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -12,11 +17,11 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/storage/drive", - "//javatests/com/google/domain/registry/testing", "//third_party/java/junit", "//third_party/java/mockito", "//third_party/java/truth", + "//java/google/registry/storage/drive", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/storage/drive/DriveConnectionTest.java b/javatests/google/registry/storage/drive/DriveConnectionTest.java index de18d9d7e..fe686eb33 100644 --- a/javatests/google/registry/storage/drive/DriveConnectionTest.java +++ b/javatests/google/registry/storage/drive/DriveConnectionTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.storage.drive; +package google.registry.storage.drive; import static com.google.common.io.ByteStreams.toByteArray; import static com.google.common.truth.Truth.assertThat; @@ -33,7 +33,8 @@ import com.google.api.services.drive.model.File; import com.google.api.services.drive.model.ParentReference; import com.google.common.collect.ImmutableList; import com.google.common.net.MediaType; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.testing.ExceptionRule; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/testing/AbstractDomainBaseSubject.java b/javatests/google/registry/testing/AbstractDomainBaseSubject.java index 3c680a8bd..b7b401583 100644 --- a/javatests/google/registry/testing/AbstractDomainBaseSubject.java +++ b/javatests/google/registry/testing/AbstractDomainBaseSubject.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import com.google.common.collect.ImmutableSet; import com.google.common.truth.FailureStrategy; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.launch.LaunchNotice; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppcommon.AuthInfo; -import com.google.domain.registry.testing.TruthChainer.And; + +import google.registry.model.domain.DomainBase; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.launch.LaunchNotice; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppcommon.AuthInfo; +import google.registry.testing.TruthChainer.And; import java.util.Set; diff --git a/javatests/google/registry/testing/AbstractEppResourceSubject.java b/javatests/google/registry/testing/AbstractEppResourceSubject.java index 4a41d92bd..bd828f633 100644 --- a/javatests/google/registry/testing/AbstractEppResourceSubject.java +++ b/javatests/google/registry/testing/AbstractEppResourceSubject.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.EppResourceUtils.isActive; -import static com.google.domain.registry.testing.DatastoreHelper.getHistoryEntriesOfType; -import static com.google.domain.registry.testing.HistoryEntrySubject.assertAboutHistoryEntries; +import static google.registry.model.EppResourceUtils.isActive; +import static google.registry.testing.DatastoreHelper.getHistoryEntriesOfType; +import static google.registry.testing.HistoryEntrySubject.assertAboutHistoryEntries; import com.google.common.collect.ImmutableSet; import com.google.common.truth.FailureStrategy; import com.google.common.truth.Subject; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.transfer.TransferStatus; -import com.google.domain.registry.testing.TruthChainer.And; -import com.google.domain.registry.testing.TruthChainer.Which; + +import google.registry.model.EppResource; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.transfer.TransferStatus; +import google.registry.testing.TruthChainer.And; +import google.registry.testing.TruthChainer.Which; import org.joda.time.DateTime; diff --git a/javatests/google/registry/testing/AppEngineRule.java b/javatests/google/registry/testing/AppEngineRule.java index 92a169e18..c4c371d1b 100644 --- a/javatests/google/registry/testing/AppEngineRule.java +++ b/javatests/google/registry/testing/AppEngineRule.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.truth.Truth.assert_; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.nio.charset.StandardCharsets.UTF_8; import static org.json.XML.toJSONObject; @@ -32,15 +32,16 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.io.Files; -import com.google.domain.registry.model.ofy.ObjectifyService; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.Registrar.State; -import com.google.domain.registry.model.registrar.RegistrarAddress; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.util.Clock; import com.googlecode.objectify.ObjectifyFilter; +import google.registry.model.ofy.ObjectifyService; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.Registrar.State; +import google.registry.model.registrar.RegistrarAddress; +import google.registry.model.registrar.RegistrarContact; +import google.registry.util.Clock; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -82,12 +83,12 @@ public final class AppEngineRule extends ExternalResource { * in here and write it to a temporary file later. */ private static final String QUEUE_XML = - readResourceUtf8("com/google/domain/registry/env/common/default/WEB-INF/queue.xml"); + readResourceUtf8("google/registry/env/common/default/WEB-INF/queue.xml"); /** A parsed version of the indexes used in the prod code. */ private static final Set MANUAL_INDEXES = getIndexXmlStrings( readResourceUtf8( - "com/google/domain/registry/env/common/default/WEB-INF/datastore-indexes.xml")); + "google/registry/env/common/default/WEB-INF/datastore-indexes.xml")); private static final String LOGGING_PROPERTIES = readResourceUtf8(AppEngineRule.class, "logging.properties"); diff --git a/javatests/google/registry/testing/BUILD b/javatests/google/registry/testing/BUILD index f2c4f2ded..4ec4306c1 100644 --- a/javatests/google/registry/testing/BUILD +++ b/javatests/google/registry/testing/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "testing", @@ -14,8 +17,8 @@ java_library( ), resources = [ "logging.properties", - "//java/com/google/domain/registry/env/common/default:WEB-INF/datastore-indexes.xml", - "//java/com/google/domain/registry/env/common/default:WEB-INF/queue.xml", + "//java/google/registry/env/common/default:WEB-INF/datastore-indexes.xml", + "//java/google/registry/env/common/default:WEB-INF/queue.xml", ] + glob(["*.csv"]), visibility = ["//visibility:public"], deps = [ @@ -26,14 +29,6 @@ java_library( "//java/com/google/common/net", "//java/com/google/common/testing", "//java/com/google/common/util/concurrent", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/dns:constants", - "//java/com/google/domain/registry/flows", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/tmch", - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/xml", "//third_party/java/appengine:appengine-api-testonly", "//third_party/java/appengine:appengine-integration-testing", "//third_party/java/appengine:appengine-stubs", @@ -53,6 +48,14 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/config", + "//java/google/registry/dns:constants", + "//java/google/registry/flows", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/tmch", + "//java/google/registry/util", + "//java/google/registry/xml", ], ) diff --git a/javatests/google/registry/testing/BouncyCastleProviderRule.java b/javatests/google/registry/testing/BouncyCastleProviderRule.java index 1be21e891..ee9ce4265 100644 --- a/javatests/google/registry/testing/BouncyCastleProviderRule.java +++ b/javatests/google/registry/testing/BouncyCastleProviderRule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.rules.ExternalResource; diff --git a/javatests/google/registry/testing/CertificateSamples.java b/javatests/google/registry/testing/CertificateSamples.java index 73b6ec3f6..4bc2e870a 100644 --- a/javatests/google/registry/testing/CertificateSamples.java +++ b/javatests/google/registry/testing/CertificateSamples.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; /** Utility methods for tests that involve certificates. */ public final class CertificateSamples { diff --git a/javatests/google/registry/testing/ContactResourceSubject.java b/javatests/google/registry/testing/ContactResourceSubject.java index 60ae6037c..64617abf8 100644 --- a/javatests/google/registry/testing/ContactResourceSubject.java +++ b/javatests/google/registry/testing/ContactResourceSubject.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertAbout; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.PostalInfo; -import com.google.domain.registry.model.eppcommon.AuthInfo; -import com.google.domain.registry.testing.TruthChainer.And; + +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.PostalInfo; +import google.registry.model.eppcommon.AuthInfo; +import google.registry.testing.TruthChainer.And; /** Truth subject for asserting things about {@link ContactResource} instances. */ public final class ContactResourceSubject diff --git a/javatests/google/registry/testing/DatastoreHelper.java b/javatests/google/registry/testing/DatastoreHelper.java index 6b655decc..21be23bfd 100644 --- a/javatests/google/registry/testing/DatastoreHelper.java +++ b/javatests/google/registry/testing/DatastoreHelper.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; @@ -20,18 +20,18 @@ import static com.google.common.base.Suppliers.memoize; import static com.google.common.collect.Iterables.toArray; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static com.google.domain.registry.flows.ResourceFlowUtils.createTransferResponse; -import static com.google.domain.registry.model.EppResourceUtils.createContactHostRoid; -import static com.google.domain.registry.model.EppResourceUtils.createDomainRoid; -import static com.google.domain.registry.model.domain.launch.ApplicationStatus.VALIDATED; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.util.CollectionUtils.difference; -import static com.google.domain.registry.util.CollectionUtils.union; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; -import static com.google.domain.registry.util.DomainNameUtils.ACE_PREFIX_REGEX; -import static com.google.domain.registry.util.DomainNameUtils.getTldFromDomainName; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.flows.ResourceFlowUtils.createTransferResponse; +import static google.registry.model.EppResourceUtils.createContactHostRoid; +import static google.registry.model.EppResourceUtils.createDomainRoid; +import static google.registry.model.domain.launch.ApplicationStatus.VALIDATED; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.util.CollectionUtils.difference; +import static google.registry.util.CollectionUtils.union; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.DomainNameUtils.ACE_PREFIX_REGEX; +import static google.registry.util.DomainNameUtils.getTldFromDomainName; +import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.util.Arrays.asList; import static org.joda.money.CurrencyUnit.USD; @@ -45,44 +45,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.Buildable; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.EppResource.ForeignKeyedEppResource; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Flag; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.contact.ContactAuthInfo; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.DesignatedContact.Type; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.DomainAuthInfo; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.domain.launch.LaunchPhase; -import com.google.domain.registry.model.eppcommon.AuthInfo.PasswordAuth; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.index.DomainApplicationIndex; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.model.ofy.ObjectifyService; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.model.registry.label.ReservedList; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.smd.EncodedSignedMark; -import com.google.domain.registry.model.transfer.TransferData; -import com.google.domain.registry.model.transfer.TransferData.Builder; -import com.google.domain.registry.model.transfer.TransferData.TransferServerApproveEntity; -import com.google.domain.registry.model.transfer.TransferStatus; -import com.google.domain.registry.tmch.LordnTask; import com.googlecode.objectify.Key; import com.googlecode.objectify.Ref; @@ -90,6 +52,45 @@ import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.Work; import com.googlecode.objectify.cmd.Saver; +import google.registry.config.RegistryEnvironment; +import google.registry.model.Buildable; +import google.registry.model.EppResource; +import google.registry.model.EppResource.ForeignKeyedEppResource; +import google.registry.model.ImmutableObject; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Flag; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.contact.ContactAuthInfo; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.DesignatedContact.Type; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.DomainAuthInfo; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.domain.launch.LaunchPhase; +import google.registry.model.eppcommon.AuthInfo.PasswordAuth; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.host.HostResource; +import google.registry.model.index.DomainApplicationIndex; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.model.ofy.ObjectifyService; +import google.registry.model.poll.PollMessage; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldState; +import google.registry.model.registry.label.PremiumList; +import google.registry.model.registry.label.ReservedList; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.smd.EncodedSignedMark; +import google.registry.model.transfer.TransferData; +import google.registry.model.transfer.TransferData.Builder; +import google.registry.model.transfer.TransferData.TransferServerApproveEntity; +import google.registry.model.transfer.TransferStatus; +import google.registry.tmch.LordnTask; + import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/javatests/google/registry/testing/DomainApplicationSubject.java b/javatests/google/registry/testing/DomainApplicationSubject.java index ac57f7cd2..c68dfb187 100644 --- a/javatests/google/registry/testing/DomainApplicationSubject.java +++ b/javatests/google/registry/testing/DomainApplicationSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertAbout; @@ -21,10 +21,11 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableSet; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.launch.ApplicationStatus; -import com.google.domain.registry.model.smd.EncodedSignedMark; -import com.google.domain.registry.testing.TruthChainer.And; + +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.launch.ApplicationStatus; +import google.registry.model.smd.EncodedSignedMark; +import google.registry.testing.TruthChainer.And; import java.util.Objects; diff --git a/javatests/google/registry/testing/DomainResourceSubject.java b/javatests/google/registry/testing/DomainResourceSubject.java index 2125097cc..f71a73682 100644 --- a/javatests/google/registry/testing/DomainResourceSubject.java +++ b/javatests/google/registry/testing/DomainResourceSubject.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertAbout; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.testing.TruthChainer.And; + +import google.registry.model.domain.DomainResource; +import google.registry.testing.TruthChainer.And; import org.joda.time.DateTime; diff --git a/javatests/google/registry/testing/EppLoader.java b/javatests/google/registry/testing/EppLoader.java index 36af84172..a7f95ea93 100644 --- a/javatests/google/registry/testing/EppLoader.java +++ b/javatests/google/registry/testing/EppLoader.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; -import static com.google.domain.registry.testing.TestDataHelper.loadFileWithSubstitutions; +import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.flows.EppXmlTransformer; -import com.google.domain.registry.model.eppinput.EppInput; + +import google.registry.flows.EppXmlTransformer; +import google.registry.model.eppinput.EppInput; import java.util.Map; diff --git a/javatests/google/registry/testing/ExceptionRule.java b/javatests/google/registry/testing/ExceptionRule.java index 8c5a807ee..5ad247ea8 100644 --- a/javatests/google/registry/testing/ExceptionRule.java +++ b/javatests/google/registry/testing/ExceptionRule.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Strings.nullToEmpty; import static com.google.common.base.Throwables.getRootCause; -import static com.google.domain.registry.flows.EppXmlTransformer.marshal; +import static google.registry.flows.EppXmlTransformer.marshal; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.eppoutput.EppOutput; -import com.google.domain.registry.model.eppoutput.Response; -import com.google.domain.registry.util.Clock; -import com.google.domain.registry.util.SystemClock; -import com.google.domain.registry.xml.ValidationMode; +import google.registry.flows.EppException; +import google.registry.model.eppcommon.Trid; +import google.registry.model.eppoutput.EppOutput; +import google.registry.model.eppoutput.Response; +import google.registry.util.Clock; +import google.registry.util.SystemClock; +import google.registry.xml.ValidationMode; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/javatests/google/registry/testing/FailAnswer.java b/javatests/google/registry/testing/FailAnswer.java index 1bf117362..2160f0a65 100644 --- a/javatests/google/registry/testing/FailAnswer.java +++ b/javatests/google/registry/testing/FailAnswer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/javatests/google/registry/testing/FakeClock.java b/javatests/google/registry/testing/FakeClock.java index eedd4e473..11e939d39 100644 --- a/javatests/google/registry/testing/FakeClock.java +++ b/javatests/google/registry/testing/FakeClock.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.Duration.millis; -import com.google.domain.registry.util.Clock; +import google.registry.util.Clock; import org.joda.time.DateTime; import org.joda.time.ReadableDuration; diff --git a/javatests/google/registry/testing/FakeJsonResponse.java b/javatests/google/registry/testing/FakeJsonResponse.java index 8e1e587d2..9f5a8490f 100644 --- a/javatests/google/registry/testing/FakeJsonResponse.java +++ b/javatests/google/registry/testing/FakeJsonResponse.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; -import com.google.domain.registry.request.JsonResponse; +import google.registry.request.JsonResponse; import java.util.Map; diff --git a/javatests/google/registry/testing/FakeResponse.java b/javatests/google/registry/testing/FakeResponse.java index 446cd5230..c3c4a3616 100644 --- a/javatests/google/registry/testing/FakeResponse.java +++ b/javatests/google/registry/testing/FakeResponse.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -21,7 +21,8 @@ import static java.util.Collections.unmodifiableMap; import com.google.common.base.Throwables; import com.google.common.net.MediaType; -import com.google.domain.registry.request.Response; + +import google.registry.request.Response; import org.joda.time.DateTime; diff --git a/javatests/google/registry/testing/FakeServletInputStream.java b/javatests/google/registry/testing/FakeServletInputStream.java index 067dce065..09cb09761 100644 --- a/javatests/google/registry/testing/FakeServletInputStream.java +++ b/javatests/google/registry/testing/FakeServletInputStream.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import com.google.common.io.ByteSource; diff --git a/javatests/google/registry/testing/FakeServletOutputStream.java b/javatests/google/registry/testing/FakeServletOutputStream.java index e4dad2e1b..639d79b52 100644 --- a/javatests/google/registry/testing/FakeServletOutputStream.java +++ b/javatests/google/registry/testing/FakeServletOutputStream.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/javatests/google/registry/testing/FakeSleeper.java b/javatests/google/registry/testing/FakeSleeper.java index 62e151ca1..5a48b23c5 100644 --- a/javatests/google/registry/testing/FakeSleeper.java +++ b/javatests/google/registry/testing/FakeSleeper.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.domain.registry.util.Sleeper; +import google.registry.util.Sleeper; import org.joda.time.ReadableDuration; diff --git a/javatests/google/registry/testing/FakeURLFetchService.java b/javatests/google/registry/testing/FakeURLFetchService.java index b559c900b..a6bb0e9da 100644 --- a/javatests/google/registry/testing/FakeURLFetchService.java +++ b/javatests/google/registry/testing/FakeURLFetchService.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import com.google.appengine.api.urlfetch.HTTPHeader; import com.google.appengine.api.urlfetch.HTTPRequest; diff --git a/javatests/google/registry/testing/ForwardingURLFetchService.java b/javatests/google/registry/testing/ForwardingURLFetchService.java index 7044fdbe4..cec3e7c39 100644 --- a/javatests/google/registry/testing/ForwardingURLFetchService.java +++ b/javatests/google/registry/testing/ForwardingURLFetchService.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; diff --git a/javatests/google/registry/testing/FullFieldsTestEntityHelper.java b/javatests/google/registry/testing/FullFieldsTestEntityHelper.java index ff79dff18..b62cfd48a 100644 --- a/javatests/google/registry/testing/FullFieldsTestEntityHelper.java +++ b/javatests/google/registry/testing/FullFieldsTestEntityHelper.java @@ -12,35 +12,36 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; -import static com.google.domain.registry.testing.DatastoreHelper.generateNewContactHostRoid; -import static com.google.domain.registry.testing.DatastoreHelper.generateNewDomainRoid; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DomainNameUtils.getTldFromDomainName; +import static google.registry.testing.DatastoreHelper.generateNewContactHostRoid; +import static google.registry.testing.DatastoreHelper.generateNewDomainRoid; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DomainNameUtils.getTldFromDomainName; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.contact.ContactAddress; -import com.google.domain.registry.model.contact.ContactPhoneNumber; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.PostalInfo; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarAddress; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.util.Idn; + +import google.registry.model.EppResource; +import google.registry.model.contact.ContactAddress; +import google.registry.model.contact.ContactPhoneNumber; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.PostalInfo; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.Period; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.host.HostResource; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarAddress; +import google.registry.model.registrar.RegistrarContact; +import google.registry.model.reporting.HistoryEntry; +import google.registry.util.Idn; import org.joda.time.DateTime; diff --git a/javatests/google/registry/testing/GcsTestingUtils.java b/javatests/google/registry/testing/GcsTestingUtils.java index 6179f35d1..3f86bed95 100644 --- a/javatests/google/registry/testing/GcsTestingUtils.java +++ b/javatests/google/registry/testing/GcsTestingUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import com.google.appengine.tools.cloudstorage.GcsFileOptions; import com.google.appengine.tools.cloudstorage.GcsFilename; diff --git a/javatests/google/registry/testing/GenericEppResourceSubject.java b/javatests/google/registry/testing/GenericEppResourceSubject.java index 0b8bf6244..bd6eb3a6d 100644 --- a/javatests/google/registry/testing/GenericEppResourceSubject.java +++ b/javatests/google/registry/testing/GenericEppResourceSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertAbout; @@ -20,7 +20,8 @@ import static com.google.common.truth.Truth.assertAbout; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; import com.google.common.truth.SubjectFactory; -import com.google.domain.registry.model.EppResource; + +import google.registry.model.EppResource; /** Truth subject for asserting things about {@link EppResource} instances. */ public final class GenericEppResourceSubject diff --git a/javatests/google/registry/testing/GpgSystemCommandRule.java b/javatests/google/registry/testing/GpgSystemCommandRule.java index 138a8f23f..d3c55fb38 100644 --- a/javatests/google/registry/testing/GpgSystemCommandRule.java +++ b/javatests/google/registry/testing/GpgSystemCommandRule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/javatests/google/registry/testing/HistoryEntrySubject.java b/javatests/google/registry/testing/HistoryEntrySubject.java index f2cfaba3a..8536bb6c5 100644 --- a/javatests/google/registry/testing/HistoryEntrySubject.java +++ b/javatests/google/registry/testing/HistoryEntrySubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.truth.Truth.assertAbout; @@ -20,9 +20,10 @@ import com.google.common.base.Optional; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; import com.google.common.truth.Subject; -import com.google.domain.registry.model.domain.Period; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.testing.TruthChainer.And; + +import google.registry.model.domain.Period; +import google.registry.model.reporting.HistoryEntry; +import google.registry.testing.TruthChainer.And; import java.util.Objects; diff --git a/javatests/google/registry/testing/HostResourceSubject.java b/javatests/google/registry/testing/HostResourceSubject.java index c771938a9..75584d6c2 100644 --- a/javatests/google/registry/testing/HostResourceSubject.java +++ b/javatests/google/registry/testing/HostResourceSubject.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertAbout; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; -import com.google.domain.registry.model.host.HostResource; + +import google.registry.model.host.HostResource; /** Truth subject for asserting things about {@link HostResource} instances. */ public final class HostResourceSubject diff --git a/javatests/google/registry/testing/InjectRule.java b/javatests/google/registry/testing/InjectRule.java index 91fd4b054..4e450f35d 100644 --- a/javatests/google/registry/testing/InjectRule.java +++ b/javatests/google/registry/testing/InjectRule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkState; @@ -37,7 +37,7 @@ import javax.annotation.Nullable; * update the injection site. * *

    We encourage you to consider using - * {@link com.google.domain.registry.util.NonFinalForTesting @NonFinalForTesting} + * {@link google.registry.util.NonFinalForTesting @NonFinalForTesting} * to document your injected fields. * *

    This class is a horrible evil hack, but it alleviates you of the toil of @@ -88,7 +88,7 @@ import javax.annotation.Nullable; * } * * - * @see com.google.domain.registry.util.NonFinalForTesting + * @see google.registry.util.NonFinalForTesting * @see org.junit.rules.ExternalResource */ public class InjectRule extends ExternalResource { diff --git a/javatests/google/registry/testing/IoSpyRule.java b/javatests/google/registry/testing/IoSpyRule.java index aede125ea..434b18ef7 100644 --- a/javatests/google/registry/testing/IoSpyRule.java +++ b/javatests/google/registry/testing/IoSpyRule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/javatests/google/registry/testing/LogsSubject.java b/javatests/google/registry/testing/LogsSubject.java index cb498c845..4c5ff8d6c 100644 --- a/javatests/google/registry/testing/LogsSubject.java +++ b/javatests/google/registry/testing/LogsSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.truth.Truth.assertAbout; @@ -20,7 +20,8 @@ import com.google.common.testing.TestLogHandler; import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; import com.google.common.truth.Subject; -import com.google.domain.registry.testing.TruthChainer.And; + +import google.registry.testing.TruthChainer.And; import java.util.logging.Handler; import java.util.logging.Level; diff --git a/javatests/google/registry/testing/Providers.java b/javatests/google/registry/testing/Providers.java index 1c20b4e72..ac9b52f15 100644 --- a/javatests/google/registry/testing/Providers.java +++ b/javatests/google/registry/testing/Providers.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import javax.inject.Provider; diff --git a/javatests/google/registry/testing/ReflectiveFieldExtractor.java b/javatests/google/registry/testing/ReflectiveFieldExtractor.java index 2739dcf1e..bcbc62c51 100644 --- a/javatests/google/registry/testing/ReflectiveFieldExtractor.java +++ b/javatests/google/registry/testing/ReflectiveFieldExtractor.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkArgument; diff --git a/javatests/google/registry/testing/ReflectiveSubjectFactory.java b/javatests/google/registry/testing/ReflectiveSubjectFactory.java index 483cb7d33..0713e87cf 100644 --- a/javatests/google/registry/testing/ReflectiveSubjectFactory.java +++ b/javatests/google/registry/testing/ReflectiveSubjectFactory.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import com.google.common.truth.FailureStrategy; import com.google.common.truth.Subject; import com.google.common.truth.SubjectFactory; -import com.google.domain.registry.util.TypeUtils.TypeInstantiator; + +import google.registry.util.TypeUtils.TypeInstantiator; /** Helper to reduce boilerplate in making new Truth subject classes. */ public class ReflectiveSubjectFactory> extends SubjectFactory { diff --git a/javatests/google/registry/testing/RegistryConfigRule.java b/javatests/google/registry/testing/RegistryConfigRule.java index 4a026db67..786772edf 100644 --- a/javatests/google/registry/testing/RegistryConfigRule.java +++ b/javatests/google/registry/testing/RegistryConfigRule.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Optional; -import com.google.domain.registry.config.RegistryConfig; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.config.TestRegistryConfig; + +import google.registry.config.RegistryConfig; +import google.registry.config.RegistryEnvironment; +import google.registry.config.TestRegistryConfig; import org.junit.rules.ExternalResource; diff --git a/javatests/google/registry/testing/SlurpAnswer.java b/javatests/google/registry/testing/SlurpAnswer.java index 65832aab1..efd161294 100644 --- a/javatests/google/registry/testing/SlurpAnswer.java +++ b/javatests/google/registry/testing/SlurpAnswer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/javatests/google/registry/testing/SystemInfo.java b/javatests/google/registry/testing/SystemInfo.java index 6148f2861..004b18685 100644 --- a/javatests/google/registry/testing/SystemInfo.java +++ b/javatests/google/registry/testing/SystemInfo.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.util.FormattingLogger; import java.io.IOException; import java.util.concurrent.ExecutionException; diff --git a/javatests/google/registry/testing/SystemPropertyRule.java b/javatests/google/registry/testing/SystemPropertyRule.java index 29afb02b9..9fb6b5c0a 100644 --- a/javatests/google/registry/testing/SystemPropertyRule.java +++ b/javatests/google/registry/testing/SystemPropertyRule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; diff --git a/javatests/google/registry/testing/TaskQueueHelper.java b/javatests/google/registry/testing/TaskQueueHelper.java index afca74dd1..26b136c36 100644 --- a/javatests/google/registry/testing/TaskQueueHelper.java +++ b/javatests/google/registry/testing/TaskQueueHelper.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.appengine.tools.development.testing.LocalTaskQueueTestConfig.getLocalTaskQueue; import static com.google.common.base.Preconditions.checkState; @@ -23,7 +23,7 @@ import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Multisets.containsOccurrences; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assert_; -import static com.google.domain.registry.util.DiffUtils.prettyPrintDeepDiff; +import static google.registry.util.DiffUtils.prettyPrintDeepDiff; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; @@ -42,7 +42,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.net.HttpHeaders; import com.google.common.net.MediaType; -import com.google.domain.registry.dns.DnsConstants; + +import google.registry.dns.DnsConstants; import org.joda.time.Duration; diff --git a/javatests/google/registry/testing/TestDataHelper.java b/javatests/google/registry/testing/TestDataHelper.java index 3175387ea..ed666a8bd 100644 --- a/javatests/google/registry/testing/TestDataHelper.java +++ b/javatests/google/registry/testing/TestDataHelper.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; -import static com.google.domain.registry.util.CollectionUtils.isNullOrEmpty; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.util.CollectionUtils.isNullOrEmpty; +import static google.registry.util.ResourceUtils.readResourceUtf8; import java.util.Map; import java.util.Map.Entry; diff --git a/javatests/google/registry/testing/TestObject.java b/javatests/google/registry/testing/TestObject.java index b528598f0..f3940cdd7 100644 --- a/javatests/google/registry/testing/TestObject.java +++ b/javatests/google/registry/testing/TestObject.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; - -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.common.EntityGroupRoot; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import com.googlecode.objectify.annotation.Parent; +import google.registry.model.ImmutableObject; +import google.registry.model.common.EntityGroupRoot; + /** * A test model object that can be persisted in any entity group. */ diff --git a/javatests/google/registry/testing/TestSessionMetadata.java b/javatests/google/registry/testing/TestSessionMetadata.java index 0bc3b5ba6..a965d5999 100644 --- a/javatests/google/registry/testing/TestSessionMetadata.java +++ b/javatests/google/registry/testing/TestSessionMetadata.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkState; -import com.google.domain.registry.flows.SessionMetadata; +import google.registry.flows.SessionMetadata; import java.util.HashMap; import java.util.Map; diff --git a/javatests/google/registry/testing/TruthChainer.java b/javatests/google/registry/testing/TruthChainer.java index ecb6a66f9..a551a1ea4 100644 --- a/javatests/google/registry/testing/TruthChainer.java +++ b/javatests/google/registry/testing/TruthChainer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import com.google.common.truth.Subject; diff --git a/javatests/google/registry/testing/UriParameters.java b/javatests/google/registry/testing/UriParameters.java index 386b5ffe4..903207c32 100644 --- a/javatests/google/registry/testing/UriParameters.java +++ b/javatests/google/registry/testing/UriParameters.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/javatests/google/registry/testing/UserInfo.java b/javatests/google/registry/testing/UserInfo.java index c20669922..b1dd38996 100644 --- a/javatests/google/registry/testing/UserInfo.java +++ b/javatests/google/registry/testing/UserInfo.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing; +package google.registry.testing; import com.google.auto.value.AutoValue; diff --git a/javatests/google/registry/testing/logging.properties b/javatests/google/registry/testing/logging.properties index 045aa755a..78e38c1b8 100644 --- a/javatests/google/registry/testing/logging.properties +++ b/javatests/google/registry/testing/logging.properties @@ -1,7 +1,7 @@ handlers = java.util.logging.ConsoleHandler .level = INFO -com.google.domain.registry.level = FINE +google.registry.level = FINE com.google.appengine.api.datastore.dev.LocalDatastoreService.level = WARNING com.google.appengine.api.taskqueue.dev.level = WARNING diff --git a/javatests/google/registry/testing/mapreduce/BUILD b/javatests/google/registry/testing/mapreduce/BUILD index 60b2eb390..330ee3e44 100644 --- a/javatests/google/registry/testing/mapreduce/BUILD +++ b/javatests/google/registry/testing/mapreduce/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -12,9 +15,6 @@ java_library( deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/util", - "//javatests/com/google/domain/registry/testing", "//third_party/java/appengine:appengine-api", "//third_party/java/appengine:appengine-stubs", "//third_party/java/appengine:appengine-testing", @@ -26,6 +26,9 @@ java_library( "//third_party/java/mockito", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/model", + "//java/google/registry/util", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java b/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java index 7216e4e6d..f76a8687c 100644 --- a/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java +++ b/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing.mapreduce; +package google.registry.testing.mapreduce; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -32,9 +32,10 @@ import com.google.appengine.tools.pipeline.impl.servlets.PipelineServlet; import com.google.appengine.tools.pipeline.impl.servlets.TaskHandler; import com.google.apphosting.api.ApiProxy; import com.google.common.base.CharMatcher; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.util.FormattingLogger; + +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.util.FormattingLogger; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/testing/package-info.java b/javatests/google/registry/testing/package-info.java index 2ee909dd4..0ae7282c4 100644 --- a/javatests/google/registry/testing/package-info.java +++ b/javatests/google/registry/testing/package-info.java @@ -15,4 +15,4 @@ // TODO(b/19014308): Move the SRE testing package under java/ somewhere else so we // don't need this package-info.java file under javatests/ @javax.annotation.ParametersAreNonnullByDefault -package com.google.domain.registry.testing; +package google.registry.testing; diff --git a/javatests/google/registry/testing/sftp/BUILD b/javatests/google/registry/testing/sftp/BUILD index aaf40ef94..0a342c4d7 100644 --- a/javatests/google/registry/testing/sftp/BUILD +++ b/javatests/google/registry/testing/sftp/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "sftp", @@ -9,12 +12,12 @@ java_library( deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", - "//java/com/google/domain/registry/util", "//third_party/java/apache_sshd", "//third_party/java/bouncycastle", "//third_party/java/bouncycastle_bcpg", "//third_party/java/ftpserver", "//third_party/java/jsr305_annotations", "//third_party/java/junit", + "//java/google/registry/util", ], ) diff --git a/javatests/google/registry/testing/sftp/SftpServerRule.java b/javatests/google/registry/testing/sftp/SftpServerRule.java index 2fb1bff91..a9109db04 100644 --- a/javatests/google/registry/testing/sftp/SftpServerRule.java +++ b/javatests/google/registry/testing/sftp/SftpServerRule.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing.sftp; +package google.registry.testing.sftp; import static com.google.common.base.Preconditions.checkState; -import com.google.domain.registry.util.NetworkUtils; +import google.registry.util.NetworkUtils; import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.ftplet.FtpException; diff --git a/javatests/google/registry/testing/sftp/TestSftpServer.java b/javatests/google/registry/testing/sftp/TestSftpServer.java index 371dc6052..de6cd9e73 100644 --- a/javatests/google/registry/testing/sftp/TestSftpServer.java +++ b/javatests/google/registry/testing/sftp/TestSftpServer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.testing.sftp; +package google.registry.testing.sftp; import com.google.common.collect.ImmutableList; diff --git a/javatests/google/registry/tldconfig/idn/BUILD b/javatests/google/registry/tldconfig/idn/BUILD index cc0f8dba0..15dbf7085 100644 --- a/javatests/google/registry/tldconfig/idn/BUILD +++ b/javatests/google/registry/tldconfig/idn/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -13,10 +16,10 @@ java_library( deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", - "//java/com/google/domain/registry/tldconfig/idn", - "//javatests/com/google/domain/registry/testing", "//third_party/java/junit", "//third_party/java/truth", + "//java/google/registry/tldconfig/idn", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/tldconfig/idn/IdnLabelValidatorTest.java b/javatests/google/registry/tldconfig/idn/IdnLabelValidatorTest.java index 4228ad131..51ce242f0 100644 --- a/javatests/google/registry/tldconfig/idn/IdnLabelValidatorTest.java +++ b/javatests/google/registry/tldconfig/idn/IdnLabelValidatorTest.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tldconfig.idn; +package google.registry.tldconfig.idn; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.tldconfig.idn.IdnLabelValidator.findValidIdnTableForTld; +import static google.registry.tldconfig.idn.IdnLabelValidator.findValidIdnTableForTld; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.testing.InjectRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/tldconfig/idn/IdnTableTest.java b/javatests/google/registry/tldconfig/idn/IdnTableTest.java index 15c4f4bde..2ed07de3c 100644 --- a/javatests/google/registry/tldconfig/idn/IdnTableTest.java +++ b/javatests/google/registry/tldconfig/idn/IdnTableTest.java @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tldconfig.idn; +package google.registry.tldconfig.idn; import static com.google.common.truth.Truth.assertThat; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/tmch/BUILD b/javatests/google/registry/tmch/BUILD index 2b4efc55b..2d30d1315 100644 --- a/javatests/google/registry/tmch/BUILD +++ b/javatests/google/registry/tmch/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -19,11 +22,6 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/tmch", - "//java/com/google/domain/registry/util", - "//javatests/com/google/domain/registry/testing", "//third_party/java/appengine:appengine-api-testonly", "//third_party/java/bouncycastle", "//third_party/java/bouncycastle_bcpg", @@ -34,6 +32,11 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/tmch", + "//java/google/registry/util", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/tmch/LordnLogTest.java b/javatests/google/registry/tmch/LordnLogTest.java index ba17d69f2..3a8739636 100644 --- a/javatests/google/registry/tmch/LordnLogTest.java +++ b/javatests/google/registry/tmch/LordnLogTest.java @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.tmch.LordnLog.Result; + +import google.registry.testing.ExceptionRule; +import google.registry.tmch.LordnLog.Result; import org.joda.time.DateTime; import org.junit.Rule; diff --git a/javatests/google/registry/tmch/LordnTaskTest.java b/javatests/google/registry/tmch/LordnTaskTest.java index 33259fd07..af26b0a30 100644 --- a/javatests/google/registry/tmch/LordnTaskTest.java +++ b/javatests/google/registry/tmch/LordnTaskTest.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistDomainAndEnqueueLordn; -import static com.google.domain.registry.testing.TaskQueueHelper.assertTasksEnqueued; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistDomainAndEnqueueLordn; +import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -31,20 +31,21 @@ import com.google.appengine.api.taskqueue.TaskOptions.Method; import com.google.appengine.api.taskqueue.TransientFailureException; import com.google.apphosting.api.DeadlineExceededException; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.launch.LaunchNotice; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.Registrar.Type; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.testing.TaskQueueHelper.TaskMatcher; -import com.google.domain.registry.util.Clock; import com.googlecode.objectify.VoidWork; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.launch.LaunchNotice; +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.Registrar.Type; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; +import google.registry.testing.TaskQueueHelper.TaskMatcher; +import google.registry.util.Clock; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/tmch/NordnUploadActionTest.java b/javatests/google/registry/tmch/NordnUploadActionTest.java index f6e9c787e..c23c44d59 100644 --- a/javatests/google/registry/tmch/NordnUploadActionTest.java +++ b/javatests/google/registry/tmch/NordnUploadActionTest.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.net.HttpHeaders.AUTHORIZATION; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; import static com.google.common.net.HttpHeaders.LOCATION; import static com.google.common.net.MediaType.FORM_DATA; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistDomainAndEnqueueLordn; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.TaskQueueHelper.assertTasksEnqueued; -import static com.google.domain.registry.util.UrlFetchUtils.getHeaderFirst; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainResource; +import static google.registry.testing.DatastoreHelper.persistDomainAndEnqueueLordn; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; +import static google.registry.util.UrlFetchUtils.getHeaderFirst; import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; @@ -39,17 +39,18 @@ import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.base.Optional; import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.launch.LaunchNotice; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.testing.TaskQueueHelper.TaskMatcher; -import com.google.domain.registry.util.UrlFetchException; + +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.launch.LaunchNotice; +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; +import google.registry.testing.TaskQueueHelper.TaskMatcher; +import google.registry.util.UrlFetchException; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tmch/NordnVerifyActionTest.java b/javatests/google/registry/tmch/NordnVerifyActionTest.java index 4e71b67f5..602b33db1 100644 --- a/javatests/google/registry/tmch/NordnVerifyActionTest.java +++ b/javatests/google/registry/tmch/NordnVerifyActionTest.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.net.HttpHeaders.AUTHORIZATION; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.UrlFetchUtils.getHeaderFirst; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.UrlFetchUtils.getHeaderFirst; import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; import static javax.servlet.http.HttpServletResponse.SC_OK; @@ -31,11 +31,12 @@ import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.base.Optional; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.request.HttpException.ConflictException; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeResponse; + +import google.registry.model.registry.Registry; +import google.registry.request.HttpException.ConflictException; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeResponse; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/tmch/SmdrlCsvParserTest.java b/javatests/google/registry/tmch/SmdrlCsvParserTest.java index 8ede20022..3e1c75fa7 100644 --- a/javatests/google/registry/tmch/SmdrlCsvParserTest.java +++ b/javatests/google/registry/tmch/SmdrlCsvParserTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.truth.Truth.assertThat; import static java.nio.charset.StandardCharsets.US_ASCII; @@ -21,10 +21,11 @@ import static org.joda.time.Duration.standardDays; import com.google.common.collect.ImmutableList; import com.google.common.io.CharSource; -import com.google.domain.registry.model.smd.SignedMarkRevocationList; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; + +import google.registry.model.smd.SignedMarkRevocationList; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; import org.joda.time.DateTime; import org.junit.Rule; diff --git a/javatests/google/registry/tmch/TmchActionTestCase.java b/javatests/google/registry/tmch/TmchActionTestCase.java index ec126aafe..663901386 100644 --- a/javatests/google/registry/tmch/TmchActionTestCase.java +++ b/javatests/google/registry/tmch/TmchActionTestCase.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.mockito.Matchers.any; @@ -21,12 +21,13 @@ import static org.mockito.Mockito.when; import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.BouncyCastleProviderRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.testing.RegistryConfigRule; + +import google.registry.testing.AppEngineRule; +import google.registry.testing.BouncyCastleProviderRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; +import google.registry.testing.RegistryConfigRule; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/tmch/TmchCertificateAuthorityTest.java b/javatests/google/registry/tmch/TmchCertificateAuthorityTest.java index a8c8b337f..33ed1c44c 100644 --- a/javatests/google/registry/tmch/TmchCertificateAuthorityTest.java +++ b/javatests/google/registry/tmch/TmchCertificateAuthorityTest.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; -import static com.google.domain.registry.tmch.TmchTestData.loadString; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; -import static com.google.domain.registry.util.X509Utils.loadCertificate; +import static google.registry.tmch.TmchTestData.loadString; +import static google.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.util.X509Utils.loadCertificate; -import com.google.domain.registry.model.tmch.TmchCrl; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.testing.RegistryConfigRule; +import google.registry.model.tmch.TmchCrl; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; +import google.registry.testing.RegistryConfigRule; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tmch/TmchCrlActionTest.java b/javatests/google/registry/tmch/TmchCrlActionTest.java index 57c9411d1..a42e1d33e 100644 --- a/javatests/google/registry/tmch/TmchCrlActionTest.java +++ b/javatests/google/registry/tmch/TmchCrlActionTest.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.util.ResourceUtils.readResourceBytes; +import static google.registry.util.ResourceUtils.readResourceBytes; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/tmch/TmchDnlActionTest.java b/javatests/google/registry/tmch/TmchDnlActionTest.java index ac4d9a96b..340897aa4 100644 --- a/javatests/google/registry/tmch/TmchDnlActionTest.java +++ b/javatests/google/registry/tmch/TmchDnlActionTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.times; @@ -20,7 +20,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.base.Optional; -import com.google.domain.registry.model.tmch.ClaimsListShard; + +import google.registry.model.tmch.ClaimsListShard; import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/tmch/TmchSmdrlActionTest.java b/javatests/google/registry/tmch/TmchSmdrlActionTest.java index 6cf473707..a5ea2ad9f 100644 --- a/javatests/google/registry/tmch/TmchSmdrlActionTest.java +++ b/javatests/google/registry/tmch/TmchSmdrlActionTest.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.tmch.TmchTestData.loadBytes; +import static google.registry.tmch.TmchTestData.loadBytes; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.base.Optional; -import com.google.domain.registry.model.smd.SignedMarkRevocationList; + +import google.registry.model.smd.SignedMarkRevocationList; import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/tmch/TmchTestData.java b/javatests/google/registry/tmch/TmchTestData.java index fc2d1ef5d..5a0a133c5 100644 --- a/javatests/google/registry/tmch/TmchTestData.java +++ b/javatests/google/registry/tmch/TmchTestData.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import static com.google.common.base.CharMatcher.whitespace; import static com.google.common.io.BaseEncoding.base64; -import static com.google.domain.registry.util.ResourceUtils.readResourceBytes; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.util.ResourceUtils.readResourceBytes; +import static google.registry.util.ResourceUtils.readResourceUtf8; import com.google.common.io.ByteSource; diff --git a/javatests/google/registry/tmch/TmchTestSuite.java b/javatests/google/registry/tmch/TmchTestSuite.java index b572e7bff..541404169 100644 --- a/javatests/google/registry/tmch/TmchTestSuite.java +++ b/javatests/google/registry/tmch/TmchTestSuite.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/javatests/google/registry/tmch/TmchXmlSignatureTest.java b/javatests/google/registry/tmch/TmchXmlSignatureTest.java index dbf83e8e0..d6f8c5844 100644 --- a/javatests/google/registry/tmch/TmchXmlSignatureTest.java +++ b/javatests/google/registry/tmch/TmchXmlSignatureTest.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tmch; +package google.registry.tmch; -import static com.google.domain.registry.tmch.TmchTestData.loadSmd; +import static google.registry.tmch.TmchTestData.loadSmd; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.testing.RegistryConfigRule; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; +import google.registry.testing.RegistryConfigRule; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tmch/testdata/pubkey b/javatests/google/registry/tmch/testdata/pubkey index 53b9c8216..d23c432f0 100644 --- a/javatests/google/registry/tmch/testdata/pubkey +++ b/javatests/google/registry/tmch/testdata/pubkey @@ -1,30 +1,30 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.14 (GNU/Linux) - -mQENBFHaxrYBCADHDPUdSYCs9wuBUhbGYfi39LKlDLhlmia7Tlv1rSJb8RPcU7DL -eXSU9zKRDpW31KQtHnjARinobjQNc6YXQOGtjDVr3LGTojGT1y+obVmgWytpHNnb -kSu1pktQRDPpYPBMBOD/MVpz8nZxgjYWyYTIkfTgkA/l1YKRyA30ieHVR8qKhJZY -D6u/dViQcdZCLsvs0XYYhPDjNi7M2wzVAdRjh9txnJgDymgqHF59onzkZauyFnc9 -EUEUURITzbfMifvGSZ/h+zdCUT/tSH3wSuVRxXqAh+cApT2c+gI88/TlGci2YOZV -POU24M7xuYPb9rIK4b9tR12ZQF+g/4n9eDprABEBAAG0LHN1cHBvcnQgYXQgbWFy -a3NkYi5vcmcgPHN1cHBvcnRAbWFya3NkYi5vcmc+iQE4BBMBAgAiBQJR2sa2AhsD -BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRC4xOmbTP03TGTCB/9J1xKyNkJe -wsSHhBga4MnBiS3gr3waZSfYaiWvx7br5FxI3Zv2jPAouqkpf8XbJgc4RvqZjFmi -5YSwpLgChSa5DkA6kPgReNCEfPvtBX7iRrZTv7RSSzZUuGiVED9s4Qk0+ppc8RgW -HRLYetvNvMIKL+6bvUlvztr+KM914JpzDEXgkBok2RxVq33FKUMIiy4vinbS2/7N -LpGlCMG7vgdBHIjBItUq9ipCtiDvvmPHiwHErgMgkx67pmDGxViMHDIMpzb8YTHw -lCxRwnLPILmm371hqOuVsu/pUVC16TEzYRDwZGbn4uKzWT0ZvYsPNcFGKC35ujEH -3fACoP6CMt/AuQENBFHaxrYBCADuDjCyxpDMakGSmk5zXIW/r0F9wqpIaPqm7xoR -15ajbvBUguM3gVH7bC4qihaSVFq2S8soWpyu88JyeWFiK+nMiIUALbfwXTA3DdIm -zmA/aKBNCeMyWXH1iy5zDCO0S343HH3/QWYTTy0aSUoMiW4AovKrnbZWti0WOoC4 -a8MUY1Ib1DhG/CJBzx4l52m5jOnmKB4foa7VmaWAjlG/s4ZDoEUPW8p6d2fmF05q -/ImGuzSwXegCuTY7rmkWskf4SshTYryyel76v1SteOFhXFaxcewbQgxIn1uGczd5 -P3/RBznF+Zm9OQK3840sqnhn1y/A3HadT7OI9Ot31TVXpRK5ABEBAAGJAR8EGAEC -AAkFAlHaxrYCGwwACgkQuMTpm0z9N0yzzwgApO1IzPwd5OwFymQNIizKOl3VTBTR -s5xtGBARg3fQsPmQen/SWZXu7VqJzr9QngQRJUT0nqdQPsGqOU72f8UkZGg6UD/o -mqfSfzLnOGnXLpC5g4bR+Z1PHlOV33r0HnWA8GPZsnYOXw414NYLmNW+tlC9t1F0 -WNBevhzXQujBfj0p+Znf3Gap8xvtZ9EAbeYUEpUQXEKh5UcBHBQCzmvDgukISK7w -wBpVWDwLHIYghE9OElat0y+ttD+RhSkUf+ufIw+L6BTHVD5E+W+BFoMFmNU3Kk/y -BoGsCR/i63T3egBVn1IzFezNy8YUVTtqOLyYlIe2R35zafxXs2anwvqA6Q== -=2ED8 ------END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.14 (GNU/Linux) + +mQENBFHaxrYBCADHDPUdSYCs9wuBUhbGYfi39LKlDLhlmia7Tlv1rSJb8RPcU7DL +eXSU9zKRDpW31KQtHnjARinobjQNc6YXQOGtjDVr3LGTojGT1y+obVmgWytpHNnb +kSu1pktQRDPpYPBMBOD/MVpz8nZxgjYWyYTIkfTgkA/l1YKRyA30ieHVR8qKhJZY +D6u/dViQcdZCLsvs0XYYhPDjNi7M2wzVAdRjh9txnJgDymgqHF59onzkZauyFnc9 +EUEUURITzbfMifvGSZ/h+zdCUT/tSH3wSuVRxXqAh+cApT2c+gI88/TlGci2YOZV +POU24M7xuYPb9rIK4b9tR12ZQF+g/4n9eDprABEBAAG0LHN1cHBvcnQgYXQgbWFy +a3NkYi5vcmcgPHN1cHBvcnRAbWFya3NkYi5vcmc+iQE4BBMBAgAiBQJR2sa2AhsD +BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRC4xOmbTP03TGTCB/9J1xKyNkJe +wsSHhBga4MnBiS3gr3waZSfYaiWvx7br5FxI3Zv2jPAouqkpf8XbJgc4RvqZjFmi +5YSwpLgChSa5DkA6kPgReNCEfPvtBX7iRrZTv7RSSzZUuGiVED9s4Qk0+ppc8RgW +HRLYetvNvMIKL+6bvUlvztr+KM914JpzDEXgkBok2RxVq33FKUMIiy4vinbS2/7N +LpGlCMG7vgdBHIjBItUq9ipCtiDvvmPHiwHErgMgkx67pmDGxViMHDIMpzb8YTHw +lCxRwnLPILmm371hqOuVsu/pUVC16TEzYRDwZGbn4uKzWT0ZvYsPNcFGKC35ujEH +3fACoP6CMt/AuQENBFHaxrYBCADuDjCyxpDMakGSmk5zXIW/r0F9wqpIaPqm7xoR +15ajbvBUguM3gVH7bC4qihaSVFq2S8soWpyu88JyeWFiK+nMiIUALbfwXTA3DdIm +zmA/aKBNCeMyWXH1iy5zDCO0S343HH3/QWYTTy0aSUoMiW4AovKrnbZWti0WOoC4 +a8MUY1Ib1DhG/CJBzx4l52m5jOnmKB4foa7VmaWAjlG/s4ZDoEUPW8p6d2fmF05q +/ImGuzSwXegCuTY7rmkWskf4SshTYryyel76v1SteOFhXFaxcewbQgxIn1uGczd5 +P3/RBznF+Zm9OQK3840sqnhn1y/A3HadT7OI9Ot31TVXpRK5ABEBAAGJAR8EGAEC +AAkFAlHaxrYCGwwACgkQuMTpm0z9N0yzzwgApO1IzPwd5OwFymQNIizKOl3VTBTR +s5xtGBARg3fQsPmQen/SWZXu7VqJzr9QngQRJUT0nqdQPsGqOU72f8UkZGg6UD/o +mqfSfzLnOGnXLpC5g4bR+Z1PHlOV33r0HnWA8GPZsnYOXw414NYLmNW+tlC9t1F0 +WNBevhzXQujBfj0p+Znf3Gap8xvtZ9EAbeYUEpUQXEKh5UcBHBQCzmvDgukISK7w +wBpVWDwLHIYghE9OElat0y+ttD+RhSkUf+ufIw+L6BTHVD5E+W+BFoMFmNU3Kk/y +BoGsCR/i63T3egBVn1IzFezNy8YUVTtqOLyYlIe2R35zafxXs2anwvqA6Q== +=2ED8 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/javatests/google/registry/tmch/testdata/tmch_test_smd_revocation_list.csv b/javatests/google/registry/tmch/testdata/tmch_test_smd_revocation_list.csv index a245b93bf..4af7f9f0c 100644 --- a/javatests/google/registry/tmch/testdata/tmch_test_smd_revocation_list.csv +++ b/javatests/google/registry/tmch/testdata/tmch_test_smd_revocation_list.csv @@ -1 +1,32 @@ -1,2013-07-15T00:00:00.0Z smd-id,insertion-datetime 0000002001376042764293-65535,2013-07-15T00:00:00.0Z 0000002061376042765341-65535,2013-07-15T00:00:00.0Z 0000002121376042767302-65535,2013-07-15T00:00:00.0Z 0000002181376042767994-65535,2013-07-15T00:00:00.0Z 0000002241376042769508-65535,2013-07-15T00:00:00.0Z 0000002031376042765014-65535,2013-07-15T00:00:00.0Z 0000002091376042765779-65535,2013-07-15T00:00:00.0Z 0000002151376042767642-65535,2013-07-15T00:00:00.0Z 0000002211376042768492-65535,2013-07-15T00:00:00.0Z 0000002291376042770068-65535,2013-07-15T00:00:00.0Z 0000001861376042761179-65535,2013-07-15T00:00:00.0Z 0000002051376042765277-65535,2013-07-15T00:00:00.0Z 0000002111376042766714-65535,2013-07-15T00:00:00.0Z 0000002171376042767771-65535,2013-07-15T00:00:00.0Z 0000002231376042769036-65535,2013-07-15T00:00:00.0Z 0000002021376042764750-65535,2013-07-15T00:00:00.0Z 0000002081376042765470-65535,2013-07-15T00:00:00.0Z 0000002141376042767572-65535,2013-07-15T00:00:00.0Z 0000002201376042768432-65535,2013-07-15T00:00:00.0Z 0000002261376042770009-65535,2013-07-15T00:00:00.0Z 0000002011376042764485-65535,2013-07-15T00:00:00.0Z 0000002071376042765408-65535,2013-07-15T00:00:00.0Z 0000002131376042767364-65535,2013-07-15T00:00:00.0Z 0000002191376042768370-65535,2013-07-15T00:00:00.0Z 0000002251376042769746-65535,2013-07-15T00:00:00.0Z 0000002041376042765085-65535,2013-07-15T00:00:00.0Z 0000002101376042766438-65535,2013-07-15T00:00:00.0Z 0000002161376042767705-65535,2013-07-15T00:00:00.0Z 0000002221376042768552-65535,2013-07-15T00:00:00.0Z 0000002301376042770286-65535,2013-07-15T00:00:00.0Z \ No newline at end of file +1,2013-07-15T00:00:00.0Z +smd-id,insertion-datetime +0000002001376042764293-65535,2013-07-15T00:00:00.0Z +0000002061376042765341-65535,2013-07-15T00:00:00.0Z +0000002121376042767302-65535,2013-07-15T00:00:00.0Z +0000002181376042767994-65535,2013-07-15T00:00:00.0Z +0000002241376042769508-65535,2013-07-15T00:00:00.0Z +0000002031376042765014-65535,2013-07-15T00:00:00.0Z +0000002091376042765779-65535,2013-07-15T00:00:00.0Z +0000002151376042767642-65535,2013-07-15T00:00:00.0Z +0000002211376042768492-65535,2013-07-15T00:00:00.0Z +0000002291376042770068-65535,2013-07-15T00:00:00.0Z +0000001861376042761179-65535,2013-07-15T00:00:00.0Z +0000002051376042765277-65535,2013-07-15T00:00:00.0Z +0000002111376042766714-65535,2013-07-15T00:00:00.0Z +0000002171376042767771-65535,2013-07-15T00:00:00.0Z +0000002231376042769036-65535,2013-07-15T00:00:00.0Z +0000002021376042764750-65535,2013-07-15T00:00:00.0Z +0000002081376042765470-65535,2013-07-15T00:00:00.0Z +0000002141376042767572-65535,2013-07-15T00:00:00.0Z +0000002201376042768432-65535,2013-07-15T00:00:00.0Z +0000002261376042770009-65535,2013-07-15T00:00:00.0Z +0000002011376042764485-65535,2013-07-15T00:00:00.0Z +0000002071376042765408-65535,2013-07-15T00:00:00.0Z +0000002131376042767364-65535,2013-07-15T00:00:00.0Z +0000002191376042768370-65535,2013-07-15T00:00:00.0Z +0000002251376042769746-65535,2013-07-15T00:00:00.0Z +0000002041376042765085-65535,2013-07-15T00:00:00.0Z +0000002101376042766438-65535,2013-07-15T00:00:00.0Z +0000002161376042767705-65535,2013-07-15T00:00:00.0Z +0000002221376042768552-65535,2013-07-15T00:00:00.0Z +0000002301376042770286-65535,2013-07-15T00:00:00.0Z \ No newline at end of file diff --git a/javatests/google/registry/tools/AllocateDomainCommandTest.java b/javatests/google/registry/tools/AllocateDomainCommandTest.java index 0038b03cb..94db29e83 100644 --- a/javatests/google/registry/tools/AllocateDomainCommandTest.java +++ b/javatests/google/registry/tools/AllocateDomainCommandTest.java @@ -12,27 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.io.BaseEncoding.base16; import static com.google.common.io.Resources.getResource; import static com.google.common.io.Resources.toByteArray; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.flows.EppServletUtils.APPLICATION_EPP_XML_UTF8; -import static com.google.domain.registry.flows.FlowRegistry.getFlowClass; -import static com.google.domain.registry.model.domain.DesignatedContact.Type.ADMIN; -import static com.google.domain.registry.model.domain.DesignatedContact.Type.BILLING; -import static com.google.domain.registry.model.domain.DesignatedContact.Type.TECH; -import static com.google.domain.registry.model.domain.launch.ApplicationStatus.VALIDATED; -import static com.google.domain.registry.model.registry.Registry.TldState.QUIET_PERIOD; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveContact; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveHost; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; -import static com.google.domain.registry.xml.XmlTestUtils.assertXmlEquals; +import static google.registry.flows.EppServletUtils.APPLICATION_EPP_XML_UTF8; +import static google.registry.flows.FlowRegistry.getFlowClass; +import static google.registry.model.domain.DesignatedContact.Type.ADMIN; +import static google.registry.model.domain.DesignatedContact.Type.BILLING; +import static google.registry.model.domain.DesignatedContact.Type.TECH; +import static google.registry.model.domain.launch.ApplicationStatus.VALIDATED; +import static google.registry.model.registry.Registry.TldState.QUIET_PERIOD; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainApplication; +import static google.registry.testing.DatastoreHelper.persistActiveContact; +import static google.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.xml.XmlTestUtils.assertXmlEquals; import static java.nio.charset.StandardCharsets.UTF_8; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.times; @@ -40,20 +40,21 @@ import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppXmlTransformer; -import com.google.domain.registry.flows.domain.DomainAllocateFlow; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.domain.launch.LaunchNotice; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.eppinput.EppInput; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.tools.ServerSideCommand.Connection; import com.beust.jcommander.ParameterException; +import google.registry.flows.EppXmlTransformer; +import google.registry.flows.domain.DomainAllocateFlow; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.domain.launch.LaunchNotice; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppcommon.Trid; +import google.registry.model.eppinput.EppInput; +import google.registry.model.reporting.HistoryEntry; +import google.registry.tools.ServerSideCommand.Connection; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/BUILD b/javatests/google/registry/tools/BUILD index 3f0f18029..71cde4e68 100644 --- a/javatests/google/registry/tools/BUILD +++ b/javatests/google/registry/tools/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") internal_files = [ @@ -21,23 +24,6 @@ java_library( "//java/com/google/common/io", "//java/com/google/common/net", "//java/com/google/common/reflect", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/flows", - "//java/com/google/domain/registry/keyring/api", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/rde", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/tmch", - "//java/com/google/domain/registry/tools", - "//java/com/google/domain/registry/tools/params", - "//java/com/google/domain/registry/tools/server", - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/xjc", - "//java/com/google/domain/registry/xml", - "//javatests/com/google/domain/registry/model", - "//javatests/com/google/domain/registry/rde", - "//javatests/com/google/domain/registry/testing", - "//javatests/com/google/domain/registry/xml", "//third_party/java/appengine:appengine-api-testonly", "//third_party/java/jcommander", "//third_party/java/joda_money", @@ -47,6 +33,23 @@ java_library( "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/truth", + "//java/google/registry/config", + "//java/google/registry/flows", + "//java/google/registry/keyring/api", + "//java/google/registry/model", + "//java/google/registry/rde", + "//java/google/registry/request", + "//java/google/registry/tmch", + "//java/google/registry/tools", + "//java/google/registry/tools/params", + "//java/google/registry/tools/server", + "//java/google/registry/util", + "//java/google/registry/xjc", + "//java/google/registry/xml", + "//javatests/google/registry/model", + "//javatests/google/registry/rde", + "//javatests/google/registry/testing", + "//javatests/google/registry/xml", ], ) diff --git a/javatests/google/registry/tools/CommandTestCase.java b/javatests/google/registry/tools/CommandTestCase.java index ff7fa0d50..c79af6b26 100644 --- a/javatests/google/registry/tools/CommandTestCase.java +++ b/javatests/google/registry/tools/CommandTestCase.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.model.ofy.ObjectifyService.ofy; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Joiner; @@ -24,14 +24,15 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ObjectArrays; import com.google.common.io.Files; import com.google.common.reflect.TypeToken; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.CertificateSamples; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.tools.params.ParameterFactory; import com.beust.jcommander.JCommander; +import google.registry.model.poll.PollMessage; +import google.registry.testing.AppEngineRule; +import google.registry.testing.CertificateSamples; +import google.registry.testing.ExceptionRule; +import google.registry.tools.params.ParameterFactory; + import org.junit.Before; import org.junit.Rule; import org.junit.rules.TemporaryFolder; diff --git a/javatests/google/registry/tools/CreateAnchorTenantCommandTest.java b/javatests/google/registry/tools/CreateAnchorTenantCommandTest.java index 6140cc406..9ad2bb20b 100644 --- a/javatests/google/registry/tools/CreateAnchorTenantCommandTest.java +++ b/javatests/google/registry/tools/CreateAnchorTenantCommandTest.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistPremiumList; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; - -import com.google.domain.registry.model.registry.Registry; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistPremiumList; +import static google.registry.testing.DatastoreHelper.persistResource; import com.beust.jcommander.ParameterException; +import google.registry.model.registry.Registry; + import org.junit.Test; /** Unit tests for {@link CreateAnchorTenantCommand}. */ diff --git a/javatests/google/registry/tools/CreateContactCommandTest.java b/javatests/google/registry/tools/CreateContactCommandTest.java index 9d685240f..1a6798672 100644 --- a/javatests/google/registry/tools/CreateContactCommandTest.java +++ b/javatests/google/registry/tools/CreateContactCommandTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.beust.jcommander.ParameterException; diff --git a/javatests/google/registry/tools/CreateCreditBalanceCommandTest.java b/javatests/google/registry/tools/CreateCreditBalanceCommandTest.java index d5227f2cd..1c7bde9e9 100644 --- a/javatests/google/registry/tools/CreateCreditBalanceCommandTest.java +++ b/javatests/google/registry/tools/CreateCreditBalanceCommandTest.java @@ -12,26 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.Range; -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCredit.CreditType; -import com.google.domain.registry.model.billing.RegistrarCreditBalance; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; import com.beust.jcommander.ParameterException; import com.googlecode.objectify.Key; +import google.registry.model.billing.RegistrarCredit; +import google.registry.model.billing.RegistrarCredit.CreditType; +import google.registry.model.billing.RegistrarCreditBalance; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/CreateCreditCommandTest.java b/javatests/google/registry/tools/CreateCreditCommandTest.java index 10bedad74..1ed546f38 100644 --- a/javatests/google/registry/tools/CreateCreditCommandTest.java +++ b/javatests/google/registry/tools/CreateCreditCommandTest.java @@ -12,24 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.Range; -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCredit.CreditType; -import com.google.domain.registry.model.billing.RegistrarCreditBalance; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; import com.beust.jcommander.ParameterException; +import google.registry.model.billing.RegistrarCredit; +import google.registry.model.billing.RegistrarCredit.CreditType; +import google.registry.model.billing.RegistrarCreditBalance; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java b/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java index fd3ae7812..a247384a1 100644 --- a/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java +++ b/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; import static java.nio.charset.StandardCharsets.UTF_8; @@ -22,8 +22,9 @@ import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; import com.google.common.net.MediaType; -import com.google.domain.registry.testing.UriParameters; -import com.google.domain.registry.tools.ServerSideCommand.Connection; + +import google.registry.testing.UriParameters; +import google.registry.tools.ServerSideCommand.Connection; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/javatests/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java b/javatests/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java index 9f96554e5..6948b540d 100644 --- a/javatests/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java +++ b/javatests/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.io.Files; diff --git a/javatests/google/registry/tools/CreatePremiumListCommandTest.java b/javatests/google/registry/tools/CreatePremiumListCommandTest.java index 1e2cb7b31..707df8291 100644 --- a/javatests/google/registry/tools/CreatePremiumListCommandTest.java +++ b/javatests/google/registry/tools/CreatePremiumListCommandTest.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.request.JsonResponse.JSON_SAFETY_PREFIX; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.request.JsonResponse.JSON_SAFETY_PREFIX; +import static google.registry.util.ResourceUtils.readResourceUtf8; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyMapOf; import static org.mockito.Matchers.eq; @@ -25,11 +25,12 @@ import static org.mockito.Mockito.when; import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; -import com.google.domain.registry.tools.ServerSideCommand.Connection; -import com.google.domain.registry.tools.server.CreatePremiumListAction; import com.beust.jcommander.ParameterException; +import google.registry.tools.ServerSideCommand.Connection; +import google.registry.tools.server.CreatePremiumListAction; + import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/javatests/google/registry/tools/CreateRegistrarCommandTest.java b/javatests/google/registry/tools/CreateRegistrarCommandTest.java index 932816656..42807076a 100644 --- a/javatests/google/registry/tools/CreateRegistrarCommandTest.java +++ b/javatests/google/registry/tools/CreateRegistrarCommandTest.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; @@ -29,12 +29,13 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Range; import com.google.common.net.MediaType; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.CertificateSamples; -import com.google.domain.registry.tools.ServerSideCommand.Connection; import com.beust.jcommander.ParameterException; +import google.registry.model.registrar.Registrar; +import google.registry.testing.CertificateSamples; +import google.registry.tools.ServerSideCommand.Connection; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/CreateRegistrarGroupsCommandTest.java b/javatests/google/registry/tools/CreateRegistrarGroupsCommandTest.java index 413bc0b2a..224d4ac14 100644 --- a/javatests/google/registry/tools/CreateRegistrarGroupsCommandTest.java +++ b/javatests/google/registry/tools/CreateRegistrarGroupsCommandTest.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; -import com.google.domain.registry.tools.ServerSideCommand.Connection; + +import google.registry.tools.ServerSideCommand.Connection; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; - /** Unit tests for {@link CreateRegistrarGroupsCommand}. */ public class CreateRegistrarGroupsCommandTest extends CommandTestCase { diff --git a/javatests/google/registry/tools/CreateReservedListCommandTest.java b/javatests/google/registry/tools/CreateReservedListCommandTest.java index 656e6c3c8..88b182619 100644 --- a/javatests/google/registry/tools/CreateReservedListCommandTest.java +++ b/javatests/google/registry/tools/CreateReservedListCommandTest.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.registry.label.ReservationType.FULLY_BLOCKED; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.testing.DatastoreHelper.persistReservedList; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.tools.CreateReservedListCommand.INVALID_FORMAT_ERROR_MESSAGE; +import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.persistReservedList; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.tools.CreateReservedListCommand.INVALID_FORMAT_ERROR_MESSAGE; import static org.joda.time.DateTimeZone.UTC; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.label.ReservedList; +import google.registry.model.registry.Registry; +import google.registry.model.registry.label.ReservedList; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/CreateTldCommandTest.java b/javatests/google/registry/tools/CreateTldCommandTest.java index d867cf96c..9bf81355d 100644 --- a/javatests/google/registry/tools/CreateTldCommandTest.java +++ b/javatests/google/registry/tools/CreateTldCommandTest.java @@ -12,26 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.collect.Iterables.transform; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.registry.label.ReservedListTest.GET_NAME_FUNCTION; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistPremiumList; -import static com.google.domain.registry.testing.DatastoreHelper.persistReservedList; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.registry.label.ReservedListTest.GET_NAME_FUNCTION; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistPremiumList; +import static google.registry.testing.DatastoreHelper.persistReservedList; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.money.CurrencyUnit.JPY; import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.Duration.standardMinutes; import com.google.common.collect.Range; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldState; import com.beust.jcommander.ParameterException; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldState; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/DeleteCreditCommandTest.java b/javatests/google/registry/tools/DeleteCreditCommandTest.java index 1be4cd3ed..a1f8d55c2 100644 --- a/javatests/google/registry/tools/DeleteCreditCommandTest.java +++ b/javatests/google/registry/tools/DeleteCreditCommandTest.java @@ -12,24 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.common.EntityGroupRoot.getCrossTldKey; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.money.CurrencyUnit.USD; -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCredit.CreditType; -import com.google.domain.registry.model.billing.RegistrarCreditBalance; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; - import com.beust.jcommander.ParameterException; import com.googlecode.objectify.Key; +import google.registry.model.billing.RegistrarCredit; +import google.registry.model.billing.RegistrarCredit.CreditType; +import google.registry.model.billing.RegistrarCreditBalance; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/DeleteDomainCommandTest.java b/javatests/google/registry/tools/DeleteDomainCommandTest.java index 31e1133a3..aa773f559 100644 --- a/javatests/google/registry/tools/DeleteDomainCommandTest.java +++ b/javatests/google/registry/tools/DeleteDomainCommandTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.beust.jcommander.ParameterException; diff --git a/javatests/google/registry/tools/DeleteEntityCommandTest.java b/javatests/google/registry/tools/DeleteEntityCommandTest.java index 829d691e5..e818daace 100644 --- a/javatests/google/registry/tools/DeleteEntityCommandTest.java +++ b/javatests/google/registry/tools/DeleteEntityCommandTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyMap; @@ -23,7 +23,8 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; -import com.google.domain.registry.tools.ServerSideCommand.Connection; + +import google.registry.tools.ServerSideCommand.Connection; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/DeletePremiumListCommandTest.java b/javatests/google/registry/tools/DeletePremiumListCommandTest.java index 003593e15..e0eba8e90 100644 --- a/javatests/google/registry/tools/DeletePremiumListCommandTest.java +++ b/javatests/google/registry/tools/DeletePremiumListCommandTest.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistPremiumList; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistPremiumList; +import static google.registry.testing.DatastoreHelper.persistResource; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.model.registry.label.PremiumList.PremiumListEntry; +import google.registry.model.registry.Registry; +import google.registry.model.registry.label.PremiumList; +import google.registry.model.registry.label.PremiumList.PremiumListEntry; import org.junit.Test; diff --git a/javatests/google/registry/tools/DeleteReservedListCommandTest.java b/javatests/google/registry/tools/DeleteReservedListCommandTest.java index d12e8eade..efdda6a02 100644 --- a/javatests/google/registry/tools/DeleteReservedListCommandTest.java +++ b/javatests/google/registry/tools/DeleteReservedListCommandTest.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistReservedList; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistReservedList; +import static google.registry.testing.DatastoreHelper.persistResource; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.label.ReservedList; +import google.registry.model.registry.Registry; +import google.registry.model.registry.label.ReservedList; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/DomainApplicationInfoCommandTest.java b/javatests/google/registry/tools/DomainApplicationInfoCommandTest.java index 6f809332e..6f0fad548 100644 --- a/javatests/google/registry/tools/DomainApplicationInfoCommandTest.java +++ b/javatests/google/registry/tools/DomainApplicationInfoCommandTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.beust.jcommander.ParameterException; diff --git a/javatests/google/registry/tools/DomainCheckClaimsCommandTest.java b/javatests/google/registry/tools/DomainCheckClaimsCommandTest.java index 736aa6707..5662dbc8f 100644 --- a/javatests/google/registry/tools/DomainCheckClaimsCommandTest.java +++ b/javatests/google/registry/tools/DomainCheckClaimsCommandTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.collect.ImmutableList; diff --git a/javatests/google/registry/tools/DomainCheckCommandTest.java b/javatests/google/registry/tools/DomainCheckCommandTest.java index 79f546f1a..a5407c143 100644 --- a/javatests/google/registry/tools/DomainCheckCommandTest.java +++ b/javatests/google/registry/tools/DomainCheckCommandTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.collect.ImmutableList; diff --git a/javatests/google/registry/tools/DomainCheckFeeCommandTest.java b/javatests/google/registry/tools/DomainCheckFeeCommandTest.java index 57914a901..bcee1c56e 100644 --- a/javatests/google/registry/tools/DomainCheckFeeCommandTest.java +++ b/javatests/google/registry/tools/DomainCheckFeeCommandTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.google.common.collect.ImmutableList; diff --git a/javatests/google/registry/tools/EncryptEscrowDepositCommandTest.java b/javatests/google/registry/tools/EncryptEscrowDepositCommandTest.java index ff4310d89..5a5aeb452 100644 --- a/javatests/google/registry/tools/EncryptEscrowDepositCommandTest.java +++ b/javatests/google/registry/tools/EncryptEscrowDepositCommandTest.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.util.ResourceUtils.readResourceBytes; +import static google.registry.util.ResourceUtils.readResourceBytes; import com.google.common.io.ByteSource; import com.google.common.io.Files; -import com.google.domain.registry.rde.RdeKeyringModule; -import com.google.domain.registry.rde.RdeTestData; -import com.google.domain.registry.rde.RydePgpCompressionOutputStreamFactory; -import com.google.domain.registry.rde.RydePgpEncryptionOutputStreamFactory; -import com.google.domain.registry.rde.RydePgpFileOutputStreamFactory; -import com.google.domain.registry.rde.RydePgpSigningOutputStreamFactory; -import com.google.domain.registry.rde.RydeTarOutputStreamFactory; -import com.google.domain.registry.testing.BouncyCastleProviderRule; -import com.google.domain.registry.testing.Providers; + +import google.registry.rde.RdeKeyringModule; +import google.registry.rde.RdeTestData; +import google.registry.rde.RydePgpCompressionOutputStreamFactory; +import google.registry.rde.RydePgpEncryptionOutputStreamFactory; +import google.registry.rde.RydePgpFileOutputStreamFactory; +import google.registry.rde.RydePgpSigningOutputStreamFactory; +import google.registry.rde.RydeTarOutputStreamFactory; +import google.registry.testing.BouncyCastleProviderRule; +import google.registry.testing.Providers; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/tools/EppToolCommandTest.java b/javatests/google/registry/tools/EppToolCommandTest.java index f4b7ea440..de8a4cef7 100644 --- a/javatests/google/registry/tools/EppToolCommandTest.java +++ b/javatests/google/registry/tools/EppToolCommandTest.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.flows.EppServletUtils.APPLICATION_EPP_XML_UTF8; +import static google.registry.flows.EppServletUtils.APPLICATION_EPP_XML_UTF8; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/tools/EppToolCommandTestCase.java b/javatests/google/registry/tools/EppToolCommandTestCase.java index a20d042ec..81fe31f14 100644 --- a/javatests/google/registry/tools/EppToolCommandTestCase.java +++ b/javatests/google/registry/tools/EppToolCommandTestCase.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.flows.EppServletUtils.APPLICATION_EPP_XML_UTF8; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; -import static com.google.domain.registry.xml.XmlTestUtils.assertXmlEquals; +import static google.registry.flows.EppServletUtils.APPLICATION_EPP_XML_UTF8; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.xml.XmlTestUtils.assertXmlEquals; import static java.nio.charset.StandardCharsets.UTF_8; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.tools.ServerSideCommand.Connection; + +import google.registry.testing.InjectRule; +import google.registry.tools.ServerSideCommand.Connection; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/tools/ExecuteEppCommandTest.java b/javatests/google/registry/tools/ExecuteEppCommandTest.java index ad142b60b..04585198f 100644 --- a/javatests/google/registry/tools/ExecuteEppCommandTest.java +++ b/javatests/google/registry/tools/ExecuteEppCommandTest.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; diff --git a/javatests/google/registry/tools/FakePasswordGenerator.java b/javatests/google/registry/tools/FakePasswordGenerator.java index 10dcb0db8..ad9cc8203 100644 --- a/javatests/google/registry/tools/FakePasswordGenerator.java +++ b/javatests/google/registry/tools/FakePasswordGenerator.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; diff --git a/javatests/google/registry/tools/GenerateAuctionDataCommandTest.java b/javatests/google/registry/tools/GenerateAuctionDataCommandTest.java index 03fa936bf..58440f726 100644 --- a/javatests/google/registry/tools/GenerateAuctionDataCommandTest.java +++ b/javatests/google/registry/tools/GenerateAuctionDataCommandTest.java @@ -12,30 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newContactResourceWithRoid; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.newSunriseApplication; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newContactResourceWithRoid; +import static google.registry.testing.DatastoreHelper.newDomainApplication; +import static google.registry.testing.DatastoreHelper.newSunriseApplication; +import static google.registry.testing.DatastoreHelper.persistResource; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.contact.ContactAddress; -import com.google.domain.registry.model.contact.ContactPhoneNumber; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.PostalInfo; -import com.google.domain.registry.model.domain.launch.ApplicationStatus; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; import com.beust.jcommander.ParameterException; +import google.registry.model.contact.ContactAddress; +import google.registry.model.contact.ContactPhoneNumber; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.PostalInfo; +import google.registry.model.domain.launch.ApplicationStatus; +import google.registry.model.ofy.Ofy; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/tools/GenerateDnsReportCommandTest.java b/javatests/google/registry/tools/GenerateDnsReportCommandTest.java index 0ce3d5b71..1b8801927 100644 --- a/javatests/google/registry/tools/GenerateDnsReportCommandTest.java +++ b/javatests/google/registry/tools/GenerateDnsReportCommandTest.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.io.BaseEncoding.base16; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainResource; -import static com.google.domain.registry.testing.DatastoreHelper.newHostResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveHost; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.newDomainResource; +import static google.registry.testing.DatastoreHelper.newHostResource; +import static google.registry.testing.DatastoreHelper.persistActiveDomain; +import static google.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.persistResource; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; @@ -29,16 +29,17 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.testing.FakeClock; import com.beust.jcommander.ParameterException; import com.googlecode.objectify.Ref; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.host.HostResource; +import google.registry.testing.FakeClock; + import org.joda.time.DateTime; import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; diff --git a/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java b/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java index 837b39031..6c8625ffb 100644 --- a/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java +++ b/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java @@ -12,44 +12,45 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.testing.DatastoreHelper.generateNewContactHostRoid; -import static com.google.domain.registry.testing.DatastoreHelper.persistResourceWithCommitLog; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.generateNewContactHostRoid; +import static google.registry.testing.DatastoreHelper.persistResourceWithCommitLog; +import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; -import com.google.domain.registry.config.TestRegistryConfig; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.rde.RdeCounter; -import com.google.domain.registry.rde.RdeResourceType; -import com.google.domain.registry.rde.RdeUtil; -import com.google.domain.registry.testing.BouncyCastleProviderRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.util.Idn; -import com.google.domain.registry.xjc.XjcXmlTransformer; -import com.google.domain.registry.xjc.rde.XjcRdeContentType; -import com.google.domain.registry.xjc.rde.XjcRdeDeposit; -import com.google.domain.registry.xjc.rde.XjcRdeDepositTypeType; -import com.google.domain.registry.xjc.rdeheader.XjcRdeHeader; -import com.google.domain.registry.xjc.rdeheader.XjcRdeHeaderCount; -import com.google.domain.registry.xjc.rdehost.XjcRdeHost; -import com.google.domain.registry.xjc.rderegistrar.XjcRdeRegistrar; -import com.google.domain.registry.xml.XmlException; -import com.google.domain.registry.xml.XmlTestUtils; import com.beust.jcommander.ParameterException; +import google.registry.config.TestRegistryConfig; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.host.HostResource; +import google.registry.model.ofy.Ofy; +import google.registry.rde.RdeCounter; +import google.registry.rde.RdeResourceType; +import google.registry.rde.RdeUtil; +import google.registry.testing.BouncyCastleProviderRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; +import google.registry.util.Idn; +import google.registry.xjc.XjcXmlTransformer; +import google.registry.xjc.rde.XjcRdeContentType; +import google.registry.xjc.rde.XjcRdeDeposit; +import google.registry.xjc.rde.XjcRdeDepositTypeType; +import google.registry.xjc.rdeheader.XjcRdeHeader; +import google.registry.xjc.rdeheader.XjcRdeHeaderCount; +import google.registry.xjc.rdehost.XjcRdeHost; +import google.registry.xjc.rderegistrar.XjcRdeRegistrar; +import google.registry.xml.XmlException; +import google.registry.xml.XmlTestUtils; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/tools/GetApplicationCommandTest.java b/javatests/google/registry/tools/GetApplicationCommandTest.java index 4294198dd..614f458d9 100644 --- a/javatests/google/registry/tools/GetApplicationCommandTest.java +++ b/javatests/google/registry/tools/GetApplicationCommandTest.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.persistDeletedDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainApplication; +import static google.registry.testing.DatastoreHelper.persistActiveDomainApplication; +import static google.registry.testing.DatastoreHelper.persistDeletedDomainApplication; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.ParameterException; diff --git a/javatests/google/registry/tools/GetApplicationIdsCommandTest.java b/javatests/google/registry/tools/GetApplicationIdsCommandTest.java index 75709df8e..5a69b0ac2 100644 --- a/javatests/google/registry/tools/GetApplicationIdsCommandTest.java +++ b/javatests/google/registry/tools/GetApplicationIdsCommandTest.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveContact; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainApplication; +import static google.registry.testing.DatastoreHelper.persistActiveContact; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; -import com.google.domain.registry.model.domain.launch.LaunchPhase; - import com.beust.jcommander.ParameterException; +import google.registry.model.domain.launch.LaunchPhase; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/GetClaimsListCommandTest.java b/javatests/google/registry/tools/GetClaimsListCommandTest.java index 38b85344e..82f144489 100644 --- a/javatests/google/registry/tools/GetClaimsListCommandTest.java +++ b/javatests/google/registry/tools/GetClaimsListCommandTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; import static java.nio.charset.StandardCharsets.UTF_8; @@ -20,7 +20,8 @@ import static java.nio.file.Files.readAllLines; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.tmch.ClaimsListShard; + +import google.registry.model.tmch.ClaimsListShard; import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/tools/GetContactCommandTest.java b/javatests/google/registry/tools/GetContactCommandTest.java index 3d0a3e742..1192ebfc5 100644 --- a/javatests/google/registry/tools/GetContactCommandTest.java +++ b/javatests/google/registry/tools/GetContactCommandTest.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newContactResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveContact; -import static com.google.domain.registry.testing.DatastoreHelper.persistDeletedContact; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newContactResource; +import static google.registry.testing.DatastoreHelper.persistActiveContact; +import static google.registry.testing.DatastoreHelper.persistDeletedContact; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.ParameterException; diff --git a/javatests/google/registry/tools/GetDomainCommandTest.java b/javatests/google/registry/tools/GetDomainCommandTest.java index 61fa3abce..8f25302e6 100644 --- a/javatests/google/registry/tools/GetDomainCommandTest.java +++ b/javatests/google/registry/tools/GetDomainCommandTest.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistDeletedDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainResource; +import static google.registry.testing.DatastoreHelper.persistActiveDomain; +import static google.registry.testing.DatastoreHelper.persistDeletedDomain; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.ParameterException; diff --git a/javatests/google/registry/tools/GetHostCommandTest.java b/javatests/google/registry/tools/GetHostCommandTest.java index 9a45e45f7..0dcb76900 100644 --- a/javatests/google/registry/tools/GetHostCommandTest.java +++ b/javatests/google/registry/tools/GetHostCommandTest.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newHostResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveHost; -import static com.google.domain.registry.testing.DatastoreHelper.persistDeletedHost; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newHostResource; +import static google.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.persistDeletedHost; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.ParameterException; diff --git a/javatests/google/registry/tools/GetRegistrarCommandTest.java b/javatests/google/registry/tools/GetRegistrarCommandTest.java index fc446d08a..7a30fa2fc 100644 --- a/javatests/google/registry/tools/GetRegistrarCommandTest.java +++ b/javatests/google/registry/tools/GetRegistrarCommandTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.beust.jcommander.ParameterException; diff --git a/javatests/google/registry/tools/GetResourceByKeyCommandTest.java b/javatests/google/registry/tools/GetResourceByKeyCommandTest.java index 6bfc66aaa..f4ced223e 100644 --- a/javatests/google/registry/tools/GetResourceByKeyCommandTest.java +++ b/javatests/google/registry/tools/GetResourceByKeyCommandTest.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveContact; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveHost; -import static com.google.domain.registry.testing.DatastoreHelper.persistDeletedContact; -import static com.google.domain.registry.testing.DatastoreHelper.persistDeletedDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistDeletedHost; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistActiveContact; +import static google.registry.testing.DatastoreHelper.persistActiveDomain; +import static google.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.persistDeletedContact; +import static google.registry.testing.DatastoreHelper.persistDeletedDomain; +import static google.registry.testing.DatastoreHelper.persistDeletedHost; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.ParameterException; diff --git a/javatests/google/registry/tools/GetTldCommandTest.java b/javatests/google/registry/tools/GetTldCommandTest.java index a9b57c343..807d88c8f 100644 --- a/javatests/google/registry/tools/GetTldCommandTest.java +++ b/javatests/google/registry/tools/GetTldCommandTest.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.createTlds; import com.beust.jcommander.ParameterException; diff --git a/javatests/google/registry/tools/GhostrydeCommandTest.java b/javatests/google/registry/tools/GhostrydeCommandTest.java index bec8e6201..a45c852e3 100644 --- a/javatests/google/registry/tools/GhostrydeCommandTest.java +++ b/javatests/google/registry/tools/GhostrydeCommandTest.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.domain.registry.keyring.api.Keyring; -import com.google.domain.registry.rde.Ghostryde; -import com.google.domain.registry.rde.Ghostryde.DecodeResult; -import com.google.domain.registry.rde.RdeKeyringModule; -import com.google.domain.registry.testing.BouncyCastleProviderRule; -import com.google.domain.registry.testing.InjectRule; +import google.registry.keyring.api.Keyring; +import google.registry.rde.Ghostryde; +import google.registry.rde.Ghostryde.DecodeResult; +import google.registry.rde.RdeKeyringModule; +import google.registry.testing.BouncyCastleProviderRule; +import google.registry.testing.InjectRule; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/GtechToolTest.java b/javatests/google/registry/tools/GtechToolTest.java index d08cfaefd..18de839fb 100644 --- a/javatests/google/registry/tools/GtechToolTest.java +++ b/javatests/google/registry/tools/GtechToolTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.CaseFormat.LOWER_UNDERSCORE; import static com.google.common.base.CaseFormat.UPPER_CAMEL; @@ -25,7 +25,8 @@ import com.google.common.collect.Sets; import com.google.common.reflect.ClassPath; import com.google.common.reflect.ClassPath.ClassInfo; import com.google.common.truth.Expect; -import com.google.domain.registry.tools.Command.GtechCommand; + +import google.registry.tools.Command.GtechCommand; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/tools/ListCursorsCommandTest.java b/javatests/google/registry/tools/ListCursorsCommandTest.java index 1c5e49942..d28616d4e 100644 --- a/javatests/google/registry/tools/ListCursorsCommandTest.java +++ b/javatests/google/registry/tools/ListCursorsCommandTest.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; - -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.persistResource; import com.beust.jcommander.ParameterException; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; + import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/tools/ListDomainsCommandTest.java b/javatests/google/registry/tools/ListDomainsCommandTest.java index 45d181382..5436bb8e6 100644 --- a/javatests/google/registry/tools/ListDomainsCommandTest.java +++ b/javatests/google/registry/tools/ListDomainsCommandTest.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import com.google.domain.registry.tools.server.ListDomainsAction; +import google.registry.tools.server.ListDomainsAction; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; diff --git a/javatests/google/registry/tools/ListHostsCommandTest.java b/javatests/google/registry/tools/ListHostsCommandTest.java index 1beb264dd..7b6ce9800 100644 --- a/javatests/google/registry/tools/ListHostsCommandTest.java +++ b/javatests/google/registry/tools/ListHostsCommandTest.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import com.google.domain.registry.tools.server.ListHostsAction; +import google.registry.tools.server.ListHostsAction; /** * Unit tests for {@link ListHostsCommand}. diff --git a/javatests/google/registry/tools/ListObjectsCommandTestCase.java b/javatests/google/registry/tools/ListObjectsCommandTestCase.java index fe42e041c..01d50b762 100644 --- a/javatests/google/registry/tools/ListObjectsCommandTestCase.java +++ b/javatests/google/registry/tools/ListObjectsCommandTestCase.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.request.JsonResponse.JSON_SAFETY_PREFIX; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.tools.server.ListObjectsAction.FIELDS_PARAM; -import static com.google.domain.registry.tools.server.ListObjectsAction.FULL_FIELD_NAMES_PARAM; -import static com.google.domain.registry.tools.server.ListObjectsAction.PRINT_HEADER_ROW_PARAM; +import static google.registry.request.JsonResponse.JSON_SAFETY_PREFIX; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.tools.server.ListObjectsAction.FIELDS_PARAM; +import static google.registry.tools.server.ListObjectsAction.FULL_FIELD_NAMES_PARAM; +import static google.registry.tools.server.ListObjectsAction.PRINT_HEADER_ROW_PARAM; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyMapOf; import static org.mockito.Matchers.eq; @@ -28,7 +28,8 @@ import static org.mockito.Mockito.when; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; -import com.google.domain.registry.tools.ServerSideCommand.Connection; + +import google.registry.tools.ServerSideCommand.Connection; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/ListPremiumListsCommandTest.java b/javatests/google/registry/tools/ListPremiumListsCommandTest.java index a4f2207c3..deab97eb8 100644 --- a/javatests/google/registry/tools/ListPremiumListsCommandTest.java +++ b/javatests/google/registry/tools/ListPremiumListsCommandTest.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import com.google.domain.registry.tools.server.ListPremiumListsAction; +import google.registry.tools.server.ListPremiumListsAction; /** * Unit tests for {@link ListPremiumListsCommand}. diff --git a/javatests/google/registry/tools/ListRegistrarsCommandTest.java b/javatests/google/registry/tools/ListRegistrarsCommandTest.java index 073671910..b24a6869a 100644 --- a/javatests/google/registry/tools/ListRegistrarsCommandTest.java +++ b/javatests/google/registry/tools/ListRegistrarsCommandTest.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import com.google.domain.registry.tools.server.ListRegistrarsAction; +import google.registry.tools.server.ListRegistrarsAction; /** * Unit tests for {@link ListRegistrarsCommand}. diff --git a/javatests/google/registry/tools/ListReservedListsCommandTest.java b/javatests/google/registry/tools/ListReservedListsCommandTest.java index 3eaf44973..eefb94179 100644 --- a/javatests/google/registry/tools/ListReservedListsCommandTest.java +++ b/javatests/google/registry/tools/ListReservedListsCommandTest.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import com.google.domain.registry.tools.server.ListReservedListsAction; +import google.registry.tools.server.ListReservedListsAction; /** * Unit tests for {@link ListReservedListsCommand}. diff --git a/javatests/google/registry/tools/ListTldsCommandTest.java b/javatests/google/registry/tools/ListTldsCommandTest.java index 015d0490a..230b0353b 100644 --- a/javatests/google/registry/tools/ListTldsCommandTest.java +++ b/javatests/google/registry/tools/ListTldsCommandTest.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import com.google.domain.registry.tools.server.ListTldsAction; +import google.registry.tools.server.ListTldsAction; /** * Unit tests for {@link ListTldsCommand}. diff --git a/javatests/google/registry/tools/MutatingCommandTest.java b/javatests/google/registry/tools/MutatingCommandTest.java index fafa97931..47c79f709 100644 --- a/javatests/google/registry/tools/MutatingCommandTest.java +++ b/javatests/google/registry/tools/MutatingCommandTest.java @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.deleteResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveHost; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.deleteResource; +import static google.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; +import google.registry.model.host.HostResource; +import google.registry.model.registrar.Registrar; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/PublishDetailReportCommandTest.java b/javatests/google/registry/tools/PublishDetailReportCommandTest.java index 044927f84..6f714402b 100644 --- a/javatests/google/registry/tools/PublishDetailReportCommandTest.java +++ b/javatests/google/registry/tools/PublishDetailReportCommandTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static org.mockito.Matchers.anyMapOf; import static org.mockito.Matchers.anyString; @@ -21,7 +21,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.tools.ServerSideCommand.Connection; + +import google.registry.tools.ServerSideCommand.Connection; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/RegistrarContactCommandTest.java b/javatests/google/registry/tools/RegistrarContactCommandTest.java index 125ba02ff..e224d7a03 100644 --- a/javatests/google/registry/tools/RegistrarContactCommandTest.java +++ b/javatests/google/registry/tools/RegistrarContactCommandTest.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.registrar.RegistrarContact.Type.ABUSE; -import static com.google.domain.registry.model.registrar.RegistrarContact.Type.ADMIN; -import static com.google.domain.registry.model.registrar.RegistrarContact.Type.WHOIS; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources; +import static google.registry.model.registrar.RegistrarContact.Type.ABUSE; +import static google.registry.model.registrar.RegistrarContact.Type.ADMIN; +import static google.registry.model.registrar.RegistrarContact.Type.WHOIS; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; + +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/RegistryToolEnvironmentTest.java b/javatests/google/registry/tools/RegistryToolEnvironmentTest.java index 19979057b..ef524a4e0 100644 --- a/javatests/google/registry/tools/RegistryToolEnvironmentTest.java +++ b/javatests/google/registry/tools/RegistryToolEnvironmentTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/tools/RegistryToolTest.java b/javatests/google/registry/tools/RegistryToolTest.java index d230424fc..014a810ca 100644 --- a/javatests/google/registry/tools/RegistryToolTest.java +++ b/javatests/google/registry/tools/RegistryToolTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.CaseFormat.LOWER_UNDERSCORE; import static com.google.common.base.CaseFormat.UPPER_CAMEL; diff --git a/javatests/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java b/javatests/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java index 23e27fae7..4f41045ba 100644 --- a/javatests/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java +++ b/javatests/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.collect.Iterables.transform; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; import com.google.common.base.Function; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.ofy.CommitLogManifest; -import com.google.domain.registry.model.ofy.CommitLogMutation; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.model.registry.Registry; + +import google.registry.model.ImmutableObject; +import google.registry.model.ofy.CommitLogManifest; +import google.registry.model.ofy.CommitLogMutation; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.model.registry.Registry; import org.junit.Test; diff --git a/javatests/google/registry/tools/SetupOteCommandTest.java b/javatests/google/registry/tools/SetupOteCommandTest.java index e8d4e221c..ea76ab577 100644 --- a/javatests/google/registry/tools/SetupOteCommandTest.java +++ b/javatests/google/registry/tools/SetupOteCommandTest.java @@ -12,26 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.registrar.Registrar.State.ACTIVE; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistPremiumList; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.registrar.Registrar.State.ACTIVE; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistPremiumList; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.util.CidrAddressBlock; import com.beust.jcommander.ParameterException; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldState; +import google.registry.util.CidrAddressBlock; + import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Before; diff --git a/javatests/google/registry/tools/UpdateApplicationStatusCommandTest.java b/javatests/google/registry/tools/UpdateApplicationStatusCommandTest.java index 8e180eb6a..93a03a684 100644 --- a/javatests/google/registry/tools/UpdateApplicationStatusCommandTest.java +++ b/javatests/google/registry/tools/UpdateApplicationStatusCommandTest.java @@ -12,31 +12,32 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.collect.Iterables.getLast; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assert_; -import static com.google.domain.registry.model.domain.launch.ApplicationStatus.ALLOCATED; -import static com.google.domain.registry.model.domain.launch.ApplicationStatus.PENDING_ALLOCATION; -import static com.google.domain.registry.model.domain.launch.ApplicationStatus.REJECTED; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newContactResourceWithRoid; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DomainApplicationSubject.assertAboutApplications; -import static com.google.domain.registry.testing.HistoryEntrySubject.assertAboutHistoryEntries; +import static google.registry.model.domain.launch.ApplicationStatus.ALLOCATED; +import static google.registry.model.domain.launch.ApplicationStatus.PENDING_ALLOCATION; +import static google.registry.model.domain.launch.ApplicationStatus.REJECTED; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newContactResourceWithRoid; +import static google.registry.testing.DatastoreHelper.newDomainApplication; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DomainApplicationSubject.assertAboutApplications; +import static google.registry.testing.HistoryEntrySubject.assertAboutHistoryEntries; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.FluentIterable; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.eppcommon.Trid; -import com.google.domain.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.reporting.HistoryEntry; + +import google.registry.model.domain.DomainApplication; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.eppcommon.Trid; +import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; +import google.registry.model.poll.PollMessage; +import google.registry.model.registrar.Registrar; +import google.registry.model.reporting.HistoryEntry; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/UpdateClaimsNoticeCommandTest.java b/javatests/google/registry/tools/UpdateClaimsNoticeCommandTest.java index 4ea3003c0..b3d261e2b 100644 --- a/javatests/google/registry/tools/UpdateClaimsNoticeCommandTest.java +++ b/javatests/google/registry/tools/UpdateClaimsNoticeCommandTest.java @@ -12,23 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DomainApplicationSubject.assertAboutApplications; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainApplication; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DomainApplicationSubject.assertAboutApplications; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.domain.launch.LaunchNotice; -import com.google.domain.registry.model.domain.launch.LaunchNotice.InvalidChecksumException; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.smd.EncodedSignedMark; + +import google.registry.model.domain.DomainApplication; +import google.registry.model.domain.launch.LaunchNotice; +import google.registry.model.domain.launch.LaunchNotice.InvalidChecksumException; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.smd.EncodedSignedMark; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/UpdateCursorsCommandTest.java b/javatests/google/registry/tools/UpdateCursorsCommandTest.java index 7643d1b31..3e6946cde 100644 --- a/javatests/google/registry/tools/UpdateCursorsCommandTest.java +++ b/javatests/google/registry/tools/UpdateCursorsCommandTest.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; +import google.registry.model.registry.Registry; +import google.registry.model.registry.RegistryCursor; +import google.registry.model.registry.RegistryCursor.CursorType; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/UpdatePremiumListCommandTest.java b/javatests/google/registry/tools/UpdatePremiumListCommandTest.java index ad52e5f6a..b0dc06e57 100644 --- a/javatests/google/registry/tools/UpdatePremiumListCommandTest.java +++ b/javatests/google/registry/tools/UpdatePremiumListCommandTest.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.request.JsonResponse.JSON_SAFETY_PREFIX; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.request.JsonResponse.JSON_SAFETY_PREFIX; +import static google.registry.util.ResourceUtils.readResourceUtf8; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyMapOf; import static org.mockito.Matchers.eq; @@ -23,8 +23,9 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; -import com.google.domain.registry.tools.ServerSideCommand.Connection; -import com.google.domain.registry.tools.server.UpdatePremiumListAction; + +import google.registry.tools.ServerSideCommand.Connection; +import google.registry.tools.server.UpdatePremiumListAction; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/UpdateRegistrarCommandTest.java b/javatests/google/registry/tools/UpdateRegistrarCommandTest.java index 7b3cd8840..d674320d0 100644 --- a/javatests/google/registry/tools/UpdateRegistrarCommandTest.java +++ b/javatests/google/registry/tools/UpdateRegistrarCommandTest.java @@ -12,29 +12,30 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.registrar.Registrar.loadByClientId; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.registrar.Registrar.loadByClientId; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.billing.RegistrarBillingEntry; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.Registrar.BillingMethod; -import com.google.domain.registry.model.registrar.Registrar.State; -import com.google.domain.registry.model.registrar.Registrar.Type; -import com.google.domain.registry.util.CidrAddressBlock; import com.beust.jcommander.ParameterException; +import google.registry.model.billing.RegistrarBillingEntry; +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.Registrar.BillingMethod; +import google.registry.model.registrar.Registrar.State; +import google.registry.model.registrar.Registrar.Type; +import google.registry.util.CidrAddressBlock; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/tools/UpdateReservedListCommandTest.java b/javatests/google/registry/tools/UpdateReservedListCommandTest.java index 9352900c2..ac1de7aee 100644 --- a/javatests/google/registry/tools/UpdateReservedListCommandTest.java +++ b/javatests/google/registry/tools/UpdateReservedListCommandTest.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.registry.label.ReservationType.FULLY_BLOCKED; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.model.registry.label.ReservedList; + +import google.registry.model.registry.label.ReservedList; import org.junit.Test; diff --git a/javatests/google/registry/tools/UpdateServerLocksCommandTest.java b/javatests/google/registry/tools/UpdateServerLocksCommandTest.java index 093b066ed..6b09f1502 100644 --- a/javatests/google/registry/tools/UpdateServerLocksCommandTest.java +++ b/javatests/google/registry/tools/UpdateServerLocksCommandTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import com.beust.jcommander.ParameterException; diff --git a/javatests/google/registry/tools/UpdateSmdCommandTest.java b/javatests/google/registry/tools/UpdateSmdCommandTest.java index a37782971..762dbfb82 100644 --- a/javatests/google/registry/tools/UpdateSmdCommandTest.java +++ b/javatests/google/registry/tools/UpdateSmdCommandTest.java @@ -12,28 +12,29 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.io.BaseEncoding.base64; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DomainApplicationSubject.assertAboutApplications; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainApplication; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DomainApplicationSubject.assertAboutApplications; +import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.flows.EppException.ParameterValuePolicyErrorException; -import com.google.domain.registry.flows.EppException.ParameterValueSyntaxErrorException; -import com.google.domain.registry.flows.EppException.RequiredParameterMissingException; -import com.google.domain.registry.model.domain.DomainApplication; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.smd.EncodedSignedMark; -import com.google.domain.registry.model.smd.SignedMarkRevocationList; -import com.google.domain.registry.tmch.TmchData; + +import google.registry.flows.EppException.ParameterValuePolicyErrorException; +import google.registry.flows.EppException.ParameterValueSyntaxErrorException; +import google.registry.flows.EppException.RequiredParameterMissingException; +import google.registry.model.domain.DomainApplication; +import google.registry.model.reporting.HistoryEntry; +import google.registry.model.smd.EncodedSignedMark; +import google.registry.model.smd.SignedMarkRevocationList; +import google.registry.tmch.TmchData; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/UpdateTldCommandTest.java b/javatests/google/registry/tools/UpdateTldCommandTest.java index a1565623e..ef00b99e8 100644 --- a/javatests/google/registry/tools/UpdateTldCommandTest.java +++ b/javatests/google/registry/tools/UpdateTldCommandTest.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.collect.Iterables.transform; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.registry.label.ReservedListTest.GET_NAME_FUNCTION; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistPremiumList; -import static com.google.domain.registry.testing.DatastoreHelper.persistReservedList; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.registry.label.ReservedListTest.GET_NAME_FUNCTION; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistPremiumList; +import static google.registry.testing.DatastoreHelper.persistReservedList; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.money.CurrencyUnit.JPY; import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; @@ -30,13 +30,14 @@ import static org.joda.time.Duration.standardMinutes; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldState; -import com.google.domain.registry.model.registry.label.PremiumList; import com.beust.jcommander.ParameterException; import com.googlecode.objectify.Key; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldState; +import google.registry.model.registry.label.PremiumList; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/UploadClaimsListCommandTest.java b/javatests/google/registry/tools/UploadClaimsListCommandTest.java index 42f6c743d..3e24f6b8c 100644 --- a/javatests/google/registry/tools/UploadClaimsListCommandTest.java +++ b/javatests/google/registry/tools/UploadClaimsListCommandTest.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import com.google.domain.registry.model.tmch.ClaimsListShard; +import google.registry.model.tmch.ClaimsListShard; import org.joda.time.DateTime; import org.junit.Test; diff --git a/javatests/google/registry/tools/ValidateEscrowDepositCommandTest.java b/javatests/google/registry/tools/ValidateEscrowDepositCommandTest.java index eaeb28aad..489b7cb8b 100644 --- a/javatests/google/registry/tools/ValidateEscrowDepositCommandTest.java +++ b/javatests/google/registry/tools/ValidateEscrowDepositCommandTest.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import com.google.domain.registry.rde.RdeTestData; -import com.google.domain.registry.xml.XmlException; +import google.registry.rde.RdeTestData; +import google.registry.xml.XmlException; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/tools/ValidateLoginCredentialsCommandTest.java b/javatests/google/registry/tools/ValidateLoginCredentialsCommandTest.java index 9e932fc93..abe0818a5 100644 --- a/javatests/google/registry/tools/ValidateLoginCredentialsCommandTest.java +++ b/javatests/google/registry/tools/ValidateLoginCredentialsCommandTest.java @@ -12,21 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools; +package google.registry.tools; -import static com.google.domain.registry.model.registrar.Registrar.State.ACTIVE; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.model.registrar.Registrar.State.ACTIVE; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.flows.EppException; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.CertificateSamples; -import com.google.domain.registry.util.CidrAddressBlock; import com.beust.jcommander.ParameterException; +import google.registry.flows.EppException; +import google.registry.model.registrar.Registrar; +import google.registry.testing.CertificateSamples; +import google.registry.util.CidrAddressBlock; + import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/params/BUILD b/javatests/google/registry/tools/params/BUILD index 77ed139fb..a3a73f9cc 100644 --- a/javatests/google/registry/tools/params/BUILD +++ b/javatests/google/registry/tools/params/BUILD @@ -1,21 +1,24 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + java_library( name = "params", srcs = glob(["*.java"]), deps = [ "//java/com/google/common/base", - "//java/com/google/domain/registry/tools/params", - "//javatests/com/google/domain/registry/testing", "//third_party/java/hamcrest", "//third_party/java/jcommander", "//third_party/java/joda_money", "//third_party/java/joda_time", "//third_party/java/junit", "//third_party/java/truth", + "//java/google/registry/tools/params", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/tools/params/DateTimeParameterTest.java b/javatests/google/registry/tools/params/DateTimeParameterTest.java index fa41a8a8c..5699e2fc6 100644 --- a/javatests/google/registry/tools/params/DateTimeParameterTest.java +++ b/javatests/google/registry/tools/params/DateTimeParameterTest.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import static com.google.common.truth.Truth.assertThat; import static org.joda.time.DateTimeZone.UTC; -import com.google.domain.registry.testing.ExceptionRule; - import com.beust.jcommander.ParameterException; +import google.registry.testing.ExceptionRule; + import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/tools/params/DurationParameterTest.java b/javatests/google/registry/tools/params/DurationParameterTest.java index 35e09fc37..9b109723a 100644 --- a/javatests/google/registry/tools/params/DurationParameterTest.java +++ b/javatests/google/registry/tools/params/DurationParameterTest.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import static com.google.common.truth.Truth.assertThat; -import com.google.domain.registry.testing.ExceptionRule; - import com.beust.jcommander.ParameterException; +import google.registry.testing.ExceptionRule; + import org.joda.time.Duration; import org.joda.time.Period; import org.junit.Rule; diff --git a/javatests/google/registry/tools/params/HostAndPortParameterTest.java b/javatests/google/registry/tools/params/HostAndPortParameterTest.java index 6ce81ea84..374c075ab 100644 --- a/javatests/google/registry/tools/params/HostAndPortParameterTest.java +++ b/javatests/google/registry/tools/params/HostAndPortParameterTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/tools/params/MoneyParameterTest.java b/javatests/google/registry/tools/params/MoneyParameterTest.java index 299b949a6..9be3b37d9 100644 --- a/javatests/google/registry/tools/params/MoneyParameterTest.java +++ b/javatests/google/registry/tools/params/MoneyParameterTest.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import static com.google.common.truth.Truth.assertThat; -import com.google.domain.registry.testing.ExceptionRule; - import com.beust.jcommander.ParameterException; +import google.registry.testing.ExceptionRule; + import org.joda.money.Money; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/tools/params/PathParameterTest.java b/javatests/google/registry/tools/params/PathParameterTest.java index 2952e20ed..f865e5928 100644 --- a/javatests/google/registry/tools/params/PathParameterTest.java +++ b/javatests/google/registry/tools/params/PathParameterTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import static com.google.common.truth.Truth.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -22,10 +22,10 @@ import static org.hamcrest.Matchers.startsWith; import static org.junit.Assume.assumeThat; import static org.junit.Assume.assumeTrue; -import com.google.domain.registry.testing.ExceptionRule; - import com.beust.jcommander.ParameterException; +import google.registry.testing.ExceptionRule; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/javatests/google/registry/tools/params/PhoneNumberParameterTest.java b/javatests/google/registry/tools/params/PhoneNumberParameterTest.java index fb2b4a4c0..66ad12282 100644 --- a/javatests/google/registry/tools/params/PhoneNumberParameterTest.java +++ b/javatests/google/registry/tools/params/PhoneNumberParameterTest.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import static com.google.common.truth.Truth.assertThat; -import com.google.domain.registry.testing.ExceptionRule; +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/tools/params/YearMonthParameterTest.java b/javatests/google/registry/tools/params/YearMonthParameterTest.java index e61e08751..85628d16e 100644 --- a/javatests/google/registry/tools/params/YearMonthParameterTest.java +++ b/javatests/google/registry/tools/params/YearMonthParameterTest.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.params; +package google.registry.tools.params; import static com.google.common.truth.Truth.assertThat; -import com.google.domain.registry.testing.ExceptionRule; - import com.beust.jcommander.ParameterException; +import google.registry.testing.ExceptionRule; + import org.joda.time.YearMonth; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/tools/server/BUILD b/javatests/google/registry/tools/server/BUILD index c6fbbd072..0e34c2b07 100644 --- a/javatests/google/registry/tools/server/BUILD +++ b/javatests/google/registry/tools/server/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -12,15 +15,6 @@ java_library( deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", - "//java/com/google/domain/registry/groups", - "//java/com/google/domain/registry/mapreduce", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/tools/server", - "//java/com/google/domain/registry/util", - "//javatests/com/google/domain/registry/model", - "//javatests/com/google/domain/registry/testing", - "//javatests/com/google/domain/registry/testing/mapreduce", "//third_party/java/appengine:appengine-api-testonly", "//third_party/java/appengine_gcs_client", "//third_party/java/appengine_mapreduce2:appengine_mapreduce", @@ -31,6 +25,15 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/groups", + "//java/google/registry/mapreduce", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/tools/server", + "//java/google/registry/util", + "//javatests/google/registry/model", + "//javatests/google/registry/testing", + "//javatests/google/registry/testing/mapreduce", ], ) diff --git a/javatests/google/registry/tools/server/CreateGroupsActionTest.java b/javatests/google/registry/tools/server/CreateGroupsActionTest.java index eb318f98f..b558a8828 100644 --- a/javatests/google/registry/tools/server/CreateGroupsActionTest.java +++ b/javatests/google/registry/tools/server/CreateGroupsActionTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.truth.Truth.assertThat; import static javax.servlet.http.HttpServletResponse.SC_OK; @@ -21,14 +21,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.base.Optional; -import com.google.domain.registry.groups.DirectoryGroupsConnection; -import com.google.domain.registry.groups.GroupsConnection.Role; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.request.HttpException.InternalServerErrorException; -import com.google.domain.registry.request.Response; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.groups.DirectoryGroupsConnection; +import google.registry.groups.GroupsConnection.Role; +import google.registry.request.HttpException.BadRequestException; +import google.registry.request.HttpException.InternalServerErrorException; +import google.registry.request.Response; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.InjectRule; import org.junit.Assert; import org.junit.Rule; diff --git a/javatests/google/registry/tools/server/CreatePremiumListActionTest.java b/javatests/google/registry/tools/server/CreatePremiumListActionTest.java index e2877e4cf..59cff4911 100644 --- a/javatests/google/registry/tools/server/CreatePremiumListActionTest.java +++ b/javatests/google/registry/tools/server/CreatePremiumListActionTest.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.createTlds; import static javax.servlet.http.HttpServletResponse.SC_OK; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeJsonResponse; +import google.registry.model.registry.label.PremiumList; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeJsonResponse; import org.joda.money.Money; import org.junit.Before; diff --git a/javatests/google/registry/tools/server/DeleteEntityActionTest.java b/javatests/google/registry/tools/server/DeleteEntityActionTest.java index 0f292c39e..e3e362425 100644 --- a/javatests/google/registry/tools/server/DeleteEntityActionTest.java +++ b/javatests/google/registry/tools/server/DeleteEntityActionTest.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.appengine.api.datastore.DatastoreServiceFactory.getDatastoreService; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; import static com.googlecode.objectify.Key.create; +import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.api.datastore.Entity; import com.google.appengine.api.datastore.KeyFactory; -import com.google.domain.registry.model.registry.label.ReservedList; -import com.google.domain.registry.request.HttpException.BadRequestException; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeResponse; + +import google.registry.model.registry.label.ReservedList; +import google.registry.request.HttpException.BadRequestException; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeResponse; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/tools/server/DeleteProberDataActionTest.java b/javatests/google/registry/tools/server/DeleteProberDataActionTest.java index badd448fb..4b45a88e0 100644 --- a/javatests/google/registry/tools/server/DeleteProberDataActionTest.java +++ b/javatests/google/registry/tools/server/DeleteProberDataActionTest.java @@ -12,36 +12,37 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistDeletedDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleResource; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistActiveDomain; +import static google.registry.testing.DatastoreHelper.persistDeletedDomain; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleResource; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.TldType; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.mapreduce.MapreduceTestCase; import com.googlecode.objectify.Key; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.model.ImmutableObject; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.domain.DomainResource; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.ForeignKeyIndex; +import google.registry.model.poll.PollMessage; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.TldType; +import google.registry.model.reporting.HistoryEntry; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeResponse; +import google.registry.testing.mapreduce.MapreduceTestCase; + import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/server/GenerateZoneFilesActionTest.java b/javatests/google/registry/tools/server/GenerateZoneFilesActionTest.java index 4f546a9e5..8dad00d6c 100644 --- a/javatests/google/registry/tools/server/GenerateZoneFilesActionTest.java +++ b/javatests/google/registry/tools/server/GenerateZoneFilesActionTest.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.appengine.tools.cloudstorage.GcsServiceFactory.createGcsService; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainResource; -import static com.google.domain.registry.testing.DatastoreHelper.newHostResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveContact; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveHost; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.GcsTestingUtils.readGcsFile; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newDomainResource; +import static google.registry.testing.DatastoreHelper.newHostResource; +import static google.registry.testing.DatastoreHelper.persistActiveContact; +import static google.registry.testing.DatastoreHelper.persistActiveDomain; +import static google.registry.testing.DatastoreHelper.persistActiveDomainApplication; +import static google.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.GcsTestingUtils.readGcsFile; +import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.Duration.standardDays; @@ -36,12 +36,13 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.mapreduce.MapreduceTestCase; + +import google.registry.mapreduce.MapreduceRunner; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.host.HostResource; +import google.registry.testing.FakeClock; +import google.registry.testing.mapreduce.MapreduceTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/javatests/google/registry/tools/server/KillAllActionTestCase.java b/javatests/google/registry/tools/server/KillAllActionTestCase.java deleted file mode 100644 index 214252167..000000000 --- a/javatests/google/registry/tools/server/KillAllActionTestCase.java +++ /dev/null @@ -1,240 +0,0 @@ -// 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.tools.server; - -import static com.google.appengine.api.datastore.DatastoreServiceFactory.getDatastoreService; -import static com.google.common.base.Predicates.in; -import static com.google.common.base.Predicates.instanceOf; -import static com.google.common.base.Predicates.not; -import static com.google.common.collect.Multimaps.filterKeys; -import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.model.server.ServerSecret.getServerSecret; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.newContactResource; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainApplication; -import static com.google.domain.registry.testing.DatastoreHelper.newDomainResource; -import static com.google.domain.registry.testing.DatastoreHelper.newHostResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistPremiumList; -import static com.google.domain.registry.testing.DatastoreHelper.persistReservedList; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistResourceWithCommitLog; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; -import static java.util.Arrays.asList; -import static org.joda.money.CurrencyUnit.USD; - -import com.google.appengine.api.datastore.Entity; -import com.google.common.base.Predicate; -import com.google.common.collect.FluentIterable; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.domain.registry.mapreduce.MapreduceAction; -import com.google.domain.registry.model.EntityClasses; -import com.google.domain.registry.model.EppResource; -import com.google.domain.registry.model.ImmutableObject; -import com.google.domain.registry.model.annotations.VirtualEntity; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.billing.BillingEvent.Reason; -import com.google.domain.registry.model.billing.RegistrarBillingEntry; -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCredit.CreditType; -import com.google.domain.registry.model.billing.RegistrarCreditBalance; -import com.google.domain.registry.model.common.EntityGroupRoot; -import com.google.domain.registry.model.common.GaeUserIdConverter; -import com.google.domain.registry.model.export.LogsExportCursor; -import com.google.domain.registry.model.ofy.CommitLogCheckpoint; -import com.google.domain.registry.model.ofy.CommitLogCheckpointRoot; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.rde.RdeMode; -import com.google.domain.registry.model.rde.RdeRevision; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.RegistryCursor.CursorType; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.model.server.Lock; -import com.google.domain.registry.model.smd.SignedMarkRevocationList; -import com.google.domain.registry.model.tmch.ClaimsListShard; -import com.google.domain.registry.model.tmch.TmchCrl; -import com.google.domain.registry.testing.mapreduce.MapreduceTestCase; - -import com.googlecode.objectify.Key; -import com.googlecode.objectify.Ref; -import com.googlecode.objectify.VoidWork; - -import org.joda.money.Money; -import org.junit.Test; - -public abstract class KillAllActionTestCase extends MapreduceTestCase{ - - private final ImmutableSet affectedKinds; - - private static final ImmutableSet ALL_PERSISTED_KINDS = FluentIterable - .from(EntityClasses.ALL_CLASSES) - .filter( - new Predicate>() { - @Override - public boolean apply(Class clazz) { - return !clazz.isAnnotationPresent(VirtualEntity.class); - }}) - .transform(EntityClasses.CLASS_TO_KIND_FUNCTION) - .toSet(); - - - public KillAllActionTestCase(ImmutableSet affectedKinds) { - this.affectedKinds = affectedKinds; - } - - /** Create at least one of each type of entity in the schema. */ - void createData() { - createTld("tld1"); - createTld("tld2"); - persistResource(CommitLogCheckpointRoot.create(START_OF_TIME.plusDays(1))); - persistResource( - CommitLogCheckpoint.create( - START_OF_TIME.plusDays(1), - ImmutableMap.of(1, START_OF_TIME.plusDays(2)))); - for (EppResource resource : asList( - newDomainResource("foo.tld1"), - newDomainResource("foo.tld2"), - newDomainApplication("foo.tld1"), - newDomainApplication("foo.tld2"), - newContactResource("foo1"), - newContactResource("foo2"), - newHostResource("ns.foo.tld1"), - newHostResource("ns.foo.tld2"))) { - persistResourceWithCommitLog(resource); - HistoryEntry history = - persistResource(new HistoryEntry.Builder().setParent(resource).build()); - BillingEvent.OneTime oneTime = persistResource(new BillingEvent.OneTime.Builder() - .setParent(history) - .setBillingTime(START_OF_TIME) - .setEventTime(START_OF_TIME) - .setClientId("") - .setTargetId("") - .setReason(Reason.ERROR) - .setCost(Money.of(USD, 1)) - .build()); - for (ImmutableObject descendant : asList( - new PollMessage.OneTime.Builder() - .setParent(history) - .setClientId("") - .setEventTime(START_OF_TIME) - .build(), - new PollMessage.Autorenew.Builder() - .setParent(history) - .setClientId("") - .setEventTime(START_OF_TIME) - .build(), - new BillingEvent.Cancellation.Builder() - .setOneTimeEventRef(Ref.create(oneTime)) - .setParent(history) - .setBillingTime(START_OF_TIME) - .setEventTime(START_OF_TIME) - .setClientId("") - .setTargetId("") - .setReason(Reason.ERROR) - .build(), - new BillingEvent.Modification.Builder() - .setEventRef(Ref.create(oneTime)) - .setParent(history) - .setEventTime(START_OF_TIME) - .setClientId("") - .setTargetId("") - .setReason(Reason.ERROR) - .setCost(Money.of(USD, 1)) - .build(), - new BillingEvent.Recurring.Builder() - .setParent(history) - .setEventTime(START_OF_TIME) - .setClientId("") - .setTargetId("") - .setReason(Reason.ERROR) - .build())) { - persistResource(descendant); - } - } - persistResource(new RegistrarBillingEntry.Builder() - .setParent(Registrar.loadByClientId("TheRegistrar")) - .setCreated(START_OF_TIME) - .setDescription("description") - .setAmount(Money.of(USD, 1)) - .build()); - RegistrarCredit credit = persistResource(new RegistrarCredit.Builder() - .setParent(Registrar.loadByClientId("TheRegistrar")) - .setCreationTime(START_OF_TIME) - .setCurrency(USD) - .setDescription("description") - .setTld("tld1") - .setType(CreditType.AUCTION) - .build()); - persistResource(new RegistrarCreditBalance.Builder() - .setParent(credit) - .setAmount(Money.of(USD, 1)) - .setEffectiveTime(START_OF_TIME) - .setWrittenTime(START_OF_TIME) - .build()); - persistPremiumList("premium", "a,USD 100", "b,USD 200"); - persistReservedList("reserved", "lol,RESERVED_FOR_ANCHOR_TENANT,foobar1"); - getServerSecret(); // Forces persist. - TmchCrl.set("crl content"); - persistResource(new LogsExportCursor.Builder().build()); - persistPremiumList("premium", "a,USD 100", "b,USD 200"); - SignedMarkRevocationList.create( - START_OF_TIME, ImmutableMap.of("a", START_OF_TIME, "b", END_OF_TIME)).save(); - ClaimsListShard.create(START_OF_TIME, ImmutableMap.of("a", "1", "b", "2")).save(); - // These entities must be saved within a transaction. - ofy().transact(new VoidWork() { - @Override - public void vrun() { - RegistryCursor.save(Registry.get("tld1"), CursorType.BRDA, START_OF_TIME); - RdeRevision.saveRevision("tld1", START_OF_TIME, RdeMode.FULL, 0); - }}); - // These entities intentionally don't expose constructors or factory methods. - getDatastoreService().put(new Entity(EntityGroupRoot.getCrossTldKey().getRaw())); - getDatastoreService().put(new Entity(Key.getKind(GaeUserIdConverter.class), 1)); - getDatastoreService().put(new Entity(Key.getKind(Lock.class), 1)); - } - - abstract MapreduceAction createAction(); - - @Test - public void testKill() throws Exception { - createData(); - ImmutableMultimap beforeContents = getDatastoreContents(); - assertThat(beforeContents.keySet()).named("persisted test data") - .containsAllIn(ALL_PERSISTED_KINDS); - MapreduceAction action = createAction(); - action.run(); - executeTasksUntilEmpty("mapreduce"); - ImmutableMultimap afterContents = getDatastoreContents(); - assertThat(afterContents.keySet()).containsNoneIn(affectedKinds); - assertThat(afterContents) - .containsExactlyEntriesIn(filterKeys(beforeContents, not(in(affectedKinds)))); - } - - private ImmutableMultimap getDatastoreContents() { - ofy().clearSessionCache(); - ImmutableMultimap.Builder contentsBuilder = new ImmutableMultimap.Builder<>(); - // Filter out raw Entity objects created by the mapreduce. - for (Object obj : Iterables.filter(ofy().load(), not(instanceOf(Entity.class)))) { - contentsBuilder.put(Key.getKind(obj.getClass()), obj); - } - return contentsBuilder.build(); - } -} diff --git a/javatests/google/registry/tools/server/KillAllCommitLogsActionTest.java b/javatests/google/registry/tools/server/KillAllCommitLogsActionTest.java index 9fa8ef38a..3cc33b47d 100644 --- a/javatests/google/registry/tools/server/KillAllCommitLogsActionTest.java +++ b/javatests/google/registry/tools/server/KillAllCommitLogsActionTest.java @@ -12,46 +12,92 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.model.EntityClasses.CLASS_TO_KIND_FUNCTION; +import static com.google.common.base.Predicates.instanceOf; +import static com.google.common.base.Predicates.not; +import static com.google.common.collect.Iterables.filter; +import static com.google.common.truth.Truth.assertThat; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.newContactResource; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistResourceWithCommitLog; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static java.util.Arrays.asList; +import com.google.appengine.api.datastore.Entity; import com.google.common.base.Optional; +import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; -import com.google.domain.registry.mapreduce.MapreduceAction; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.model.ofy.CommitLogBucket; -import com.google.domain.registry.model.ofy.CommitLogCheckpoint; -import com.google.domain.registry.model.ofy.CommitLogCheckpointRoot; -import com.google.domain.registry.model.ofy.CommitLogManifest; -import com.google.domain.registry.model.ofy.CommitLogMutation; -import com.google.domain.registry.testing.FakeResponse; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import google.registry.mapreduce.MapreduceRunner; +import google.registry.model.ImmutableObject; +import google.registry.model.ofy.CommitLogBucket; +import google.registry.model.ofy.CommitLogCheckpoint; +import google.registry.model.ofy.CommitLogCheckpointRoot; +import google.registry.model.ofy.CommitLogManifest; +import google.registry.model.ofy.CommitLogMutation; +import google.registry.testing.FakeResponse; +import google.registry.testing.mapreduce.MapreduceTestCase; + +import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import java.util.List; + /** Tests for {@link KillAllCommitLogsAction}.*/ @RunWith(JUnit4.class) -public class KillAllCommitLogsActionTest extends KillAllActionTestCase { +public class KillAllCommitLogsActionTest extends MapreduceTestCase { - public KillAllCommitLogsActionTest() { - super(FluentIterable - .from(asList( - CommitLogBucket.class, - CommitLogCheckpoint.class, - CommitLogCheckpointRoot.class, - CommitLogMutation.class, - CommitLogManifest.class)) - .transform(CLASS_TO_KIND_FUNCTION) - .toSet()); - } + static final List> AFFECTED_TYPES = ImmutableList.of( + CommitLogBucket.class, + CommitLogCheckpoint.class, + CommitLogCheckpointRoot.class, + CommitLogMutation.class, + CommitLogManifest.class); - @Override - MapreduceAction createAction() { + private void runMapreduce() throws Exception { action = new KillAllCommitLogsAction(); action.mrRunner = new MapreduceRunner(Optional.absent(), Optional.absent()); action.response = new FakeResponse(); - return action; + action.run(); + executeTasksUntilEmpty("mapreduce"); + } + + @Test + public void testKill() throws Exception { + int nextContactId = 5432; + for (String tld : asList("tld1", "tld2")) { + createTld(tld); + persistResourceWithCommitLog( + newContactResource(String.format("abc%d", nextContactId++))); + } + persistResource(CommitLogCheckpointRoot.create(START_OF_TIME.plusDays(1))); + persistResource( + CommitLogCheckpoint.create( + START_OF_TIME.plusDays(1), + ImmutableMap.of(1, START_OF_TIME.plusDays(2)))); + for (Class clazz : AFFECTED_TYPES) { + assertThat(ofy().load().type(clazz)).named("entities of type " + clazz).isNotEmpty(); + } + ImmutableList otherStuff = FluentIterable.from(ofy().load()) + .filter(new Predicate() { + @Override + public boolean apply(Object obj) { + return !AFFECTED_TYPES.contains(obj.getClass()); + }}) + .toList(); + assertThat(otherStuff).isNotEmpty(); + runMapreduce(); + for (Class clazz : AFFECTED_TYPES) { + assertThat(ofy().load().type(clazz)).named("entities of type " + clazz).isEmpty(); + } + // Filter out raw Entity objects created by the mapreduce. + assertThat(filter(ofy().load(), not(instanceOf(Entity.class)))) + .containsExactlyElementsIn(otherStuff); } } diff --git a/javatests/google/registry/tools/server/KillAllCrossTldEntitiesActionTest.java b/javatests/google/registry/tools/server/KillAllCrossTldEntitiesActionTest.java deleted file mode 100644 index 86d127e4a..000000000 --- a/javatests/google/registry/tools/server/KillAllCrossTldEntitiesActionTest.java +++ /dev/null @@ -1,82 +0,0 @@ -// 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.tools.server; - -import static com.google.domain.registry.model.EntityClasses.CLASS_TO_KIND_FUNCTION; -import static java.util.Arrays.asList; - -import com.google.common.base.Optional; -import com.google.common.collect.FluentIterable; -import com.google.domain.registry.mapreduce.MapreduceAction; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.model.billing.RegistrarBillingEntry; -import com.google.domain.registry.model.billing.RegistrarCredit; -import com.google.domain.registry.model.billing.RegistrarCreditBalance; -import com.google.domain.registry.model.common.EntityGroupRoot; -import com.google.domain.registry.model.export.LogsExportCursor; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.RegistryCursor; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.model.registry.label.PremiumList.PremiumListEntry; -import com.google.domain.registry.model.registry.label.ReservedList; -import com.google.domain.registry.model.server.ServerSecret; -import com.google.domain.registry.model.smd.SignedMarkRevocationList; -import com.google.domain.registry.model.tmch.ClaimsListShard; -import com.google.domain.registry.model.tmch.ClaimsListShard.ClaimsListSingleton; -import com.google.domain.registry.model.tmch.TmchCrl; -import com.google.domain.registry.testing.FakeResponse; - -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** Tests for {@link KillAllCommitLogsAction}.*/ -@RunWith(JUnit4.class) -public class KillAllCrossTldEntitiesActionTest - extends KillAllActionTestCase { - - public KillAllCrossTldEntitiesActionTest() { - super(FluentIterable - .from(asList( - ClaimsListShard.class, - ClaimsListSingleton.class, - EntityGroupRoot.class, - LogsExportCursor.class, - PremiumList.class, - PremiumListEntry.class, - Registrar.class, - RegistrarBillingEntry.class, - RegistrarContact.class, - RegistrarCredit.class, - RegistrarCreditBalance.class, - Registry.class, - RegistryCursor.class, - ReservedList.class, - ServerSecret.class, - SignedMarkRevocationList.class, - TmchCrl.class)) - .transform(CLASS_TO_KIND_FUNCTION) - .toSet()); - } - - @Override - MapreduceAction createAction() { - action = new KillAllCrossTldEntitiesAction(); - action.mrRunner = new MapreduceRunner(Optional.absent(), Optional.absent()); - action.response = new FakeResponse(); - return action; - } -} diff --git a/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java b/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java index 0b9a3bf22..b21f5ac6d 100644 --- a/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java +++ b/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java @@ -12,62 +12,150 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.model.EntityClasses.CLASS_TO_KIND_FUNCTION; +import static com.google.common.base.Predicates.in; +import static com.google.common.base.Predicates.instanceOf; +import static com.google.common.base.Predicates.not; +import static com.google.common.collect.Multimaps.filterKeys; +import static com.google.common.collect.Sets.difference; +import static com.google.common.truth.Truth.assertThat; +import static google.registry.model.EntityClasses.CLASS_TO_KIND_FUNCTION; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistActiveContact; +import static google.registry.testing.DatastoreHelper.persistActiveDomain; +import static google.registry.testing.DatastoreHelper.persistActiveDomainApplication; +import static google.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static java.util.Arrays.asList; +import com.google.appengine.api.datastore.Entity; import com.google.common.base.Optional; import com.google.common.collect.FluentIterable; -import com.google.domain.registry.mapreduce.MapreduceAction; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.model.billing.BillingEvent; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.domain.DomainBase; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.index.DomainApplicationIndex; -import com.google.domain.registry.model.index.EppResourceIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex; -import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex; -import com.google.domain.registry.model.poll.PollMessage; -import com.google.domain.registry.model.reporting.HistoryEntry; -import com.google.domain.registry.testing.FakeResponse; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Iterables; +import com.googlecode.objectify.Key; + +import google.registry.mapreduce.MapreduceRunner; +import google.registry.model.EppResource; +import google.registry.model.ImmutableObject; +import google.registry.model.billing.BillingEvent; +import google.registry.model.billing.BillingEvent.Reason; +import google.registry.model.contact.ContactResource; +import google.registry.model.domain.DomainBase; +import google.registry.model.host.HostResource; +import google.registry.model.index.DomainApplicationIndex; +import google.registry.model.index.EppResourceIndex; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex; +import google.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex; +import google.registry.model.poll.PollMessage; +import google.registry.model.reporting.HistoryEntry; +import google.registry.testing.FakeResponse; +import google.registry.testing.mapreduce.MapreduceTestCase; + +import org.joda.money.CurrencyUnit; +import org.joda.money.Money; +import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import java.util.Set; + /** Tests for {@link KillAllEppResourcesAction}.*/ @RunWith(JUnit4.class) -public class KillAllEppResourcesActionTest - extends KillAllActionTestCase { +public class KillAllEppResourcesActionTest extends MapreduceTestCase { - public KillAllEppResourcesActionTest() { - super(FluentIterable - .from(asList( - EppResourceIndex.class, - ForeignKeyContactIndex.class, - ForeignKeyDomainIndex.class, - ForeignKeyHostIndex.class, - DomainApplicationIndex.class, - DomainBase.class, - ContactResource.class, - HostResource.class, - HistoryEntry.class, - PollMessage.class, - BillingEvent.OneTime.class, - BillingEvent.Recurring.class, - BillingEvent.Cancellation.class, - BillingEvent.Modification.class)) - .transform(CLASS_TO_KIND_FUNCTION) - .toSet()); - } + static final Set AFFECTED_KINDS = FluentIterable + .from(asList( + EppResourceIndex.class, + ForeignKeyContactIndex.class, + ForeignKeyDomainIndex.class, + ForeignKeyHostIndex.class, + DomainApplicationIndex.class, + DomainBase.class, + ContactResource.class, + HostResource.class, + HistoryEntry.class, + PollMessage.class, + BillingEvent.OneTime.class, + BillingEvent.Recurring.class)) + .transform(CLASS_TO_KIND_FUNCTION) + .toSet(); - @Override - MapreduceAction createAction() { + private void runMapreduce() throws Exception { action = new KillAllEppResourcesAction(); action.mrRunner = new MapreduceRunner(Optional.absent(), Optional.absent()); action.response = new FakeResponse(); - return action; + action.run(); + executeTasksUntilEmpty("mapreduce"); + } + + @Test + public void testKill() throws Exception { + createTld("tld1"); + createTld("tld2"); + for (EppResource resource : asList( + persistActiveDomain("foo.tld1"), + persistActiveDomain("foo.tld2"), + persistActiveDomainApplication("foo.tld1"), + persistActiveDomainApplication("foo.tld2"), + persistActiveContact("foo"), + persistActiveContact("foo"), + persistActiveHost("ns.foo.tld1"), + persistActiveHost("ns.foo.tld2"))) { + HistoryEntry history = new HistoryEntry.Builder().setParent(resource).build(); + for (ImmutableObject descendant : asList( + history, + new PollMessage.OneTime.Builder() + .setParent(history) + .setClientId("") + .setEventTime(START_OF_TIME) + .build(), + new PollMessage.Autorenew.Builder() + .setParent(history) + .setClientId("") + .setEventTime(START_OF_TIME) + .build(), + new BillingEvent.OneTime.Builder() + .setParent(history) + .setBillingTime(START_OF_TIME) + .setEventTime(START_OF_TIME) + .setClientId("") + .setTargetId("") + .setReason(Reason.ERROR) + .setCost(Money.of(CurrencyUnit.USD, 1)) + .build(), + new BillingEvent.Recurring.Builder() + .setParent(history) + .setEventTime(START_OF_TIME) + .setClientId("") + .setTargetId("") + .setReason(Reason.ERROR) + .build())) { + persistResource(descendant); + } + } + ImmutableMultimap beforeContents = getDatastoreContents(); + assertThat(beforeContents.keySet()).containsAllIn(AFFECTED_KINDS); + assertThat(difference(beforeContents.keySet(), AFFECTED_KINDS)).isNotEmpty(); + runMapreduce(); + ofy().clearSessionCache(); + ImmutableMultimap afterContents = getDatastoreContents(); + assertThat(afterContents.keySet()).containsNoneIn(AFFECTED_KINDS); + assertThat(afterContents) + .containsExactlyEntriesIn(filterKeys(beforeContents, not(in(AFFECTED_KINDS)))); + } + + private ImmutableMultimap getDatastoreContents() { + ImmutableMultimap.Builder contentsBuilder = new ImmutableMultimap.Builder<>(); + // Filter out raw Entity objects created by the mapreduce. + for (Object obj : Iterables.filter(ofy().load(), not(instanceOf(Entity.class)))) { + contentsBuilder.put(Key.getKind(obj.getClass()), obj); + } + return contentsBuilder.build(); } } diff --git a/javatests/google/registry/tools/server/ListActionTestCase.java b/javatests/google/registry/tools/server/ListActionTestCase.java index 9387f7c26..f226c5ee7 100644 --- a/javatests/google/registry/tools/server/ListActionTestCase.java +++ b/javatests/google/registry/tools/server/ListActionTestCase.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.truth.Truth.assertThat; import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.base.Optional; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeJsonResponse; + +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeJsonResponse; import org.junit.Rule; diff --git a/javatests/google/registry/tools/server/ListDomainsActionTest.java b/javatests/google/registry/tools/server/ListDomainsActionTest.java index f11f6f28b..f1450a091 100644 --- a/javatests/google/registry/tools/server/ListDomainsActionTest.java +++ b/javatests/google/registry/tools/server/ListDomainsActionTest.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomain; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.persistActiveDomain; import com.google.common.base.Optional; -import com.google.domain.registry.testing.FakeClock; + +import google.registry.testing.FakeClock; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/server/ListHostsActionTest.java b/javatests/google/registry/tools/server/ListHostsActionTest.java index 38512d646..f539cf0e6 100644 --- a/javatests/google/registry/tools/server/ListHostsActionTest.java +++ b/javatests/google/registry/tools/server/ListHostsActionTest.java @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveHost; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistActiveHost; import com.google.common.base.Optional; -import com.google.domain.registry.testing.FakeClock; + +import google.registry.testing.FakeClock; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/server/ListPremiumListsActionTest.java b/javatests/google/registry/tools/server/ListPremiumListsActionTest.java index a209d62c5..fd9fd7526 100644 --- a/javatests/google/registry/tools/server/ListPremiumListsActionTest.java +++ b/javatests/google/registry/tools/server/ListPremiumListsActionTest.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.testing.DatastoreHelper.persistPremiumList; +import static google.registry.testing.DatastoreHelper.persistPremiumList; import com.google.common.base.Optional; -import com.google.domain.registry.model.registry.label.PremiumList; + +import google.registry.model.registry.label.PremiumList; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/server/ListRegistrarsActionTest.java b/javatests/google/registry/tools/server/ListRegistrarsActionTest.java index 51f4e30d6..38df138d1 100644 --- a/javatests/google/registry/tools/server/ListRegistrarsActionTest.java +++ b/javatests/google/registry/tools/server/ListRegistrarsActionTest.java @@ -12,14 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registrar.Registrar; + +import google.registry.model.registrar.Registrar; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/server/ListReservedListsActionTest.java b/javatests/google/registry/tools/server/ListReservedListsActionTest.java index d83e42d71..a26f53cbc 100644 --- a/javatests/google/registry/tools/server/ListReservedListsActionTest.java +++ b/javatests/google/registry/tools/server/ListReservedListsActionTest.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistReservedList; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistReservedList; +import static google.registry.testing.DatastoreHelper.persistResource; import com.google.common.base.Optional; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.label.ReservedList; + +import google.registry.model.registry.Registry; +import google.registry.model.registry.label.ReservedList; import org.junit.Before; import org.junit.Test; diff --git a/javatests/google/registry/tools/server/ListTldsActionTest.java b/javatests/google/registry/tools/server/ListTldsActionTest.java index 420768b1b..052f38e78 100644 --- a/javatests/google/registry/tools/server/ListTldsActionTest.java +++ b/javatests/google/registry/tools/server/ListTldsActionTest.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.createTld; import com.google.common.base.Optional; -import com.google.domain.registry.testing.FakeClock; + +import google.registry.testing.FakeClock; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java b/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java index e9622a17e..6bb40c279 100644 --- a/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java +++ b/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.ofy.ObjectifyService.ofy; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveContact; +import static google.registry.model.ofy.ObjectifyService.ofy; +import static google.registry.testing.DatastoreHelper.persistActiveContact; import com.google.common.base.Optional; -import com.google.domain.registry.mapreduce.MapreduceRunner; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.mapreduce.MapreduceTestCase; + +import google.registry.mapreduce.MapreduceRunner; +import google.registry.model.contact.ContactResource; +import google.registry.testing.FakeResponse; +import google.registry.testing.mapreduce.MapreduceTestCase; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/tools/server/UpdatePremiumListActionTest.java b/javatests/google/registry/tools/server/UpdatePremiumListActionTest.java index 7195574e9..3a15cbcb3 100644 --- a/javatests/google/registry/tools/server/UpdatePremiumListActionTest.java +++ b/javatests/google/registry/tools/server/UpdatePremiumListActionTest.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.tools.server; +package google.registry.tools.server; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.createTlds; import static javax.servlet.http.HttpServletResponse.SC_OK; -import com.google.domain.registry.model.registry.label.PremiumList; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeJsonResponse; +import google.registry.model.registry.label.PremiumList; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeJsonResponse; import org.joda.money.Money; import org.junit.Before; diff --git a/javatests/google/registry/ui/forms/BUILD b/javatests/google/registry/ui/forms/BUILD index ef1492245..2572b529b 100644 --- a/javatests/google/registry/ui/forms/BUILD +++ b/javatests/google/registry/ui/forms/BUILD @@ -1,4 +1,9 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package( + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], +) + +licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -10,11 +15,11 @@ java_library( "//java/com/google/common/base", "//java/com/google/common/collect", "//java/com/google/common/testing", - "//java/com/google/domain/registry/ui/forms", "//third_party/java/hamcrest", "//third_party/java/junit", "//third_party/java/mockito", "//third_party/java/truth", + "//java/google/registry/ui/forms", ], ) diff --git a/javatests/google/registry/ui/forms/FormFieldExceptionTest.java b/javatests/google/registry/ui/forms/FormFieldExceptionTest.java index 0cb54ef6a..c111af06c 100644 --- a/javatests/google/registry/ui/forms/FormFieldExceptionTest.java +++ b/javatests/google/registry/ui/forms/FormFieldExceptionTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.forms; +package google.registry.ui.forms; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/ui/forms/FormFieldTest.java b/javatests/google/registry/ui/forms/FormFieldTest.java index f118a555b..7cef987df 100644 --- a/javatests/google/registry/ui/forms/FormFieldTest.java +++ b/javatests/google/registry/ui/forms/FormFieldTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.forms; +package google.registry.ui.forms; import static com.google.common.collect.Range.atLeast; import static com.google.common.collect.Range.atMost; diff --git a/javatests/google/registry/ui/forms/FormFieldsTest.java b/javatests/google/registry/ui/forms/FormFieldsTest.java index 6fc8db712..7014412fd 100644 --- a/javatests/google/registry/ui/forms/FormFieldsTest.java +++ b/javatests/google/registry/ui/forms/FormFieldsTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.forms; +package google.registry.ui.forms; import static com.google.common.truth.Truth.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/javatests/google/registry/ui/js/BUILD b/javatests/google/registry/ui/js/BUILD index 41283b970..f83632c75 100644 --- a/javatests/google/registry/ui/js/BUILD +++ b/javatests/google/registry/ui/js/BUILD @@ -1,4 +1,9 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package( + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], +) + +licenses(["notice"]) # Apache 2.0 load("//third_party/closure/compiler:closure_js_library.bzl", "closure_js_library") load("//third_party/closure/testing:closure_js_test.bzl", "closure_js_test") @@ -17,7 +22,7 @@ closure_js_test( srcs = glob(["*_test.js"]), deps = [ ":testing", - "//java/com/google/domain/registry/ui/js", "//javascript/closure", + "//java/google/registry/ui/js", ], ) diff --git a/javatests/google/registry/ui/js/registrar/BUILD b/javatests/google/registry/ui/js/registrar/BUILD index 3ad6a6c71..68eadc6f6 100644 --- a/javatests/google/registry/ui/js/registrar/BUILD +++ b/javatests/google/registry/ui/js/registrar/BUILD @@ -1,4 +1,9 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package( + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], +) + +licenses(["notice"]) # Apache 2.0 load("//third_party/closure/compiler:closure_js_library.bzl", "closure_js_library") load("//third_party/closure/testing:closure_js_test.bzl", "closure_js_test") @@ -8,9 +13,9 @@ closure_js_library( name = "console_test_util", srcs = ["console_test_util.js"], deps = [ - "//java/com/google/domain/registry/ui/js", - "//java/com/google/domain/registry/ui/js/registrar", "//javascript/closure", + "//java/google/registry/ui/js", + "//java/google/registry/ui/js/registrar", ], ) @@ -21,10 +26,10 @@ closure_js_test( srcs = glob(["*_test.js"]), deps = [ ":console_test_util", - "//java/com/google/domain/registry/ui/js", - "//java/com/google/domain/registry/ui/js/registrar", - "//java/com/google/domain/registry/ui/soy/registrar:Console", "//javascript/closure", - "//javatests/com/google/domain/registry/ui/js:testing", + "//java/google/registry/ui/js", + "//java/google/registry/ui/js/registrar", + "//java/google/registry/ui/soy/registrar:Console", + "//javatests/google/registry/ui/js:testing", ], ) diff --git a/javatests/google/registry/ui/server/BUILD b/javatests/google/registry/ui/server/BUILD index 3c1989b96..435694495 100644 --- a/javatests/google/registry/ui/server/BUILD +++ b/javatests/google/registry/ui/server/BUILD @@ -1,4 +1,9 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package( + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], +) + +licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -7,12 +12,12 @@ java_library( name = "server", srcs = glob(["*.java"]), deps = [ - "//java/com/google/domain/registry/ui/forms", - "//java/com/google/domain/registry/ui/server", - "//javatests/com/google/domain/registry/testing", "//third_party/java/hamcrest", "//third_party/java/junit", "//third_party/java/truth", + "//java/google/registry/ui/forms", + "//java/google/registry/ui/server", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/ui/server/RegistrarFormFieldsTest.java b/javatests/google/registry/ui/server/RegistrarFormFieldsTest.java index ebc8c0040..7a774ccc9 100644 --- a/javatests/google/registry/ui/server/RegistrarFormFieldsTest.java +++ b/javatests/google/registry/ui/server/RegistrarFormFieldsTest.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server; +package google.registry.ui.server; import static com.google.common.truth.Truth.assertThat; import static org.hamcrest.Matchers.equalTo; -import com.google.domain.registry.testing.CertificateSamples; -import com.google.domain.registry.ui.forms.FormFieldException; +import google.registry.testing.CertificateSamples; +import google.registry.ui.forms.FormFieldException; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/ui/server/api/BUILD b/javatests/google/registry/ui/server/api/BUILD index 530055f1c..80eddd528 100644 --- a/javatests/google/registry/ui/server/api/BUILD +++ b/javatests/google/registry/ui/server/api/BUILD @@ -1,4 +1,9 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package( + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], +) + +licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -8,15 +13,15 @@ java_library( srcs = glob(["*.java"]), deps = [ "//java/com/google/common/collect", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/ui/server/api", - "//javatests/com/google/domain/registry/testing", "//third_party/java/appengine:appengine-api-testonly", "//third_party/java/json_simple", "//third_party/java/junit", "//third_party/java/mockito", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/model", + "//java/google/registry/ui/server/api", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/ui/server/api/CheckApiServletTest.java b/javatests/google/registry/ui/server/api/CheckApiServletTest.java index a0463c58e..09ae9fc42 100644 --- a/javatests/google/registry/ui/server/api/CheckApiServletTest.java +++ b/javatests/google/registry/ui/server/api/CheckApiServletTest.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.api; +package google.registry.ui.server.api; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistActiveDomain; -import static com.google.domain.registry.testing.DatastoreHelper.persistReservedList; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistActiveDomain; +import static google.registry.testing.DatastoreHelper.persistReservedList; +import static google.registry.testing.DatastoreHelper.persistResource; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.testing.AppEngineRule; + +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; +import google.registry.testing.AppEngineRule; import org.json.simple.JSONValue; import org.junit.Before; diff --git a/javatests/google/registry/ui/server/registrar/BUILD b/javatests/google/registry/ui/server/registrar/BUILD index a6eff5f47..8cef6379c 100644 --- a/javatests/google/registry/ui/server/registrar/BUILD +++ b/javatests/google/registry/ui/server/registrar/BUILD @@ -1,4 +1,9 @@ -package(default_visibility = ["//java/com/google/domain/registry:registry_project"]) +package( + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], +) + +licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -13,16 +18,6 @@ java_library( "//java/com/google/common/io", "//java/com/google/common/net", "//java/com/google/common/testing", - "//java/com/google/domain/registry/braintree", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/export/sheet", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/security", - "//java/com/google/domain/registry/ui/server/registrar", - "//java/com/google/domain/registry/ui/soy/registrar:soy_java_wrappers", - "//java/com/google/domain/registry/util", - "//javatests/com/google/domain/registry/security", - "//javatests/com/google/domain/registry/testing", "//third_party/java/appengine:appengine-api-testonly", "//third_party/java/braintree", "//third_party/java/joda_money", @@ -33,6 +28,16 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/braintree", + "//java/google/registry/config", + "//java/google/registry/export/sheet", + "//java/google/registry/model", + "//java/google/registry/security", + "//java/google/registry/ui/server/registrar", + "//java/google/registry/ui/soy/registrar:soy_java_wrappers", + "//java/google/registry/util", + "//javatests/google/registry/security", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java b/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java index 1d1990fae..7afcceb0a 100644 --- a/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java +++ b/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.any; @@ -20,9 +20,10 @@ import static org.mockito.Mockito.when; import com.google.appengine.api.users.UserServiceFactory; import com.google.common.net.MediaType; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.UserInfo; + +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeResponse; +import google.registry.testing.UserInfo; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java b/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java index 635a843c9..8c8070515 100644 --- a/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java +++ b/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.security.JsonHttpTestUtils.createJsonPayload; +import static google.registry.security.JsonHttpTestUtils.createJsonPayload; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.DatastoreHelper; + +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.testing.AppEngineRule; +import google.registry.testing.DatastoreHelper; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/ui/server/registrar/RegistrarPaymentActionTest.java b/javatests/google/registry/ui/server/registrar/RegistrarPaymentActionTest.java index bdd132dd4..91aeee716 100644 --- a/javatests/google/registry/ui/server/registrar/RegistrarPaymentActionTest.java +++ b/javatests/google/registry/ui/server/registrar/RegistrarPaymentActionTest.java @@ -12,18 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.ReflectiveFieldExtractor.extractField; +import static google.registry.testing.ReflectiveFieldExtractor.extractField; import static java.util.Arrays.asList; import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.AppEngineRule; import com.braintreegateway.BraintreeGateway; import com.braintreegateway.Result; @@ -35,6 +33,9 @@ import com.braintreegateway.ValidationError; import com.braintreegateway.ValidationErrorCode; import com.braintreegateway.ValidationErrors; +import google.registry.model.registrar.Registrar; +import google.registry.testing.AppEngineRule; + import org.joda.money.CurrencyUnit; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java b/javatests/google/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java index 86dc1b27b..a818065bf 100644 --- a/javatests/google/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java +++ b/javatests/google/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.truth.Truth.assertThat; import static java.util.Arrays.asList; @@ -21,13 +21,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.braintree.BraintreeRegistrarSyncer; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.AppEngineRule; import com.braintreegateway.BraintreeGateway; import com.braintreegateway.ClientTokenGateway; +import google.registry.braintree.BraintreeRegistrarSyncer; +import google.registry.model.registrar.Registrar; +import google.registry.testing.AppEngineRule; + import org.joda.money.CurrencyUnit; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/ui/server/registrar/RegistrarServletTest.java b/javatests/google/registry/ui/server/registrar/RegistrarServletTest.java index 23e18930c..aea5f08e1 100644 --- a/javatests/google/registry/ui/server/registrar/RegistrarServletTest.java +++ b/javatests/google/registry/ui/server/registrar/RegistrarServletTest.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.security.JsonHttpTestUtils.createJsonPayload; -import static com.google.domain.registry.testing.TaskQueueHelper.assertNoTasksEnqueued; -import static com.google.domain.registry.testing.TaskQueueHelper.assertTasksEnqueued; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.security.JsonHttpTestUtils.createJsonPayload; +import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued; +import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; +import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.util.Arrays.asList; import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.mockito.Matchers.eq; @@ -26,9 +26,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.export.sheet.SyncRegistrarsSheetAction; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.TaskQueueHelper.TaskMatcher; + +import google.registry.export.sheet.SyncRegistrarsSheetAction; +import google.registry.model.registrar.Registrar; +import google.registry.testing.TaskQueueHelper.TaskMatcher; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/ui/server/registrar/RegistrarServletTestCase.java b/javatests/google/registry/ui/server/registrar/RegistrarServletTestCase.java index b5f5b60d6..560c27f00 100644 --- a/javatests/google/registry/ui/server/registrar/RegistrarServletTestCase.java +++ b/javatests/google/registry/ui/server/registrar/RegistrarServletTestCase.java @@ -12,25 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; -import static com.google.domain.registry.security.JsonHttpTestUtils.createJsonPayload; -import static com.google.domain.registry.security.JsonHttpTestUtils.createJsonResponseSupplier; -import static com.google.domain.registry.security.XsrfTokenManager.generateToken; +import static google.registry.security.JsonHttpTestUtils.createJsonPayload; +import static google.registry.security.JsonHttpTestUtils.createJsonResponseSupplier; +import static google.registry.security.XsrfTokenManager.generateToken; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; import com.google.appengine.api.modules.ModulesService; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.export.sheet.SyncRegistrarsSheetAction; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.InjectRule; -import com.google.domain.registry.util.SendEmailService; -import com.google.domain.registry.util.SendEmailUtils; + +import google.registry.export.sheet.SyncRegistrarsSheetAction; +import google.registry.model.ofy.Ofy; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.InjectRule; +import google.registry.util.SendEmailService; +import google.registry.util.SendEmailUtils; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java b/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java index 708ef3f11..9c2e37328 100644 --- a/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java +++ b/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.security.JsonHttpTestUtils.createJsonPayload; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT2; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT2_HASH; -import static com.google.domain.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.security.JsonHttpTestUtils.createJsonPayload; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT2; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT2_HASH; +import static google.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.START_OF_TIME; import static java.util.Arrays.asList; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.config.RegistryEnvironment; -import com.google.domain.registry.model.registrar.Registrar; + +import google.registry.config.RegistryEnvironment; +import google.registry.model.registrar.Registrar; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java b/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java index 77e30109b..be520debc 100644 --- a/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java +++ b/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.AppEngineRule.THE_REGISTRAR_GAE_USER_ID; +import static google.registry.testing.AppEngineRule.THE_REGISTRAR_GAE_USER_ID; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -25,11 +25,12 @@ import static org.mockito.Mockito.when; import com.google.appengine.api.users.User; import com.google.appengine.api.users.UserService; import com.google.common.testing.NullPointerTester; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarContact; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.InjectRule; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java b/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java index d8b5b3606..643545e7e 100644 --- a/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java +++ b/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.ui.server.registrar; +package google.registry.ui.server.registrar; import static com.google.common.base.Strings.repeat; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.security.JsonHttpTestUtils.createJsonPayload; +import static google.registry.security.JsonHttpTestUtils.createJsonPayload; import static java.util.Arrays.asList; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarAddress; + +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarAddress; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/google/registry/util/BUILD b/javatests/google/registry/util/BUILD index 62034ac7d..c3d1f1b9e 100644 --- a/javatests/google/registry/util/BUILD +++ b/javatests/google/registry/util/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -15,14 +18,14 @@ java_library( "//java/com/google/common/net", "//java/com/google/common/testing", "//java/com/google/common/util/concurrent", - "//java/com/google/domain/registry/util", - "//javatests/com/google/domain/registry/testing", "//third_party/java/appengine:appengine-api", "//third_party/java/joda_time", "//third_party/java/jsr305_annotations", "//third_party/java/junit", "//third_party/java/mockito", "//third_party/java/truth", + "//java/google/registry/util", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/util/CidrAddressBlockTest.java b/javatests/google/registry/util/CidrAddressBlockTest.java index c22042a34..b51fe5cc2 100644 --- a/javatests/google/registry/util/CidrAddressBlockTest.java +++ b/javatests/google/registry/util/CidrAddressBlockTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import com.google.common.collect.ImmutableMap; import com.google.common.net.InetAddresses; diff --git a/javatests/google/registry/util/CollectionUtilsTest.java b/javatests/google/registry/util/CollectionUtilsTest.java index 659d94253..7dc5a1b5e 100644 --- a/javatests/google/registry/util/CollectionUtilsTest.java +++ b/javatests/google/registry/util/CollectionUtilsTest.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.util.CollectionUtils.nullToEmpty; -import static com.google.domain.registry.util.CollectionUtils.partitionMap; +import static google.registry.util.CollectionUtils.nullToEmpty; +import static google.registry.util.CollectionUtils.partitionMap; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/util/ConcurrentTest.java b/javatests/google/registry/util/ConcurrentTest.java index 1c2ee47ce..cde36ef83 100644 --- a/javatests/google/registry/util/ConcurrentTest.java +++ b/javatests/google/registry/util/ConcurrentTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; @@ -22,7 +22,8 @@ import com.google.common.base.Functions; import com.google.common.collect.ImmutableList; import com.google.common.testing.NullPointerTester; import com.google.common.util.concurrent.UncheckedExecutionException; -import com.google.domain.registry.testing.AppEngineRule; + +import google.registry.testing.AppEngineRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/util/DateTimeUtilsTest.java b/javatests/google/registry/util/DateTimeUtilsTest.java index bc03d455b..25c6892df 100644 --- a/javatests/google/registry/util/DateTimeUtilsTest.java +++ b/javatests/google/registry/util/DateTimeUtilsTest.java @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME; -import static com.google.domain.registry.util.DateTimeUtils.earliestOf; -import static com.google.domain.registry.util.DateTimeUtils.isAtOrAfter; -import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt; -import static com.google.domain.registry.util.DateTimeUtils.latestOf; -import static com.google.domain.registry.util.DateTimeUtils.leapSafeAddYears; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.util.DateTimeUtils.START_OF_TIME; +import static google.registry.util.DateTimeUtils.earliestOf; +import static google.registry.util.DateTimeUtils.isAtOrAfter; +import static google.registry.util.DateTimeUtils.isBeforeOrAt; +import static google.registry.util.DateTimeUtils.latestOf; +import static google.registry.util.DateTimeUtils.leapSafeAddYears; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.testing.ExceptionRule; import org.joda.time.DateTime; import org.junit.Rule; diff --git a/javatests/google/registry/util/DiffUtilsTest.java b/javatests/google/registry/util/DiffUtilsTest.java index 5b6f05a5b..d113205b8 100644 --- a/javatests/google/registry/util/DiffUtilsTest.java +++ b/javatests/google/registry/util/DiffUtilsTest.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.util.DiffUtils.prettyPrintSetDiff; +import static google.registry.util.DiffUtils.prettyPrintSetDiff; import com.google.common.collect.ImmutableSet; diff --git a/javatests/google/registry/util/DomainNameUtilsTest.java b/javatests/google/registry/util/DomainNameUtilsTest.java index 60514042a..61b4293c6 100644 --- a/javatests/google/registry/util/DomainNameUtilsTest.java +++ b/javatests/google/registry/util/DomainNameUtilsTest.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName; +import static google.registry.util.DomainNameUtils.canonicalizeDomainName; -import com.google.domain.registry.testing.ExceptionRule; +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/util/HexDumperTest.java b/javatests/google/registry/util/HexDumperTest.java index 70254d400..4b9566f5c 100644 --- a/javatests/google/registry/util/HexDumperTest.java +++ b/javatests/google/registry/util/HexDumperTest.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.truth.Truth.assertThat; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.domain.registry.testing.ExceptionRule; +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/util/PathargMatcherTest.java b/javatests/google/registry/util/PathargMatcherTest.java index e54da34c6..64d41bea2 100644 --- a/javatests/google/registry/util/PathargMatcherTest.java +++ b/javatests/google/registry/util/PathargMatcherTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/util/PosixTarHeaderSystemTest.java b/javatests/google/registry/util/PosixTarHeaderSystemTest.java index ca1187293..6e581b104 100644 --- a/javatests/google/registry/util/PosixTarHeaderSystemTest.java +++ b/javatests/google/registry/util/PosixTarHeaderSystemTest.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static com.google.domain.registry.testing.SystemInfo.hasCommand; +import static google.registry.testing.SystemInfo.hasCommand; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assume.assumeTrue; diff --git a/javatests/google/registry/util/PosixTarHeaderTest.java b/javatests/google/registry/util/PosixTarHeaderTest.java index 75377a0f3..92b820b85 100644 --- a/javatests/google/registry/util/PosixTarHeaderTest.java +++ b/javatests/google/registry/util/PosixTarHeaderTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.io.BaseEncoding.base64; import static com.google.common.truth.Truth.assertThat; @@ -20,7 +20,8 @@ import static com.google.common.truth.Truth.assertWithMessage; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.testing.EqualsTester; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.testing.ExceptionRule; import org.joda.time.DateTime; import org.joda.time.format.ISODateTimeFormat; diff --git a/javatests/google/registry/util/RetrierTest.java b/javatests/google/registry/util/RetrierTest.java index 82fe1116e..e0bf2b011 100644 --- a/javatests/google/registry/util/RetrierTest.java +++ b/javatests/google/registry/util/RetrierTest.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeSleeper; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeSleeper; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/util/SendEmailUtilsTest.java b/javatests/google/registry/util/SendEmailUtilsTest.java index 4b9ee5c84..643f2b1aa 100644 --- a/javatests/google/registry/util/SendEmailUtilsTest.java +++ b/javatests/google/registry/util/SendEmailUtilsTest.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.util.SendEmailUtils.sendEmail; +import static google.registry.util.SendEmailUtils.sendEmail; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; @@ -23,8 +23,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.testing.ExceptionRule; +import google.registry.testing.InjectRule; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/util/SerializeUtilsTest.java b/javatests/google/registry/util/SerializeUtilsTest.java index 434110a08..9c245fd56 100644 --- a/javatests/google/registry/util/SerializeUtilsTest.java +++ b/javatests/google/registry/util/SerializeUtilsTest.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.util.SerializeUtils.deserialize; -import static com.google.domain.registry.util.SerializeUtils.serialize; +import static google.registry.util.SerializeUtils.deserialize; +import static google.registry.util.SerializeUtils.serialize; -import com.google.domain.registry.testing.ExceptionRule; +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/util/SqlTemplateTest.java b/javatests/google/registry/util/SqlTemplateTest.java index 78d76eb0e..da9bb6595 100644 --- a/javatests/google/registry/util/SqlTemplateTest.java +++ b/javatests/google/registry/util/SqlTemplateTest.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.truth.Truth.assertThat; -import com.google.domain.registry.testing.ExceptionRule; +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/util/TaskEnqueuerTest.java b/javatests/google/registry/util/TaskEnqueuerTest.java index 9130084f5..d9117d836 100644 --- a/javatests/google/registry/util/TaskEnqueuerTest.java +++ b/javatests/google/registry/util/TaskEnqueuerTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; import static com.google.common.truth.Truth.assertThat; @@ -26,10 +26,11 @@ import com.google.appengine.api.taskqueue.TaskHandle; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TransientFailureException; import com.google.common.collect.ImmutableList; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeSleeper; + +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeSleeper; import org.joda.time.DateTime; import org.junit.Rule; diff --git a/javatests/google/registry/util/TeeOutputStreamTest.java b/javatests/google/registry/util/TeeOutputStreamTest.java index d5684b1ed..0759e4700 100644 --- a/javatests/google/registry/util/TeeOutputStreamTest.java +++ b/javatests/google/registry/util/TeeOutputStreamTest.java @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.truth.Truth.assertThat; import static java.util.Arrays.asList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.testing.ExceptionRule; + +import google.registry.testing.ExceptionRule; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/util/UrlFetchUtilsTest.java b/javatests/google/registry/util/UrlFetchUtilsTest.java index d052468f4..2c48cdf96 100644 --- a/javatests/google/registry/util/UrlFetchUtilsTest.java +++ b/javatests/google/registry/util/UrlFetchUtilsTest.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.util; +package google.registry.util; import static com.google.common.net.HttpHeaders.CONTENT_LENGTH; import static com.google.common.net.HttpHeaders.CONTENT_TYPE; import static com.google.common.net.MediaType.CSV_UTF_8; -import static com.google.domain.registry.util.UrlFetchUtils.setPayloadMultipart; +import static google.registry.util.UrlFetchUtils.setPayloadMultipart; import static java.nio.charset.StandardCharsets.UTF_8; import static org.mockito.Matchers.any; import static org.mockito.Matchers.argThat; @@ -28,8 +28,9 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import com.google.appengine.api.urlfetch.HTTPHeader; import com.google.appengine.api.urlfetch.HTTPRequest; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.InjectRule; + +import google.registry.testing.AppEngineRule; +import google.registry.testing.InjectRule; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/whois/BUILD b/javatests/google/registry/whois/BUILD index 1eea990bc..3c6c6722e 100644 --- a/javatests/google/registry/whois/BUILD +++ b/javatests/google/registry/whois/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -14,12 +17,6 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", - "//java/com/google/domain/registry/config", - "//java/com/google/domain/registry/model", - "//java/com/google/domain/registry/request", - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/whois", - "//javatests/com/google/domain/registry/testing", "//third_party/java/appengine:appengine-testing", "//third_party/java/dagger", "//third_party/java/joda_time", @@ -28,6 +25,12 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", + "//java/google/registry/config", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/util", + "//java/google/registry/whois", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/whois/DomainWhoisResponseTest.java b/javatests/google/registry/whois/DomainWhoisResponseTest.java index 7d77a2017..97d255a69 100644 --- a/javatests/google/registry/whois/DomainWhoisResponseTest.java +++ b/javatests/google/registry/whois/DomainWhoisResponseTest.java @@ -12,34 +12,35 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME; -import static com.google.domain.registry.whois.WhoisHelper.loadWhoisTestFile; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.util.DateTimeUtils.END_OF_TIME; +import static google.registry.whois.WhoisHelper.loadWhoisTestFile; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.contact.ContactAddress; -import com.google.domain.registry.model.contact.ContactPhoneNumber; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.contact.PostalInfo; -import com.google.domain.registry.model.domain.DesignatedContact; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.domain.GracePeriod; -import com.google.domain.registry.model.domain.ReferenceUnion; -import com.google.domain.registry.model.domain.rgp.GracePeriodStatus; -import com.google.domain.registry.model.domain.secdns.DelegationSignerData; -import com.google.domain.registry.model.eppcommon.StatusValue; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; import com.googlecode.objectify.Ref; +import google.registry.model.contact.ContactAddress; +import google.registry.model.contact.ContactPhoneNumber; +import google.registry.model.contact.ContactResource; +import google.registry.model.contact.PostalInfo; +import google.registry.model.domain.DesignatedContact; +import google.registry.model.domain.DomainResource; +import google.registry.model.domain.GracePeriod; +import google.registry.model.domain.ReferenceUnion; +import google.registry.model.domain.rgp.GracePeriodStatus; +import google.registry.model.domain.secdns.DelegationSignerData; +import google.registry.model.eppcommon.StatusValue; +import google.registry.model.host.HostResource; +import google.registry.model.registrar.Registrar; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; + import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/whois/NameserverWhoisResponseTest.java b/javatests/google/registry/whois/NameserverWhoisResponseTest.java index bedd6ccc2..b79f7ebc8 100644 --- a/javatests/google/registry/whois/NameserverWhoisResponseTest.java +++ b/javatests/google/registry/whois/NameserverWhoisResponseTest.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.whois.WhoisHelper.loadWhoisTestFile; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.whois.WhoisHelper.loadWhoisTestFile; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; -import com.google.domain.registry.model.host.HostResource; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; + +import google.registry.model.host.HostResource; +import google.registry.model.registrar.Registrar; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/whois/RegistrarWhoisResponseTest.java b/javatests/google/registry/whois/RegistrarWhoisResponseTest.java index 30246d8d3..4c75c19f0 100644 --- a/javatests/google/registry/whois/RegistrarWhoisResponseTest.java +++ b/javatests/google/registry/whois/RegistrarWhoisResponseTest.java @@ -12,20 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources; -import static com.google.domain.registry.whois.WhoisHelper.loadWhoisTestFile; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources; +import static google.registry.whois.WhoisHelper.loadWhoisTestFile; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registrar.RegistrarAddress; -import com.google.domain.registry.model.registrar.RegistrarContact; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; + +import google.registry.model.registrar.Registrar; +import google.registry.model.registrar.RegistrarAddress; +import google.registry.model.registrar.RegistrarContact; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; import org.joda.time.DateTime; import org.junit.Rule; diff --git a/javatests/google/registry/whois/WhoisHelper.java b/javatests/google/registry/whois/WhoisHelper.java index b1216cc85..65d6c431d 100644 --- a/javatests/google/registry/whois/WhoisHelper.java +++ b/javatests/google/registry/whois/WhoisHelper.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.util.ResourceUtils.readResourceUtf8; /** Test helper methods for the whois package. */ final class WhoisHelper { diff --git a/javatests/google/registry/whois/WhoisHttpServerTest.java b/javatests/google/registry/whois/WhoisHttpServerTest.java index 02d747546..9c1cf2e28 100644 --- a/javatests/google/registry/whois/WhoisHttpServerTest.java +++ b/javatests/google/registry/whois/WhoisHttpServerTest.java @@ -12,28 +12,28 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeContactResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeHostResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; -import static com.google.domain.registry.whois.WhoisHelper.loadWhoisTestFile; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources; +import static google.registry.testing.FullFieldsTestEntityHelper.makeContactResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeHostResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; +import static google.registry.whois.WhoisHelper.loadWhoisTestFile; -import com.google.domain.registry.model.contact.ContactResource; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.InjectRule; +import google.registry.model.contact.ContactResource; +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.InjectRule; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/javatests/google/registry/whois/WhoisInjectionTest.java b/javatests/google/registry/whois/WhoisInjectionTest.java index b7dff16ba..13ae2a502 100644 --- a/javatests/google/registry/whois/WhoisInjectionTest.java +++ b/javatests/google/registry/whois/WhoisInjectionTest.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTld; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeHostResource; +import static google.registry.testing.DatastoreHelper.createTld; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeHostResource; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.google.domain.registry.request.RequestModule; -import com.google.domain.registry.testing.AppEngineRule; +import google.registry.request.RequestModule; +import google.registry.testing.AppEngineRule; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/whois/WhoisReaderTest.java b/javatests/google/registry/whois/WhoisReaderTest.java index 3098c1789..404627c2a 100644 --- a/javatests/google/registry/whois/WhoisReaderTest.java +++ b/javatests/google/registry/whois/WhoisReaderTest.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.createTlds; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.testing.FakeClock; +import google.registry.testing.AppEngineRule; +import google.registry.testing.ExceptionRule; +import google.registry.testing.FakeClock; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/whois/WhoisServerTest.java b/javatests/google/registry/whois/WhoisServerTest.java index bd7030a6a..aa075ca21 100644 --- a/javatests/google/registry/whois/WhoisServerTest.java +++ b/javatests/google/registry/whois/WhoisServerTest.java @@ -12,31 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; +package google.registry.whois; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.model.registrar.Registrar.State.ACTIVE; -import static com.google.domain.registry.model.registrar.Registrar.Type.PDT; -import static com.google.domain.registry.testing.DatastoreHelper.createTlds; -import static com.google.domain.registry.testing.DatastoreHelper.persistResource; -import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeContactResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeHostResource; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; -import static com.google.domain.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; -import static com.google.domain.registry.whois.WhoisHelper.loadWhoisTestFile; +import static google.registry.model.registrar.Registrar.State.ACTIVE; +import static google.registry.model.registrar.Registrar.Type.PDT; +import static google.registry.testing.DatastoreHelper.createTlds; +import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources; +import static google.registry.testing.FullFieldsTestEntityHelper.makeContactResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeHostResource; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; +import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts; +import static google.registry.whois.WhoisHelper.loadWhoisTestFile; import static org.junit.Assert.fail; -import com.google.domain.registry.model.domain.DomainResource; -import com.google.domain.registry.model.ofy.Ofy; -import com.google.domain.registry.model.registrar.Registrar; -import com.google.domain.registry.model.registry.Registry; -import com.google.domain.registry.model.registry.Registry.RegistryNotFoundException; -import com.google.domain.registry.testing.AppEngineRule; -import com.google.domain.registry.testing.FakeClock; -import com.google.domain.registry.testing.FakeResponse; -import com.google.domain.registry.testing.InjectRule; +import google.registry.model.domain.DomainResource; +import google.registry.model.ofy.Ofy; +import google.registry.model.registrar.Registrar; +import google.registry.model.registry.Registry; +import google.registry.model.registry.Registry.RegistryNotFoundException; +import google.registry.testing.AppEngineRule; +import google.registry.testing.FakeClock; +import google.registry.testing.FakeResponse; +import google.registry.testing.InjectRule; import org.joda.time.DateTime; import org.junit.Before; diff --git a/javatests/google/registry/whois/WhoisTestComponent.java b/javatests/google/registry/whois/WhoisTestComponent.java index a3cf661e8..60704a1c6 100644 --- a/javatests/google/registry/whois/WhoisTestComponent.java +++ b/javatests/google/registry/whois/WhoisTestComponent.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.whois; - -import com.google.domain.registry.config.ConfigModule; -import com.google.domain.registry.request.RequestModule; -import com.google.domain.registry.util.SystemClock.SystemClockModule; +package google.registry.whois; import dagger.Component; +import google.registry.config.ConfigModule; +import google.registry.request.RequestModule; +import google.registry.util.SystemClock.SystemClockModule; + import javax.inject.Singleton; @Singleton diff --git a/javatests/google/registry/xjc/BUILD b/javatests/google/registry/xjc/BUILD index e2b7c9190..dd46d1225 100644 --- a/javatests/google/registry/xjc/BUILD +++ b/javatests/google/registry/xjc/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -10,13 +13,13 @@ java_library( srcs = glob(["*.java"]), resources = glob(["testdata/*.xml"]), deps = [ - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/xjc", - "//javatests/com/google/domain/registry/testing", "//third_party/java/hamcrest", "//third_party/java/jsr305_annotations", "//third_party/java/junit", "//third_party/java/truth", + "//java/google/registry/util", + "//java/google/registry/xjc", + "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/xjc/XjcObjectTest.java b/javatests/google/registry/xjc/XjcObjectTest.java index 367162ca7..4e1d48d99 100644 --- a/javatests/google/registry/xjc/XjcObjectTest.java +++ b/javatests/google/registry/xjc/XjcObjectTest.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.xjc; +package google.registry.xjc; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; -import static com.google.domain.registry.xjc.XjcXmlTransformer.unmarshal; +import static google.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.xjc.XjcXmlTransformer.unmarshal; import static java.nio.charset.StandardCharsets.UTF_16; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.domain.registry.testing.ExceptionRule; -import com.google.domain.registry.xjc.rde.XjcRdeDeposit; -import com.google.domain.registry.xjc.rde.XjcRdeDepositTypeType; -import com.google.domain.registry.xjc.rdecontact.XjcRdeContact; +import google.registry.testing.ExceptionRule; +import google.registry.xjc.rde.XjcRdeDeposit; +import google.registry.xjc.rde.XjcRdeDepositTypeType; +import google.registry.xjc.rdecontact.XjcRdeContact; import org.junit.Rule; import org.junit.Test; diff --git a/javatests/google/registry/xjc/XmlTestdataTest.java b/javatests/google/registry/xjc/XmlTestdataTest.java index d612f7fc6..8802fa901 100644 --- a/javatests/google/registry/xjc/XmlTestdataTest.java +++ b/javatests/google/registry/xjc/XmlTestdataTest.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.xjc; +package google.registry.xjc; import static com.google.common.truth.Truth.assertThat; -import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8; -import static com.google.domain.registry.xjc.XjcXmlTransformer.unmarshal; +import static google.registry.util.ResourceUtils.readResourceUtf8; +import static google.registry.xjc.XjcXmlTransformer.unmarshal; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.domain.registry.xjc.epp.XjcEpp; -import com.google.domain.registry.xjc.rde.XjcRdeDeposit; +import google.registry.xjc.epp.XjcEpp; +import google.registry.xjc.rde.XjcRdeDeposit; import org.junit.Rule; import org.junit.experimental.theories.DataPoints; diff --git a/javatests/google/registry/xml/BUILD b/javatests/google/registry/xml/BUILD index 7a8769cb1..670a89d68 100644 --- a/javatests/google/registry/xml/BUILD +++ b/javatests/google/registry/xml/BUILD @@ -1,7 +1,10 @@ package( - default_visibility = ["//java/com/google/domain/registry:registry_project"], + default_testonly = 1, + default_visibility = ["//java/google/registry:registry_project"], ) +licenses(["notice"]) # Apache 2.0 + load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") @@ -12,13 +15,13 @@ java_library( "//java/com/google/common/base", "//java/com/google/common/collect", "//java/com/google/common/net", - "//java/com/google/domain/registry/util", - "//java/com/google/domain/registry/xml", "//third_party/java/joda_time", "//third_party/java/json", "//third_party/java/jsr305_annotations", "//third_party/java/junit", "//third_party/java/truth", + "//java/google/registry/util", + "//java/google/registry/xml", ], ) diff --git a/javatests/google/registry/xml/DateAdapterTest.java b/javatests/google/registry/xml/DateAdapterTest.java index c7db4dcdd..c481ff596 100644 --- a/javatests/google/registry/xml/DateAdapterTest.java +++ b/javatests/google/registry/xml/DateAdapterTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.xml; +package google.registry.xml; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/google/registry/xml/UtcDateTimeAdapterTest.java b/javatests/google/registry/xml/UtcDateTimeAdapterTest.java index 9a1613f0f..ad894a602 100644 --- a/javatests/google/registry/xml/UtcDateTimeAdapterTest.java +++ b/javatests/google/registry/xml/UtcDateTimeAdapterTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.xml; +package google.registry.xml; import static com.google.common.truth.Truth.assertThat; import static org.joda.time.DateTimeZone.UTC; diff --git a/javatests/google/registry/xml/XmlTestUtils.java b/javatests/google/registry/xml/XmlTestUtils.java index 9d1915c6f..0aa008c6f 100644 --- a/javatests/google/registry/xml/XmlTestUtils.java +++ b/javatests/google/registry/xml/XmlTestUtils.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.domain.registry.xml; +package google.registry.xml; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assert_; -import static com.google.domain.registry.util.DiffUtils.prettyPrintDeepDiff; +import static google.registry.util.DiffUtils.prettyPrintDeepDiff; import static org.joda.time.DateTimeZone.UTC; import com.google.common.collect.ImmutableSet; diff --git a/scripts/setup_eclipse.py b/scripts/setup_eclipse.py index 7f0ed8819..1383682c0 100644 --- a/scripts/setup_eclipse.py +++ b/scripts/setup_eclipse.py @@ -1,5 +1,5 @@ #!/usr/bin/python - +# # Copyright 2016 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -103,7 +103,7 @@ def build_classpath(): {"kind": "src", "path": "bazel-genfiles/java"}, { "kind": "lib", - "path": ("%s/java/com/google/domain/" + "path": ("%s/java/google/" "registry/eclipse/eclipse_deps.jar" % bazel_genfiles) }, {"kind": "output", "path": "bin"}, @@ -202,7 +202,7 @@ def build_factorypath(): bazel_bin = bazel_info("bazel-bin") annotations_jar = os.path.join( bazel_bin, - "java/com/google/domain/registry/eclipse" + "java/google/registry/eclipse" "/annotation_processors_ide_deploy.jar", ) factorypath_entries = [ @@ -232,21 +232,21 @@ def build_dependencies(): subprocess.check_call([ "bazel", "build", - "//java/com/google/domain/registry/...", - "//javatests/com/google/domain/registry/..."]) + "//java/google/registry/...", + "//javatests/google/registry/..."]) # Builds a giant jar of all compile-time dependencies of the project subprocess.check_call([ "bazel", "build", - "//java/com/google/domain/registry/eclipse:eclipse_deps", + "//java/google/registry/eclipse:eclipse_deps", ]) # Builds a jar with all annotation processors subprocess.check_call([ "bazel", "build", - "//java/com/google/domain/registry/eclipse" + "//java/google/registry/eclipse" ":annotation_processors_ide_deploy.jar" ])