From 3df1e70b3732944085ec42a538034e4d39983f3c Mon Sep 17 00:00:00 2001 From: Pritesh Patel Date: Thu, 16 Mar 2017 17:38:42 -0700 Subject: [PATCH] Releasing version 1.2.3 of the Java SDK for Oracle Bare Metal Cloud Services. --- CHANGELOG.md | 12 ++ bmc-audit/pom.xml | 4 +- .../main/java/com/oracle/bmc/audit/Audit.java | 2 +- .../java/com/oracle/bmc/audit/AuditAsync.java | 2 +- .../oracle/bmc/audit/AuditAsyncClient.java | 57 ++++++---- .../com/oracle/bmc/audit/AuditClient.java | 57 ++++++---- .../internal/http/ListEventsConverter.java | 2 +- .../oracle/bmc/audit/model/AuditEvent.java | 2 +- .../bmc/audit/requests/ListEventsRequest.java | 17 ++- .../audit/responses/ListEventsResponse.java | 16 ++- bmc-bom/pom.xml | 12 +- bmc-common/pom.xml | 2 +- .../com/oracle/bmc/ClientConfiguration.java | 2 +- .../java/com/oracle/bmc/ClientRuntime.java | 2 +- .../java/com/oracle/bmc/ConfigFileReader.java | 2 +- .../main/java/com/oracle/bmc/InternalSdk.java | 2 +- .../src/main/java/com/oracle/bmc/OCID.java | 2 +- .../src/main/java/com/oracle/bmc/Region.java | 2 +- .../src/main/java/com/oracle/bmc/Service.java | 2 +- .../main/java/com/oracle/bmc/Services.java | 2 +- ...AbstractAuthenticationDetailsProvider.java | 17 +++ .../auth/AuthenticationDetailsProvider.java | 29 ++--- .../BasicAuthenticationDetailsProvider.java | 34 ++++++ ...nfigFileAuthenticationDetailsProvider.java | 7 +- ...CustomerAuthenticationDetailsProvider.java | 27 +++++ .../bmc/auth/CustomerKeyIdFormatter.java | 42 +++++++ .../SimpleAuthenticationDetailsProvider.java | 5 +- .../bmc/auth/SimplePrivateKeySupplier.java | 2 +- .../oracle/bmc/http/ClientConfigurator.java | 2 +- .../oracle/bmc/http/DefaultConfigurator.java | 2 +- .../bmc/http/internal/AuthnClientFilter.java | 2 +- .../bmc/http/internal/ClientIdFilter.java | 2 +- .../bmc/http/internal/EntityFactory.java | 2 +- .../bmc/http/internal/ErrorConsumer.java | 2 +- .../oracle/bmc/http/internal/HeaderUtils.java | 2 +- .../bmc/http/internal/HttpDateUtils.java | 2 +- .../bmc/http/internal/LogHeadersFilter.java | 2 +- .../bmc/http/internal/RequestIdFilter.java | 2 +- .../ResponseConversionFunctionFactory.java | 2 +- .../bmc/http/internal/ResponseHelper.java | 2 +- .../oracle/bmc/http/internal/RestClient.java | 2 +- .../bmc/http/internal/RestClientFactory.java | 31 +++--- .../internal/RestClientFactoryBuilder.java | 22 +--- .../bmc/http/internal/SuccessConsumer.java | 2 +- .../oracle/bmc/http/internal/WithHeaders.java | 2 +- .../http/signing/DefaultRequestSigner.java | 54 +++++++++ .../bmc/http/signing/RequestSigner.java | 2 +- .../http/signing/RequestSignerFactory.java | 9 +- .../{internal => }/SigningStrategy.java | 7 +- .../bmc/http/signing/internal/Algorithm.java | 2 +- .../bmc/http/signing/internal/Constants.java | 8 +- .../internal/DefaultRequestSignerFactory.java | 105 ++++++++++++------ .../bmc/http/signing/internal/KeyIdType.java | 2 +- .../http/signing/internal/KeySupplier.java | 2 +- .../PEMFileRSAPrivateKeySupplier.java | 2 +- .../signing/internal/RequestSignerImpl.java | 47 ++++---- .../signing/internal/SignatureSigner.java | 2 +- .../internal/SignedRequestException.java | 2 +- .../internal/SignedRequestVersion.java | 2 +- .../bmc/http/signing/internal/Version.java | 2 +- .../bmc/io/DuplicatableInputStream.java | 24 ++++ .../internal/WrappedByteArrayInputStream.java | 39 +++++++ .../io/internal/WrappedFileInputStream.java | 70 ++++++++++++ .../com/oracle/bmc/model/BmcException.java | 2 +- .../main/java/com/oracle/bmc/model/Range.java | 2 +- .../oracle/bmc/responses/AsyncHandler.java | 2 +- .../com/oracle/bmc/util/JavaRuntimeUtils.java | 2 +- .../java/com/oracle/bmc/util/StreamUtils.java | 66 +++++++++++ .../oracle/bmc/util/internal/Consumer.java | 2 +- .../oracle/bmc/util/internal/FileUtils.java | 2 +- .../oracle/bmc/util/internal/HttpUtils.java | 2 +- .../bmc/util/internal/ReflectionUtils.java | 2 +- .../bmc/util/internal/StreamDuplicator.java | 67 +++++++++++ .../bmc/util/internal/TransformingFuture.java | 2 +- .../oracle/bmc/waiter/BmcGenericWaiter.java | 2 +- .../com/oracle/bmc/waiter/DelayStrategy.java | 2 +- .../ExponentialBackoffDelayStrategy.java | 2 +- .../bmc/waiter/FixedTimeDelayStrategy.java | 2 +- .../com/oracle/bmc/waiter/GenericWaiter.java | 2 +- .../MaxAttemptsTerminationStrategy.java | 2 +- .../waiter/MaxTimeTerminationStrategy.java | 2 +- .../bmc/waiter/TerminationStrategy.java | 2 +- .../java/com/oracle/bmc/waiter/Waiter.java | 2 +- .../bmc/waiter/WaiterConfiguration.java | 2 +- .../java/com/oracle/bmc/waiter/Waiters.java | 2 +- .../bmc/waiter/internal/SimpleWaiterImpl.java | 2 +- .../com/oracle/bmc/ConfigFileReaderTest.java | 2 +- .../test/java/com/oracle/bmc/OCIDTest.java | 2 +- .../bmc/http/internal/HttpDateUtilsTest.java | 2 +- .../http/internal/RequestIdFilterTest.java | 2 +- .../WrappedByteArrayInputStreamTest.java | 44 ++++++++ .../internal/WrappedFileInputStreamTest.java | 81 ++++++++++++++ .../java/com/oracle/bmc/model/RangeTest.java | 2 +- .../oracle/bmc/util/JavaRuntimeUtilsTest.java | 2 +- .../com/oracle/bmc/util/StreamUtilsTest.java | 33 ++++++ .../bmc/util/internal/FileUtilsTest.java | 2 +- .../bmc/util/internal/HttpUtilsTest.java | 2 +- .../ExponentialBackoffDelayStrategyTest.java | 2 +- .../MaxTimeTerminationStrategyTest.java | 2 +- bmc-core/pom.xml | 4 +- .../com/oracle/bmc/core/Blockstorage.java | 2 +- .../oracle/bmc/core/BlockstorageAsync.java | 2 +- .../bmc/core/BlockstorageAsyncClient.java | 58 ++++++---- .../oracle/bmc/core/BlockstorageClient.java | 63 ++++++----- .../oracle/bmc/core/BlockstorageWaiters.java | 2 +- .../java/com/oracle/bmc/core/Compute.java | 2 +- .../com/oracle/bmc/core/ComputeAsync.java | 2 +- .../oracle/bmc/core/ComputeAsyncClient.java | 57 ++++++---- .../com/oracle/bmc/core/ComputeClient.java | 63 ++++++----- .../com/oracle/bmc/core/ComputeWaiters.java | 2 +- .../com/oracle/bmc/core/VirtualNetwork.java | 16 ++- .../oracle/bmc/core/VirtualNetworkAsync.java | 16 ++- .../bmc/core/VirtualNetworkAsyncClient.java | 58 ++++++---- .../oracle/bmc/core/VirtualNetworkClient.java | 63 ++++++----- .../bmc/core/VirtualNetworkWaiters.java | 2 +- .../internal/http/AttachVolumeConverter.java | 2 +- .../http/CaptureConsoleHistoryConverter.java | 2 +- .../internal/http/CreateCpeConverter.java | 2 +- .../http/CreateDhcpOptionsConverter.java | 2 +- .../http/CreateDrgAttachmentConverter.java | 2 +- .../internal/http/CreateDrgConverter.java | 2 +- .../http/CreateIPSecConnectionConverter.java | 2 +- .../internal/http/CreateImageConverter.java | 2 +- .../http/CreateInternetGatewayConverter.java | 2 +- .../http/CreateRouteTableConverter.java | 2 +- .../http/CreateSecurityListConverter.java | 2 +- .../internal/http/CreateSubnetConverter.java | 2 +- .../internal/http/CreateVcnConverter.java | 2 +- .../http/CreateVolumeBackupConverter.java | 2 +- .../internal/http/CreateVolumeConverter.java | 2 +- .../http/DeleteConsoleHistoryConverter.java | 2 +- .../internal/http/DeleteCpeConverter.java | 2 +- .../http/DeleteDhcpOptionsConverter.java | 2 +- .../http/DeleteDrgAttachmentConverter.java | 2 +- .../internal/http/DeleteDrgConverter.java | 2 +- .../http/DeleteIPSecConnectionConverter.java | 2 +- .../internal/http/DeleteImageConverter.java | 2 +- .../http/DeleteInternetGatewayConverter.java | 2 +- .../http/DeleteRouteTableConverter.java | 2 +- .../http/DeleteSecurityListConverter.java | 2 +- .../internal/http/DeleteSubnetConverter.java | 2 +- .../internal/http/DeleteVcnConverter.java | 2 +- .../http/DeleteVolumeBackupConverter.java | 2 +- .../internal/http/DeleteVolumeConverter.java | 2 +- .../internal/http/DetachVolumeConverter.java | 2 +- .../GetConsoleHistoryContentConverter.java | 2 +- .../http/GetConsoleHistoryConverter.java | 2 +- .../core/internal/http/GetCpeConverter.java | 2 +- .../http/GetDhcpOptionsConverter.java | 2 +- .../http/GetDrgAttachmentConverter.java | 2 +- .../core/internal/http/GetDrgConverter.java | 2 +- .../http/GetIPSecConnectionConverter.java | 2 +- ...tIPSecConnectionDeviceConfigConverter.java | 2 +- ...tIPSecConnectionDeviceStatusConverter.java | 2 +- .../core/internal/http/GetImageConverter.java | 2 +- .../internal/http/GetInstanceConverter.java | 2 +- .../http/GetInternetGatewayConverter.java | 2 +- .../internal/http/GetRouteTableConverter.java | 2 +- .../http/GetSecurityListConverter.java | 2 +- .../internal/http/GetSubnetConverter.java | 2 +- .../core/internal/http/GetVcnConverter.java | 2 +- .../core/internal/http/GetVnicConverter.java | 2 +- .../http/GetVolumeAttachmentConverter.java | 2 +- .../http/GetVolumeBackupConverter.java | 2 +- .../internal/http/GetVolumeConverter.java | 2 +- .../http/InstanceActionConverter.java | 2 +- .../http/LaunchInstanceConverter.java | 2 +- .../http/ListConsoleHistoriesConverter.java | 2 +- .../core/internal/http/ListCpesConverter.java | 2 +- .../http/ListDhcpOptionsConverter.java | 2 +- .../http/ListDrgAttachmentsConverter.java | 2 +- .../core/internal/http/ListDrgsConverter.java | 2 +- .../http/ListIPSecConnectionsConverter.java | 2 +- .../internal/http/ListImagesConverter.java | 2 +- .../internal/http/ListInstancesConverter.java | 2 +- .../http/ListInternetGatewaysConverter.java | 2 +- .../http/ListRouteTablesConverter.java | 2 +- .../http/ListSecurityListsConverter.java | 2 +- .../internal/http/ListShapesConverter.java | 2 +- .../internal/http/ListSubnetsConverter.java | 2 +- .../core/internal/http/ListVcnsConverter.java | 2 +- .../http/ListVnicAttachmentsConverter.java | 2 +- .../http/ListVolumeAttachmentsConverter.java | 2 +- .../http/ListVolumeBackupsConverter.java | 2 +- .../internal/http/ListVolumesConverter.java | 2 +- .../http/TerminateInstanceConverter.java | 2 +- .../internal/http/UpdateCpeConverter.java | 2 +- .../http/UpdateDhcpOptionsConverter.java | 2 +- .../http/UpdateDrgAttachmentConverter.java | 2 +- .../internal/http/UpdateDrgConverter.java | 2 +- .../http/UpdateIPSecConnectionConverter.java | 2 +- .../internal/http/UpdateImageConverter.java | 2 +- .../http/UpdateInstanceConverter.java | 2 +- .../http/UpdateInternetGatewayConverter.java | 2 +- .../http/UpdateRouteTableConverter.java | 2 +- .../http/UpdateSecurityListConverter.java | 2 +- .../internal/http/UpdateSubnetConverter.java | 2 +- .../internal/http/UpdateVcnConverter.java | 2 +- .../http/UpdateVolumeBackupConverter.java | 2 +- .../internal/http/UpdateVolumeConverter.java | 2 +- .../core/model/AttachIScsiVolumeDetails.java | 2 +- .../bmc/core/model/AttachVolumeDetails.java | 11 +- .../model/CaptureConsoleHistoryDetails.java | 2 +- .../oracle/bmc/core/model/ConsoleHistory.java | 2 +- .../java/com/oracle/bmc/core/model/Cpe.java | 2 +- .../bmc/core/model/CreateCpeDetails.java | 2 +- .../bmc/core/model/CreateDhcpDetails.java | 2 +- .../model/CreateDrgAttachmentDetails.java | 2 +- .../bmc/core/model/CreateDrgDetails.java | 2 +- .../model/CreateIPSecConnectionDetails.java | 2 +- .../bmc/core/model/CreateImageDetails.java | 2 +- .../model/CreateInternetGatewayDetails.java | 2 +- .../core/model/CreateRouteTableDetails.java | 2 +- .../core/model/CreateSecurityListDetails.java | 2 +- .../bmc/core/model/CreateSubnetDetails.java | 29 ++++- .../bmc/core/model/CreateVcnDetails.java | 32 +++++- .../core/model/CreateVolumeBackupDetails.java | 2 +- .../bmc/core/model/CreateVolumeDetails.java | 2 +- .../oracle/bmc/core/model/DhcpDnsOption.java | 40 ++++--- .../com/oracle/bmc/core/model/DhcpOption.java | 15 ++- .../oracle/bmc/core/model/DhcpOptions.java | 10 +- .../java/com/oracle/bmc/core/model/Drg.java | 2 +- .../oracle/bmc/core/model/DrgAttachment.java | 2 +- .../bmc/core/model/EgressSecurityRule.java | 2 +- .../bmc/core/model/IPSecConnection.java | 2 +- .../model/IPSecConnectionDeviceConfig.java | 2 +- .../model/IPSecConnectionDeviceStatus.java | 2 +- .../bmc/core/model/IScsiVolumeAttachment.java | 2 +- .../oracle/bmc/core/model/IcmpOptions.java | 2 +- .../java/com/oracle/bmc/core/model/Image.java | 2 +- .../bmc/core/model/IngressSecurityRule.java | 2 +- .../com/oracle/bmc/core/model/Instance.java | 2 +- .../bmc/core/model/InternetGateway.java | 2 +- .../bmc/core/model/LaunchInstanceDetails.java | 28 ++++- .../com/oracle/bmc/core/model/PortRange.java | 2 +- .../com/oracle/bmc/core/model/RouteRule.java | 2 +- .../com/oracle/bmc/core/model/RouteTable.java | 2 +- .../oracle/bmc/core/model/SecurityList.java | 2 +- .../java/com/oracle/bmc/core/model/Shape.java | 2 +- .../com/oracle/bmc/core/model/Subnet.java | 44 +++++++- .../com/oracle/bmc/core/model/TcpOptions.java | 2 +- .../oracle/bmc/core/model/TunnelConfig.java | 2 +- .../oracle/bmc/core/model/TunnelStatus.java | 2 +- .../com/oracle/bmc/core/model/UdpOptions.java | 2 +- .../bmc/core/model/UpdateCpeDetails.java | 2 +- .../bmc/core/model/UpdateDhcpDetails.java | 2 +- .../model/UpdateDrgAttachmentDetails.java | 2 +- .../bmc/core/model/UpdateDrgDetails.java | 2 +- .../model/UpdateIPSecConnectionDetails.java | 2 +- .../bmc/core/model/UpdateImageDetails.java | 2 +- .../bmc/core/model/UpdateInstanceDetails.java | 2 +- .../model/UpdateInternetGatewayDetails.java | 2 +- .../core/model/UpdateRouteTableDetails.java | 2 +- .../core/model/UpdateSecurityListDetails.java | 2 +- .../bmc/core/model/UpdateSubnetDetails.java | 2 +- .../bmc/core/model/UpdateVcnDetails.java | 2 +- .../core/model/UpdateVolumeBackupDetails.java | 2 +- .../bmc/core/model/UpdateVolumeDetails.java | 2 +- .../java/com/oracle/bmc/core/model/Vcn.java | 47 +++++++- .../java/com/oracle/bmc/core/model/Vnic.java | 33 +++++- .../oracle/bmc/core/model/VnicAttachment.java | 2 +- .../com/oracle/bmc/core/model/Volume.java | 2 +- .../bmc/core/model/VolumeAttachment.java | 7 +- .../oracle/bmc/core/model/VolumeBackup.java | 2 +- .../core/requests/AttachVolumeRequest.java | 14 ++- .../CaptureConsoleHistoryRequest.java | 14 ++- .../bmc/core/requests/CreateCpeRequest.java | 14 ++- .../requests/CreateDhcpOptionsRequest.java | 14 ++- .../requests/CreateDrgAttachmentRequest.java | 14 ++- .../bmc/core/requests/CreateDrgRequest.java | 14 ++- .../CreateIPSecConnectionRequest.java | 14 ++- .../bmc/core/requests/CreateImageRequest.java | 14 ++- .../CreateInternetGatewayRequest.java | 14 ++- .../requests/CreateRouteTableRequest.java | 14 ++- .../requests/CreateSecurityListRequest.java | 14 ++- .../core/requests/CreateSubnetRequest.java | 14 ++- .../bmc/core/requests/CreateVcnRequest.java | 14 ++- .../requests/CreateVolumeBackupRequest.java | 14 ++- .../core/requests/CreateVolumeRequest.java | 14 ++- .../requests/DeleteConsoleHistoryRequest.java | 14 ++- .../bmc/core/requests/DeleteCpeRequest.java | 14 ++- .../requests/DeleteDhcpOptionsRequest.java | 14 ++- .../requests/DeleteDrgAttachmentRequest.java | 14 ++- .../bmc/core/requests/DeleteDrgRequest.java | 14 ++- .../DeleteIPSecConnectionRequest.java | 14 ++- .../bmc/core/requests/DeleteImageRequest.java | 14 ++- .../DeleteInternetGatewayRequest.java | 14 ++- .../requests/DeleteRouteTableRequest.java | 14 ++- .../requests/DeleteSecurityListRequest.java | 14 ++- .../core/requests/DeleteSubnetRequest.java | 14 ++- .../bmc/core/requests/DeleteVcnRequest.java | 14 ++- .../requests/DeleteVolumeBackupRequest.java | 14 ++- .../core/requests/DeleteVolumeRequest.java | 14 ++- .../core/requests/DetachVolumeRequest.java | 14 ++- .../GetConsoleHistoryContentRequest.java | 15 ++- .../requests/GetConsoleHistoryRequest.java | 13 ++- .../bmc/core/requests/GetCpeRequest.java | 13 ++- .../core/requests/GetDhcpOptionsRequest.java | 13 ++- .../requests/GetDrgAttachmentRequest.java | 13 ++- .../bmc/core/requests/GetDrgRequest.java | 13 ++- ...GetIPSecConnectionDeviceConfigRequest.java | 13 ++- ...GetIPSecConnectionDeviceStatusRequest.java | 13 ++- .../requests/GetIPSecConnectionRequest.java | 13 ++- .../bmc/core/requests/GetImageRequest.java | 13 ++- .../bmc/core/requests/GetInstanceRequest.java | 13 ++- .../requests/GetInternetGatewayRequest.java | 13 ++- .../core/requests/GetRouteTableRequest.java | 13 ++- .../core/requests/GetSecurityListRequest.java | 13 ++- .../bmc/core/requests/GetSubnetRequest.java | 13 ++- .../bmc/core/requests/GetVcnRequest.java | 13 ++- .../bmc/core/requests/GetVnicRequest.java | 13 ++- .../requests/GetVolumeAttachmentRequest.java | 13 ++- .../core/requests/GetVolumeBackupRequest.java | 13 ++- .../bmc/core/requests/GetVolumeRequest.java | 13 ++- .../core/requests/InstanceActionRequest.java | 16 ++- .../core/requests/LaunchInstanceRequest.java | 14 ++- .../requests/ListConsoleHistoriesRequest.java | 17 ++- .../bmc/core/requests/ListCpesRequest.java | 15 ++- .../core/requests/ListDhcpOptionsRequest.java | 16 ++- .../requests/ListDrgAttachmentsRequest.java | 17 ++- .../bmc/core/requests/ListDrgsRequest.java | 15 ++- .../requests/ListIPSecConnectionsRequest.java | 17 ++- .../bmc/core/requests/ListImagesRequest.java | 18 ++- .../core/requests/ListInstancesRequest.java | 17 ++- .../requests/ListInternetGatewaysRequest.java | 16 ++- .../core/requests/ListRouteTablesRequest.java | 16 ++- .../requests/ListSecurityListsRequest.java | 16 ++- .../bmc/core/requests/ListShapesRequest.java | 17 ++- .../bmc/core/requests/ListSubnetsRequest.java | 16 ++- .../bmc/core/requests/ListVcnsRequest.java | 15 ++- .../requests/ListVnicAttachmentsRequest.java | 18 ++- .../ListVolumeAttachmentsRequest.java | 18 ++- .../requests/ListVolumeBackupsRequest.java | 16 ++- .../bmc/core/requests/ListVolumesRequest.java | 16 ++- .../requests/TerminateInstanceRequest.java | 14 ++- .../bmc/core/requests/UpdateCpeRequest.java | 15 ++- .../requests/UpdateDhcpOptionsRequest.java | 15 ++- .../requests/UpdateDrgAttachmentRequest.java | 15 ++- .../bmc/core/requests/UpdateDrgRequest.java | 15 ++- .../UpdateIPSecConnectionRequest.java | 15 ++- .../bmc/core/requests/UpdateImageRequest.java | 16 ++- .../core/requests/UpdateInstanceRequest.java | 16 ++- .../UpdateInternetGatewayRequest.java | 15 ++- .../requests/UpdateRouteTableRequest.java | 15 ++- .../requests/UpdateSecurityListRequest.java | 15 ++- .../core/requests/UpdateSubnetRequest.java | 15 ++- .../bmc/core/requests/UpdateVcnRequest.java | 15 ++- .../requests/UpdateVolumeBackupRequest.java | 15 ++- .../core/requests/UpdateVolumeRequest.java | 15 ++- .../core/responses/AttachVolumeResponse.java | 16 ++- .../CaptureConsoleHistoryResponse.java | 16 ++- .../bmc/core/responses/CreateCpeResponse.java | 16 ++- .../responses/CreateDhcpOptionsResponse.java | 16 ++- .../CreateDrgAttachmentResponse.java | 16 ++- .../bmc/core/responses/CreateDrgResponse.java | 16 ++- .../CreateIPSecConnectionResponse.java | 16 ++- .../core/responses/CreateImageResponse.java | 16 ++- .../CreateInternetGatewayResponse.java | 16 ++- .../responses/CreateRouteTableResponse.java | 16 ++- .../responses/CreateSecurityListResponse.java | 16 ++- .../core/responses/CreateSubnetResponse.java | 16 ++- .../bmc/core/responses/CreateVcnResponse.java | 16 ++- .../responses/CreateVolumeBackupResponse.java | 16 ++- .../core/responses/CreateVolumeResponse.java | 16 ++- .../DeleteConsoleHistoryResponse.java | 14 ++- .../bmc/core/responses/DeleteCpeResponse.java | 14 ++- .../responses/DeleteDhcpOptionsResponse.java | 14 ++- .../DeleteDrgAttachmentResponse.java | 14 ++- .../bmc/core/responses/DeleteDrgResponse.java | 14 ++- .../DeleteIPSecConnectionResponse.java | 14 ++- .../core/responses/DeleteImageResponse.java | 14 ++- .../DeleteInternetGatewayResponse.java | 14 ++- .../responses/DeleteRouteTableResponse.java | 14 ++- .../responses/DeleteSecurityListResponse.java | 14 ++- .../core/responses/DeleteSubnetResponse.java | 14 ++- .../bmc/core/responses/DeleteVcnResponse.java | 14 ++- .../responses/DeleteVolumeBackupResponse.java | 14 ++- .../core/responses/DeleteVolumeResponse.java | 14 ++- .../core/responses/DetachVolumeResponse.java | 14 ++- .../GetConsoleHistoryContentResponse.java | 16 ++- .../responses/GetConsoleHistoryResponse.java | 16 ++- .../bmc/core/responses/GetCpeResponse.java | 16 ++- .../responses/GetDhcpOptionsResponse.java | 16 ++- .../responses/GetDrgAttachmentResponse.java | 16 ++- .../bmc/core/responses/GetDrgResponse.java | 16 ++- ...etIPSecConnectionDeviceConfigResponse.java | 16 ++- ...etIPSecConnectionDeviceStatusResponse.java | 16 ++- .../responses/GetIPSecConnectionResponse.java | 16 ++- .../bmc/core/responses/GetImageResponse.java | 16 ++- .../core/responses/GetInstanceResponse.java | 16 ++- .../responses/GetInternetGatewayResponse.java | 16 ++- .../core/responses/GetRouteTableResponse.java | 16 ++- .../responses/GetSecurityListResponse.java | 16 ++- .../bmc/core/responses/GetSubnetResponse.java | 16 ++- .../bmc/core/responses/GetVcnResponse.java | 16 ++- .../bmc/core/responses/GetVnicResponse.java | 16 ++- .../GetVolumeAttachmentResponse.java | 16 ++- .../responses/GetVolumeBackupResponse.java | 16 ++- .../bmc/core/responses/GetVolumeResponse.java | 16 ++- .../responses/InstanceActionResponse.java | 16 ++- .../responses/LaunchInstanceResponse.java | 16 ++- .../ListConsoleHistoriesResponse.java | 16 ++- .../bmc/core/responses/ListCpesResponse.java | 16 ++- .../responses/ListDhcpOptionsResponse.java | 16 ++- .../responses/ListDrgAttachmentsResponse.java | 16 ++- .../bmc/core/responses/ListDrgsResponse.java | 16 ++- .../ListIPSecConnectionsResponse.java | 16 ++- .../core/responses/ListImagesResponse.java | 16 ++- .../core/responses/ListInstancesResponse.java | 16 ++- .../ListInternetGatewaysResponse.java | 16 ++- .../responses/ListRouteTablesResponse.java | 16 ++- .../responses/ListSecurityListsResponse.java | 16 ++- .../core/responses/ListShapesResponse.java | 16 ++- .../core/responses/ListSubnetsResponse.java | 16 ++- .../bmc/core/responses/ListVcnsResponse.java | 16 ++- .../ListVnicAttachmentsResponse.java | 16 ++- .../ListVolumeAttachmentsResponse.java | 16 ++- .../responses/ListVolumeBackupsResponse.java | 16 ++- .../core/responses/ListVolumesResponse.java | 16 ++- .../responses/TerminateInstanceResponse.java | 14 ++- .../bmc/core/responses/UpdateCpeResponse.java | 16 ++- .../responses/UpdateDhcpOptionsResponse.java | 16 ++- .../UpdateDrgAttachmentResponse.java | 16 ++- .../bmc/core/responses/UpdateDrgResponse.java | 16 ++- .../UpdateIPSecConnectionResponse.java | 16 ++- .../core/responses/UpdateImageResponse.java | 16 ++- .../responses/UpdateInstanceResponse.java | 16 ++- .../UpdateInternetGatewayResponse.java | 16 ++- .../responses/UpdateRouteTableResponse.java | 16 ++- .../responses/UpdateSecurityListResponse.java | 16 ++- .../core/responses/UpdateSubnetResponse.java | 16 ++- .../bmc/core/responses/UpdateVcnResponse.java | 16 ++- .../responses/UpdateVolumeBackupResponse.java | 15 ++- .../core/responses/UpdateVolumeResponse.java | 16 ++- bmc-examples/pom.xml | 4 +- .../src/main/java/CreateInstanceExample.java | 2 +- .../java/GetImageLatestVersionExample.java | 34 +++--- .../main/java/GetInstancePublicIpExample.java | 2 +- .../src/main/java/ListAuditEventsExample.java | 2 +- .../main/java/ObjectStorageAsyncExample.java | 2 +- .../main/java/ObjectStorageSyncExample.java | 2 +- .../src/main/java/RawRestCallExample.java | 96 ++++++++++++++++ bmc-identity/pom.xml | 4 +- .../com/oracle/bmc/identity/Identity.java | 2 +- .../oracle/bmc/identity/IdentityAsync.java | 2 +- .../bmc/identity/IdentityAsyncClient.java | 57 ++++++---- .../oracle/bmc/identity/IdentityClient.java | 63 ++++++----- .../oracle/bmc/identity/IdentityWaiters.java | 2 +- .../http/AddUserToGroupConverter.java | 2 +- .../http/CreateCompartmentConverter.java | 2 +- .../internal/http/CreateGroupConverter.java | 2 +- .../CreateOrResetUIPasswordConverter.java | 2 +- .../internal/http/CreatePolicyConverter.java | 2 +- .../http/CreateSwiftPasswordConverter.java | 2 +- .../internal/http/CreateUserConverter.java | 2 +- .../internal/http/DeleteApiKeyConverter.java | 2 +- .../internal/http/DeleteGroupConverter.java | 2 +- .../internal/http/DeletePolicyConverter.java | 2 +- .../http/DeleteSwiftPasswordConverter.java | 2 +- .../internal/http/DeleteUserConverter.java | 2 +- .../http/GetCompartmentConverter.java | 2 +- .../internal/http/GetGroupConverter.java | 2 +- .../internal/http/GetPolicyConverter.java | 2 +- .../internal/http/GetUserConverter.java | 2 +- .../http/GetUserGroupMembershipConverter.java | 2 +- .../internal/http/ListApiKeysConverter.java | 2 +- .../ListAvailabilityDomainsConverter.java | 2 +- .../http/ListCompartmentsConverter.java | 2 +- .../internal/http/ListGroupsConverter.java | 2 +- .../internal/http/ListPoliciesConverter.java | 2 +- .../http/ListSwiftPasswordsConverter.java | 2 +- .../ListUserGroupMembershipsConverter.java | 2 +- .../internal/http/ListUsersConverter.java | 2 +- .../http/RemoveUserFromGroupConverter.java | 2 +- .../http/UpdateCompartmentConverter.java | 2 +- .../internal/http/UpdateGroupConverter.java | 2 +- .../internal/http/UpdatePolicyConverter.java | 2 +- .../http/UpdateSwiftPasswordConverter.java | 2 +- .../internal/http/UpdateUserConverter.java | 2 +- .../http/UpdateUserStateConverter.java | 2 +- .../internal/http/UploadApiKeyConverter.java | 2 +- .../identity/model/AddUserToGroupDetails.java | 2 +- .../com/oracle/bmc/identity/model/ApiKey.java | 2 +- .../identity/model/AvailabilityDomain.java | 2 +- .../bmc/identity/model/Compartment.java | 2 +- .../identity/model/CreateApiKeyDetails.java | 2 +- .../model/CreateCompartmentDetails.java | 2 +- .../identity/model/CreateGroupDetails.java | 2 +- .../identity/model/CreatePolicyDetails.java | 2 +- .../model/CreateSwiftPasswordDetails.java | 2 +- .../bmc/identity/model/CreateUserDetails.java | 2 +- .../com/oracle/bmc/identity/model/Group.java | 2 +- .../com/oracle/bmc/identity/model/Policy.java | 2 +- .../bmc/identity/model/SwiftPassword.java | 2 +- .../oracle/bmc/identity/model/UIPassword.java | 2 +- .../model/UpdateCompartmentDetails.java | 2 +- .../identity/model/UpdateGroupDetails.java | 2 +- .../identity/model/UpdatePolicyDetails.java | 2 +- .../identity/model/UpdateStateDetails.java | 2 +- .../model/UpdateSwiftPasswordDetails.java | 2 +- .../bmc/identity/model/UpdateUserDetails.java | 2 +- .../com/oracle/bmc/identity/model/User.java | 2 +- .../identity/model/UserGroupMembership.java | 2 +- .../requests/AddUserToGroupRequest.java | 14 ++- .../requests/CreateCompartmentRequest.java | 14 ++- .../identity/requests/CreateGroupRequest.java | 14 ++- .../CreateOrResetUIPasswordRequest.java | 14 ++- .../requests/CreatePolicyRequest.java | 14 ++- .../requests/CreateSwiftPasswordRequest.java | 15 ++- .../identity/requests/CreateUserRequest.java | 14 ++- .../requests/DeleteApiKeyRequest.java | 15 ++- .../identity/requests/DeleteGroupRequest.java | 14 ++- .../requests/DeletePolicyRequest.java | 14 ++- .../requests/DeleteSwiftPasswordRequest.java | 15 ++- .../identity/requests/DeleteUserRequest.java | 14 ++- .../requests/GetCompartmentRequest.java | 13 ++- .../identity/requests/GetGroupRequest.java | 13 ++- .../identity/requests/GetPolicyRequest.java | 13 ++- .../GetUserGroupMembershipRequest.java | 13 ++- .../bmc/identity/requests/GetUserRequest.java | 13 ++- .../identity/requests/ListApiKeysRequest.java | 13 ++- .../ListAvailabilityDomainsRequest.java | 13 ++- .../requests/ListCompartmentsRequest.java | 15 ++- .../identity/requests/ListGroupsRequest.java | 15 ++- .../requests/ListPoliciesRequest.java | 15 ++- .../requests/ListSwiftPasswordsRequest.java | 13 ++- .../ListUserGroupMembershipsRequest.java | 17 ++- .../identity/requests/ListUsersRequest.java | 15 ++- .../requests/RemoveUserFromGroupRequest.java | 14 ++- .../requests/UpdateCompartmentRequest.java | 15 ++- .../identity/requests/UpdateGroupRequest.java | 15 ++- .../requests/UpdatePolicyRequest.java | 15 ++- .../requests/UpdateSwiftPasswordRequest.java | 16 ++- .../identity/requests/UpdateUserRequest.java | 15 ++- .../requests/UpdateUserStateRequest.java | 15 ++- .../requests/UploadApiKeyRequest.java | 15 ++- .../responses/AddUserToGroupResponse.java | 16 ++- .../responses/CreateCompartmentResponse.java | 16 ++- .../responses/CreateGroupResponse.java | 16 ++- .../CreateOrResetUIPasswordResponse.java | 16 ++- .../responses/CreatePolicyResponse.java | 16 ++- .../CreateSwiftPasswordResponse.java | 16 ++- .../responses/CreateUserResponse.java | 16 ++- .../responses/DeleteApiKeyResponse.java | 14 ++- .../responses/DeleteGroupResponse.java | 14 ++- .../responses/DeletePolicyResponse.java | 14 ++- .../DeleteSwiftPasswordResponse.java | 14 ++- .../responses/DeleteUserResponse.java | 14 ++- .../responses/GetCompartmentResponse.java | 16 ++- .../identity/responses/GetGroupResponse.java | 16 ++- .../identity/responses/GetPolicyResponse.java | 16 ++- .../GetUserGroupMembershipResponse.java | 16 ++- .../identity/responses/GetUserResponse.java | 16 ++- .../responses/ListApiKeysResponse.java | 16 ++- .../ListAvailabilityDomainsResponse.java | 16 ++- .../responses/ListCompartmentsResponse.java | 16 ++- .../responses/ListGroupsResponse.java | 16 ++- .../responses/ListPoliciesResponse.java | 16 ++- .../responses/ListSwiftPasswordsResponse.java | 16 ++- .../ListUserGroupMembershipsResponse.java | 16 ++- .../identity/responses/ListUsersResponse.java | 16 ++- .../RemoveUserFromGroupResponse.java | 14 ++- .../responses/UpdateCompartmentResponse.java | 16 ++- .../responses/UpdateGroupResponse.java | 16 ++- .../responses/UpdatePolicyResponse.java | 16 ++- .../UpdateSwiftPasswordResponse.java | 16 ++- .../responses/UpdateUserResponse.java | 16 ++- .../responses/UpdateUserStateResponse.java | 16 ++- .../responses/UploadApiKeyResponse.java | 16 ++- bmc-objectstorage/pom.xml | 4 +- .../bmc/objectstorage/ObjectStorage.java | 2 +- .../bmc/objectstorage/ObjectStorageAsync.java | 2 +- .../ObjectStorageAsyncClient.java | 58 ++++++---- .../objectstorage/ObjectStorageClient.java | 57 ++++++---- .../internal/http/CreateBucketConverter.java | 2 +- .../internal/http/DeleteBucketConverter.java | 2 +- .../internal/http/DeleteObjectConverter.java | 2 +- .../internal/http/GetBucketConverter.java | 2 +- .../internal/http/GetNamespaceConverter.java | 2 +- .../internal/http/GetObjectConverter.java | 2 +- .../internal/http/HeadBucketConverter.java | 2 +- .../internal/http/HeadObjectConverter.java | 2 +- .../internal/http/ListBucketsConverter.java | 2 +- .../internal/http/ListObjectsConverter.java | 2 +- .../internal/http/PutObjectConverter.java | 2 +- .../internal/http/UpdateBucketConverter.java | 2 +- .../bmc/objectstorage/model/Bucket.java | 2 +- .../objectstorage/model/BucketSummary.java | 2 +- .../model/CreateBucketDetails.java | 2 +- .../bmc/objectstorage/model/ListObjects.java | 2 +- .../objectstorage/model/ObjectSummary.java | 2 +- .../model/UpdateBucketDetails.java | 2 +- .../requests/CreateBucketRequest.java | 15 ++- .../requests/DeleteBucketRequest.java | 16 ++- .../requests/DeleteObjectRequest.java | 17 ++- .../requests/GetBucketRequest.java | 17 ++- .../requests/GetNamespaceRequest.java | 13 ++- .../requests/GetObjectRequest.java | 19 +++- .../requests/HeadBucketRequest.java | 17 ++- .../requests/HeadObjectRequest.java | 18 ++- .../requests/ListBucketsRequest.java | 17 ++- .../requests/ListObjectsRequest.java | 21 +++- .../requests/PutObjectRequest.java | 26 ++++- .../requests/UpdateBucketRequest.java | 17 ++- .../responses/CreateBucketResponse.java | 18 ++- .../responses/DeleteBucketResponse.java | 15 ++- .../responses/DeleteObjectResponse.java | 16 ++- .../responses/GetBucketResponse.java | 17 ++- .../responses/GetNamespaceResponse.java | 15 ++- .../responses/GetObjectResponse.java | 25 ++++- .../responses/HeadBucketResponse.java | 17 ++- .../responses/HeadObjectResponse.java | 24 +++- .../responses/ListBucketsResponse.java | 17 ++- .../responses/ListObjectsResponse.java | 16 ++- .../responses/PutObjectResponse.java | 18 ++- .../responses/UpdateBucketResponse.java | 17 ++- licenseheader.txt | 2 +- pom.xml | 46 ++++++-- 618 files changed, 5690 insertions(+), 1043 deletions(-) create mode 100644 bmc-common/src/main/java/com/oracle/bmc/auth/AbstractAuthenticationDetailsProvider.java create mode 100644 bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java create mode 100644 bmc-common/src/main/java/com/oracle/bmc/auth/CustomerAuthenticationDetailsProvider.java create mode 100644 bmc-common/src/main/java/com/oracle/bmc/auth/CustomerKeyIdFormatter.java create mode 100644 bmc-common/src/main/java/com/oracle/bmc/http/signing/DefaultRequestSigner.java rename bmc-common/src/main/java/com/oracle/bmc/http/signing/{internal => }/SigningStrategy.java (79%) create mode 100644 bmc-common/src/main/java/com/oracle/bmc/io/DuplicatableInputStream.java create mode 100644 bmc-common/src/main/java/com/oracle/bmc/io/internal/WrappedByteArrayInputStream.java create mode 100644 bmc-common/src/main/java/com/oracle/bmc/io/internal/WrappedFileInputStream.java create mode 100644 bmc-common/src/main/java/com/oracle/bmc/util/StreamUtils.java create mode 100644 bmc-common/src/main/java/com/oracle/bmc/util/internal/StreamDuplicator.java create mode 100644 bmc-common/src/test/java/com/oracle/bmc/io/internal/WrappedByteArrayInputStreamTest.java create mode 100644 bmc-common/src/test/java/com/oracle/bmc/io/internal/WrappedFileInputStreamTest.java create mode 100644 bmc-common/src/test/java/com/oracle/bmc/util/StreamUtilsTest.java create mode 100644 bmc-examples/src/main/java/RawRestCallExample.java diff --git a/CHANGELOG.md b/CHANGELOG.md index ed942685d86..354b22082d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### Added - N/A +## 1.2.3 - 2017-03-16 +### Fixed +- Allow service responses to deserialize to base classes when unknown discriminators returned (vs. throwing exceptions) + +### Changed +- Added a new layer for authentication details to provide for other forms of keyId based auth + +### Added +- New DNS label feature +- New request signer classes to use directly with other HTTP clients +- New client contructors to allow more control over how requests are signed + ## 1.2.2 - 2016-02-23 ### Fixed - Bugs in config file parsing diff --git a/bmc-audit/pom.xml b/bmc-audit/pom.xml index a2ced013337..b66e9b81301 100644 --- a/bmc-audit/pom.xml +++ b/bmc-audit/pom.xml @@ -5,7 +5,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk - 1.2.3-SNAPSHOT + 1.2.3 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk-common - 1.2.3-SNAPSHOT + 1.2.3 diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/Audit.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/Audit.java index caee71f3869..8bb7c5a04f3 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/Audit.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/Audit.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.audit; diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsync.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsync.java index 870af15d445..5053cabb281 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsync.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsync.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.audit; diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java index a4fe7866abd..9753504af87 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.audit; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.*; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.internal.*; +import com.oracle.bmc.http.signing.*; +import com.oracle.bmc.http.signing.internal.*; import com.oracle.bmc.responses.*; import com.oracle.bmc.util.internal.*; @@ -41,46 +43,61 @@ public class AuditAsyncClient implements AuditAsync { /** * Creates a new service instance using the given authentication provider. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. */ - public AuditAsyncClient(AuthenticationDetailsProvider authenticationProvider) { - this.client = newClientBuilder().build().create(SERVICE, authenticationProvider); + public AuditAsyncClient(BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + this(authenticationDetailsProvider, null); } /** * Creates a new service instance using the given authentication provider and client configuration. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. */ public AuditAsyncClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration) { - this.client = - newClientBuilder().build().create(SERVICE, authenticationProvider, configuration); + this(authenticationDetailsProvider, configuration, null); } /** * Creates a new service instance using the given authentication provider and client configuration. Additionally, * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. */ public AuditAsyncClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { - this.client = - newClientBuilder() - .clientConfigurator(clientConfigurator) - .build() - .create(SERVICE, authenticationProvider, configuration); + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + new DefaultRequestSignerFactory(SigningStrategy.STANDARD)); } - private static RestClientFactoryBuilder newClientBuilder() { - RestClientFactoryBuilder builder = RestClientFactoryBuilder.builder(); - - return builder; + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param requestSignerFactory The request signer factory used to create the request signer for this service. + */ + public AuditAsyncClient( + AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + ClientConfiguration configuration, + ClientConfigurator clientConfigurator, + RequestSignerFactory requestSignerFactory) { + RestClientFactory restClientFactory = + RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build(); + RequestSigner requestSigner = + requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider); + this.client = restClientFactory.create(requestSigner, configuration); } @Override diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java index 9a5fd349c2c..5247beb8f94 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.audit; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.*; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.internal.*; +import com.oracle.bmc.http.signing.*; +import com.oracle.bmc.http.signing.internal.*; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -40,46 +42,61 @@ public class AuditClient implements Audit { /** * Creates a new service instance using the given authentication provider. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. */ - public AuditClient(AuthenticationDetailsProvider authenticationProvider) { - this.client = newClientBuilder().build().create(SERVICE, authenticationProvider); + public AuditClient(BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + this(authenticationDetailsProvider, null); } /** * Creates a new service instance using the given authentication provider and client configuration. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. */ public AuditClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration) { - this.client = - newClientBuilder().build().create(SERVICE, authenticationProvider, configuration); + this(authenticationDetailsProvider, configuration, null); } /** * Creates a new service instance using the given authentication provider and client configuration. Additionally, * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. */ public AuditClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { - this.client = - newClientBuilder() - .clientConfigurator(clientConfigurator) - .build() - .create(SERVICE, authenticationProvider, configuration); + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + new DefaultRequestSignerFactory(SigningStrategy.STANDARD)); } - private static RestClientFactoryBuilder newClientBuilder() { - RestClientFactoryBuilder builder = RestClientFactoryBuilder.builder(); - - return builder; + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param requestSignerFactory The request signer factory used to create the request signer for this service. + */ + public AuditClient( + AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + ClientConfiguration configuration, + ClientConfigurator clientConfigurator, + RequestSignerFactory requestSignerFactory) { + RestClientFactory restClientFactory = + RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build(); + RequestSigner requestSigner = + requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider); + this.client = restClientFactory.create(requestSigner, configuration); } @Override diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/ListEventsConverter.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/ListEventsConverter.java index c967af070f5..aa35e9b21f4 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/ListEventsConverter.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/ListEventsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.audit.internal.http; diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/model/AuditEvent.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/model/AuditEvent.java index f8830900849..897a69663a0 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/model/AuditEvent.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/model/AuditEvent.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.audit.model; diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/ListEventsRequest.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/ListEventsRequest.java index 951f6f5d88c..c6d399a2ede 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/ListEventsRequest.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/ListEventsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.audit.requests; @@ -50,4 +50,19 @@ public class ListEventsRequest { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListEventsRequest o) { + compartmentId(o.getCompartmentId()); + startTime(o.getStartTime()); + endTime(o.getEndTime()); + page(o.getPage()); + opcRequestId(o.getOpcRequestId()); + return this; + } + } } diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/responses/ListEventsResponse.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/responses/ListEventsResponse.java index 3fec0b065f4..dbf6915303c 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/responses/ListEventsResponse.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/responses/ListEventsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.audit.responses; @@ -39,4 +39,18 @@ public class ListEventsResponse { * A list of AuditEvent instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListEventsResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-bom/pom.xml b/bmc-bom/pom.xml index 21c42f54b45..4ab0e0cce3e 100644 --- a/bmc-bom/pom.xml +++ b/bmc-bom/pom.xml @@ -7,7 +7,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk - 1.2.3-SNAPSHOT + 1.2.3 ../pom.xml @@ -24,7 +24,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk-common - 1.2.3-SNAPSHOT + 1.2.3 false @@ -33,25 +33,25 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk-audit - 1.2.3-SNAPSHOT + 1.2.3 false com.oracle.bmc.sdk oracle-bmc-java-sdk-core - 1.2.3-SNAPSHOT + 1.2.3 false com.oracle.bmc.sdk oracle-bmc-java-sdk-identity - 1.2.3-SNAPSHOT + 1.2.3 false com.oracle.bmc.sdk oracle-bmc-java-sdk-objectstorage - 1.2.3-SNAPSHOT + 1.2.3 false diff --git a/bmc-common/pom.xml b/bmc-common/pom.xml index e92206c59e1..ff871cf0fa8 100644 --- a/bmc-common/pom.xml +++ b/bmc-common/pom.xml @@ -5,7 +5,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk - 1.2.3-SNAPSHOT + 1.2.3 ../pom.xml diff --git a/bmc-common/src/main/java/com/oracle/bmc/ClientConfiguration.java b/bmc-common/src/main/java/com/oracle/bmc/ClientConfiguration.java index d822da05fa1..c3f89099b19 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/ClientConfiguration.java +++ b/bmc-common/src/main/java/com/oracle/bmc/ClientConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc; diff --git a/bmc-common/src/main/java/com/oracle/bmc/ClientRuntime.java b/bmc-common/src/main/java/com/oracle/bmc/ClientRuntime.java index 342cd43e759..1899c03e48a 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/ClientRuntime.java +++ b/bmc-common/src/main/java/com/oracle/bmc/ClientRuntime.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc; diff --git a/bmc-common/src/main/java/com/oracle/bmc/ConfigFileReader.java b/bmc-common/src/main/java/com/oracle/bmc/ConfigFileReader.java index 4a3bef39e2d..9cb6b3c0e8a 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/ConfigFileReader.java +++ b/bmc-common/src/main/java/com/oracle/bmc/ConfigFileReader.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc; diff --git a/bmc-common/src/main/java/com/oracle/bmc/InternalSdk.java b/bmc-common/src/main/java/com/oracle/bmc/InternalSdk.java index 95c8f0735dc..d660fb80b68 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/InternalSdk.java +++ b/bmc-common/src/main/java/com/oracle/bmc/InternalSdk.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc; diff --git a/bmc-common/src/main/java/com/oracle/bmc/OCID.java b/bmc-common/src/main/java/com/oracle/bmc/OCID.java index c393025c6be..e454304bdee 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/OCID.java +++ b/bmc-common/src/main/java/com/oracle/bmc/OCID.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc; diff --git a/bmc-common/src/main/java/com/oracle/bmc/Region.java b/bmc-common/src/main/java/com/oracle/bmc/Region.java index cae85de99e9..f6aa25038e6 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/Region.java +++ b/bmc-common/src/main/java/com/oracle/bmc/Region.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc; diff --git a/bmc-common/src/main/java/com/oracle/bmc/Service.java b/bmc-common/src/main/java/com/oracle/bmc/Service.java index f648967655f..12653d630b2 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/Service.java +++ b/bmc-common/src/main/java/com/oracle/bmc/Service.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc; diff --git a/bmc-common/src/main/java/com/oracle/bmc/Services.java b/bmc-common/src/main/java/com/oracle/bmc/Services.java index ece7b869581..7bce0c9c3a9 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/Services.java +++ b/bmc-common/src/main/java/com/oracle/bmc/Services.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc; diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/AbstractAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/AbstractAuthenticationDetailsProvider.java new file mode 100644 index 00000000000..acc52fcd600 --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/AbstractAuthenticationDetailsProvider.java @@ -0,0 +1,17 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.auth; + +/** + * Root interface for classes providing some information needed to authenticate + * requests. + */ +public interface AbstractAuthenticationDetailsProvider { + + /** + * Decorator interface to indicate that credentials provided by the + * provider should not be cached and should always be fetched on every request. + */ + interface DisableAuthCaching {} +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/AuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/AuthenticationDetailsProvider.java index e3e2ebd32b4..d612cd083b5 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/auth/AuthenticationDetailsProvider.java +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/AuthenticationDetailsProvider.java @@ -1,14 +1,17 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.auth; -import java.io.InputStream; - /** - * Interface defining a provider for BMC credentials. + * Interface defining a BasicAuthenticationDetailsProvider that also provides + * the individual components used to create the keyId. + *

+ * The {@link #getKeyId()} method should be implemented as "tentantId/userId/fingerprint". See + * docs + * for more information. */ -public interface AuthenticationDetailsProvider { +public interface AuthenticationDetailsProvider extends BasicAuthenticationDetailsProvider { /** * Returns the fingerprint of the key being used. * @@ -29,20 +32,4 @@ public interface AuthenticationDetailsProvider { * @return The user OCID. */ String getUserId(); - - /** - * Returns the optional pass phrase for the (encrypted) private key. - * - * @return The pass phrase, or null if not applicable - */ - String getPassPhrase(); - - /** - * Returns a new InputStream to the private key. This stream should be - * closed by the caller, implementations should return new streams each - * time. - * - * @return A new InputStream. - */ - InputStream getPrivateKey(); } diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java new file mode 100644 index 00000000000..e7147a9ecb6 --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java @@ -0,0 +1,34 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.auth; + +import java.io.InputStream; + +/** + * Base interface used provide required information to sign requests to Oracle Bare Metal Services. + */ +public interface BasicAuthenticationDetailsProvider extends AbstractAuthenticationDetailsProvider { + /** + * Returns the keyId used to sign requests. + * + * @return The keyId. + */ + String getKeyId(); + + /** + * Returns a new InputStream to the private key. This stream should be + * closed by the caller, implementations should return new streams each + * time. + * + * @return A new InputStream. + */ + InputStream getPrivateKey(); + + /** + * Returns the optional pass phrase for the (encrypted) private key. + * + * @return The pass phrase, or null if not applicable + */ + String getPassPhrase(); +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java index 52212b941c7..096d56aee5d 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.auth; @@ -106,4 +106,9 @@ public String getPassPhrase() { public InputStream getPrivateKey() { return this.delegate.getPrivateKey(); } + + @Override + public String getKeyId() { + return this.delegate.getKeyId(); + } } diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/CustomerAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/CustomerAuthenticationDetailsProvider.java new file mode 100644 index 00000000000..e2472b925b6 --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/CustomerAuthenticationDetailsProvider.java @@ -0,0 +1,27 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.auth; + +import com.oracle.bmc.OCID; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public abstract class CustomerAuthenticationDetailsProvider + implements AuthenticationDetailsProvider { + + @Override + public String getKeyId() { + if (!OCID.isValid(getTenantId())) { + LOG.warn("tenantId '{}' does not match expected pattern", getTenantId()); + } + if (!OCID.isValid(getUserId())) { + LOG.warn("userId '{}' does not match expected pattern", getUserId()); + } + + String keyId = CustomerKeyIdFormatter.createKeyId(this); + LOG.debug("Using keyId: {}", keyId); + return keyId; + } +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/CustomerKeyIdFormatter.java b/bmc-common/src/main/java/com/oracle/bmc/auth/CustomerKeyIdFormatter.java new file mode 100644 index 00000000000..c449d47759a --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/CustomerKeyIdFormatter.java @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.auth; + +import javax.annotation.Nonnull; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +/** + * Formatter used to create the correct 'keyId' needed for signing requests. + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class CustomerKeyIdFormatter { + + /** + * Creates a keyId from the individual components. + * + * @param tenantId + * The tenantId + * @param userId + * The userId + * @param fingerprint + * The fingerprint + * @return The keyId used to sign requests + */ + public static String createKeyId(String tenantId, String userId, String fingerprint) { + return String.format("%s/%s/%s", tenantId, userId, fingerprint); + } + + /** + * Creates a keyId from an {@link AuthenticationDetailsProvider}. + * + * @param provider + * The provider + * @return The keyId used to sign requests + */ + public static String createKeyId(@Nonnull AuthenticationDetailsProvider provider) { + return createKeyId(provider.getTenantId(), provider.getUserId(), provider.getFingerprint()); + } +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/SimpleAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/SimpleAuthenticationDetailsProvider.java index 2393e5a7303..7cf03ced51d 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/auth/SimpleAuthenticationDetailsProvider.java +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/SimpleAuthenticationDetailsProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.auth; @@ -15,7 +15,8 @@ * returns configured values. */ @Builder -public class SimpleAuthenticationDetailsProvider implements AuthenticationDetailsProvider { +public class SimpleAuthenticationDetailsProvider extends CustomerAuthenticationDetailsProvider + implements AuthenticationDetailsProvider { @Getter(onMethod = @__({@Override})) private final String tenantId; diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/SimplePrivateKeySupplier.java b/bmc-common/src/main/java/com/oracle/bmc/auth/SimplePrivateKeySupplier.java index 461f855a399..db1ca750ef7 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/auth/SimplePrivateKeySupplier.java +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/SimplePrivateKeySupplier.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.auth; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/ClientConfigurator.java b/bmc-common/src/main/java/com/oracle/bmc/http/ClientConfigurator.java index 49a4df77803..14695ab8ec5 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/ClientConfigurator.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/ClientConfigurator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/DefaultConfigurator.java b/bmc-common/src/main/java/com/oracle/bmc/http/DefaultConfigurator.java index 65e734bcfb0..e74c01fc558 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/DefaultConfigurator.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/DefaultConfigurator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/AuthnClientFilter.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/AuthnClientFilter.java index 2d619d73b7b..71df5698d91 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/AuthnClientFilter.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/AuthnClientFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ClientIdFilter.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ClientIdFilter.java index 88aee5c277d..b4a6fceca89 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ClientIdFilter.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ClientIdFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/EntityFactory.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/EntityFactory.java index 7db194d1b4c..d38b9442739 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/EntityFactory.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/EntityFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ErrorConsumer.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ErrorConsumer.java index eeb5bfe50f6..a5933023a33 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ErrorConsumer.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ErrorConsumer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/HeaderUtils.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/HeaderUtils.java index a034bb37c5c..619d092b8e7 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/HeaderUtils.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/HeaderUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/HttpDateUtils.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/HttpDateUtils.java index 380d9735086..f0cc7cb7549 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/HttpDateUtils.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/HttpDateUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/LogHeadersFilter.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/LogHeadersFilter.java index 145fb82a152..e4fefa89836 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/LogHeadersFilter.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/LogHeadersFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/RequestIdFilter.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/RequestIdFilter.java index 1e1d1512e97..8e4131dffb4 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/RequestIdFilter.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/RequestIdFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseConversionFunctionFactory.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseConversionFunctionFactory.java index 7f508130331..a38785101f6 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseConversionFunctionFactory.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseConversionFunctionFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseHelper.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseHelper.java index 0b3224a1efa..72dfd865bec 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseHelper.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseHelper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClient.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClient.java index 912952f69b4..cb78b4e976e 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClient.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClient.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactory.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactory.java index a6fbfe295aa..727db6f8263 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactory.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; @@ -14,11 +14,9 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.Service; import com.oracle.bmc.auth.AuthenticationDetailsProvider; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.signing.RequestSigner; -import com.oracle.bmc.http.signing.RequestSignerFactory; /** * RestClientFactory is responsible for creating a new REST client whenever a @@ -40,7 +38,6 @@ public class RestClientFactory { DEFAULT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); } - private final RequestSignerFactory requestSignerFactory; private final ClientConfigurator clientConfigurator; /** @@ -52,11 +49,8 @@ public class RestClientFactory { * @param requestSignerFactory * The factory used to generate request signers. */ - public RestClientFactory( - @Nonnull ClientConfigurator clientConfigurator, - @Nonnull RequestSignerFactory requestSignerFactory) { + public RestClientFactory(@Nonnull ClientConfigurator clientConfigurator) { this.clientConfigurator = clientConfigurator; - this.requestSignerFactory = requestSignerFactory; } /** @@ -68,8 +62,8 @@ public RestClientFactory( * The auth provider to use. * @return A new RestClient instance. */ - public RestClient create(Service service, AuthenticationDetailsProvider authProvider) { - return this.create(service, authProvider, ClientConfiguration.builder().build()); + public RestClient create(RequestSigner requestSigner) { + return this.create(requestSigner, null); } /** @@ -84,13 +78,9 @@ public RestClient create(Service service, AuthenticationDetailsProvider authProv * configuration. * @return A new RestClient instance. */ - public RestClient create( - Service service, - AuthenticationDetailsProvider authProvider, - ClientConfiguration configuration) { + public RestClient create(RequestSigner requestSigner, ClientConfiguration configuration) { ClientConfiguration clientConfigurationToUse = configuration != null ? configuration : ClientConfiguration.builder().build(); - RequestSigner requestSigner = this.createRequestSigner(service, authProvider); Client client = createClient(requestSigner, clientConfigurationToUse, this.clientConfigurator); return new RestClient(client, new EntityFactory()); @@ -124,8 +114,13 @@ private static Client createClient( return client; } - private RequestSigner createRequestSigner( - Service service, AuthenticationDetailsProvider authProvider) { - return this.requestSignerFactory.createRequestSigner(service, authProvider); + /** + * Returns the ObjectMapper used to handle JSON requests. + *

+ * Exposed only for internal use. + * @return The ObjectMapper used. + */ + public static ObjectMapper getObjectMapper() { + return DEFAULT_MAPPER; } } diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactoryBuilder.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactoryBuilder.java index 3645f387cbc..3e65e689503 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactoryBuilder.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactoryBuilder.java @@ -1,13 +1,11 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; import com.google.common.base.MoreObjects; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.DefaultConfigurator; -import com.oracle.bmc.http.signing.RequestSignerFactory; -import com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -19,7 +17,6 @@ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class RestClientFactoryBuilder { private ClientConfigurator clientConfigurator; - private RequestSignerFactory requestSignerFactory; /** * Create a new builder instance. @@ -40,17 +37,6 @@ public RestClientFactoryBuilder clientConfigurator(ClientConfigurator clientConf return this; } - /** - * Sets the RequestSignerFactory to use, or null to use the {@link DefaultRequestSignerFactory}. - * @param requestSignerFactory The request signer factory to use. - * @return The builder. - */ - public RestClientFactoryBuilder requestSignerFactory( - RequestSignerFactory requestSignerFactory) { - this.requestSignerFactory = requestSignerFactory; - return this; - } - /** * Builds a new RestClientFactory using the options provided. Options that were not set will * use default values. @@ -60,9 +46,7 @@ public RestClientFactoryBuilder requestSignerFactory( public RestClientFactory build() { ClientConfigurator clientConfigurator = MoreObjects.firstNonNull(this.clientConfigurator, new DefaultConfigurator()); - RequestSignerFactory requestSignerFactory = - MoreObjects.firstNonNull( - this.requestSignerFactory, new DefaultRequestSignerFactory()); - return new RestClientFactory(clientConfigurator, requestSignerFactory); + + return new RestClientFactory(clientConfigurator); } } diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/SuccessConsumer.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/SuccessConsumer.java index 6c86398ac6c..73741b2c7d5 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/SuccessConsumer.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/SuccessConsumer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/WithHeaders.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/WithHeaders.java index 2994f2f781d..685b42499d3 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/WithHeaders.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/WithHeaders.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/DefaultRequestSigner.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/DefaultRequestSigner.java new file mode 100644 index 00000000000..488b491008b --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/DefaultRequestSigner.java @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.http.signing; + +import com.oracle.bmc.InternalSdk; +import com.oracle.bmc.auth.BasicAuthenticationDetailsProvider; +import com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +/** + * Class that exposes a way to create a {@link RequestSigner} for use with BMC. + * The returned signers implement signing strategies outlined by the + * signing guidelines. + *

+ * This is only exposed so clients can write REST calls directly against BMCS + * without using the SDK provided clients, but this class may change without + * notice -- users are encouraged to use the SDK provided clients. + */ +@InternalSdk +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class DefaultRequestSigner { + + /** + * Creates a new RequestSigner using the {@link SigningStrategy#STANDARD}. + * + * @param authProvider + * The auth details provider to use. + * @return A new signer instance. + */ + public static RequestSigner createRequestSigner( + BasicAuthenticationDetailsProvider authProvider) { + return createRequestSigner(authProvider, SigningStrategy.STANDARD); + } + + /** + * Creates a new RequestSigner using the given signing strategy. + * + * @param authProvider + * The auth details provider to use. + * @param signingStrategy + * The strategy to use. + * @return A new signer instance. + */ + public static RequestSigner createRequestSigner( + BasicAuthenticationDetailsProvider authProvider, SigningStrategy signingStrategy) { + // default factory does not need the Service param + return new DefaultRequestSignerFactory(signingStrategy) + .createRequestSigner(null, authProvider); + } +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/RequestSigner.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/RequestSigner.java index 1d1d399784b..17337d88baf 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/RequestSigner.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/RequestSigner.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/RequestSignerFactory.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/RequestSignerFactory.java index 50875d87b81..0b4c6818047 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/RequestSignerFactory.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/RequestSignerFactory.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing; import com.oracle.bmc.Service; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider; /** * Factory class to create RequestSigner instances. @@ -15,8 +15,9 @@ public interface RequestSignerFactory { * Creates a new RequestSigner instance from the given provider and type of service. * * @param service The service type. - * @param authProvider The auth provider. + * @param abstractAuthProvider The authentication details provider. * @return A new RequestSigner instance. */ - RequestSigner createRequestSigner(Service service, AuthenticationDetailsProvider authProvider); + RequestSigner createRequestSigner( + Service service, AbstractAuthenticationDetailsProvider abstractAuthProvider); } diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SigningStrategy.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/SigningStrategy.java similarity index 79% rename from bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SigningStrategy.java rename to bmc-common/src/main/java/com/oracle/bmc/http/signing/SigningStrategy.java index b922f59e7df..4957c6819e7 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SigningStrategy.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/SigningStrategy.java @@ -1,11 +1,13 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ -package com.oracle.bmc.http.signing.internal; +package com.oracle.bmc.http.signing; import java.util.List; import com.google.common.collect.ImmutableMap; +import com.oracle.bmc.InternalSdk; +import com.oracle.bmc.http.signing.internal.Constants; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -13,6 +15,7 @@ /** * Enum for the various signing strategies used by BMC. */ +@InternalSdk @RequiredArgsConstructor @Getter public enum SigningStrategy { diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Algorithm.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Algorithm.java index b75c86fffe1..5c24459cfbd 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Algorithm.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Algorithm.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Constants.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Constants.java index 81a1df27ddd..cc93931fac7 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Constants.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Constants.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing.internal; @@ -8,7 +8,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -class Constants { +public class Constants { // Headers static final String AUTHORIZATION_HEADER = "authorization"; @@ -38,7 +38,7 @@ class Constants { static final ImmutableList ALL_HEADERS = ImmutableList.builder().addAll(GENERIC_HEADERS).addAll(BODY_HEADERS).build(); - static final ImmutableMap> REQUIRED_SIGNING_HEADERS = + public static final ImmutableMap> REQUIRED_SIGNING_HEADERS = ImmutableMap.>builder() .put("get", GENERIC_HEADERS) .put("head", GENERIC_HEADERS) @@ -48,7 +48,7 @@ class Constants { .put("options", ImmutableList.of()) .build(); - static final ImmutableMap> REQUIRED_OBJECTSTORAGE_SIGNING_HEADERS = + public static final ImmutableMap> REQUIRED_OBJECTSTORAGE_SIGNING_HEADERS = ImmutableMap.>builder() .put("get", GENERIC_HEADERS) .put("head", GENERIC_HEADERS) diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/DefaultRequestSignerFactory.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/DefaultRequestSignerFactory.java index 64c845d759c..31fa0390ae5 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/DefaultRequestSignerFactory.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/DefaultRequestSignerFactory.java @@ -1,65 +1,96 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing.internal; import java.security.interfaces.RSAPrivateKey; -import com.oracle.bmc.OCID; +import com.google.common.base.Optional; +import com.google.common.base.Supplier; import com.oracle.bmc.Service; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider; +import com.oracle.bmc.auth.BasicAuthenticationDetailsProvider; import com.oracle.bmc.http.signing.RequestSigner; import com.oracle.bmc.http.signing.RequestSignerFactory; +import com.oracle.bmc.http.signing.SigningStrategy; -import lombok.extern.slf4j.Slf4j; +import lombok.RequiredArgsConstructor; /** - * Factory class to create RequestSigner instances. Takes care to determining + * Factory class to create RequestSigner instances. Takes care of determining * what signing strategy to use. + *

+ * This factory supports authentication providers that inherit from + * {@link BasicAuthenticationDetailsProvider}. */ -@Slf4j +@RequiredArgsConstructor public class DefaultRequestSignerFactory implements RequestSignerFactory { + private final SigningStrategy signingStrategy; /** - * Creates a new RequestSigner instance from the given provider and type of - * service. - * - * @param service - * The service type. - * @param authProvider - * The auth provider. - * @return A new RequestSigner instance. + * {@inheritDoc} + *

+ * Note, service parameter is not used by this factory. */ @Override public RequestSigner createRequestSigner( - Service service, AuthenticationDetailsProvider authProvider) { - KeySupplier keySupplier = - new PEMFileRSAPrivateKeySupplier( - authProvider.getPrivateKey(), authProvider.getPassPhrase()); - String keyId = createKeyId(authProvider); - // object storage uses a different strategy - if (service.getServiceName().equals("OBJECTSTORAGE")) { - return new RequestSignerImpl(keySupplier, SigningStrategy.OBJECT_STORAGE, keyId); + Service service, AbstractAuthenticationDetailsProvider abstractAuthProvider) { + if (!(abstractAuthProvider instanceof BasicAuthenticationDetailsProvider)) { + throw new IllegalArgumentException( + "Unsupported auth provider type: " + abstractAuthProvider.getClass().getName()); } - return new RequestSignerImpl(keySupplier, SigningStrategy.STANDARD, keyId); + + final BasicAuthenticationDetailsProvider authProvider = + (BasicAuthenticationDetailsProvider) abstractAuthProvider; + + Supplier keyIdSupplier = createKeyIdSupplier(authProvider); + KeySupplier keySupplier = createKeySupplier(authProvider); + + return new RequestSignerImpl(keySupplier, signingStrategy, keyIdSupplier); } - private static String createKeyId(AuthenticationDetailsProvider authProvider) { - // currently just log a warning as the format is not published - if (!OCID.isValid(authProvider.getTenantId())) { - LOG.warn("tenantId '{}' does not match expected pattern", authProvider.getTenantId()); + private static Supplier createKeyIdSupplier( + final BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + // if auth caching is disabled, fetch the ID on every request + if (authenticationDetailsProvider + instanceof AbstractAuthenticationDetailsProvider.DisableAuthCaching) { + return new Supplier() { + @Override + public String get() { + return authenticationDetailsProvider.getKeyId(); + } + }; } - if (!OCID.isValid(authProvider.getUserId())) { - LOG.warn("userId '{}' does not match expected pattern", authProvider.getUserId()); + + // else fetch it now and return a fixed supplier + final String keyId = authenticationDetailsProvider.getKeyId(); + return new Supplier() { + @Override + public String get() { + return keyId; + } + }; + } + + private static KeySupplier createKeySupplier( + final BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + // if auth caching is disabled, parse the stream on every request + if (authenticationDetailsProvider + instanceof AbstractAuthenticationDetailsProvider.DisableAuthCaching) { + return new KeySupplier() { + @Override + public Optional getKey(String keyId) { + return new PEMFileRSAPrivateKeySupplier( + authenticationDetailsProvider.getPrivateKey(), + authenticationDetailsProvider.getPassPhrase()) + .getKey(keyId); + } + }; } - String keyId = - String.format( - "%s/%s/%s", - authProvider.getTenantId(), - authProvider.getUserId(), - authProvider.getFingerprint()); - LOG.debug("Using keyId: {}", keyId); - return keyId; + // else parse once now and return a fixed supplier + return new PEMFileRSAPrivateKeySupplier( + authenticationDetailsProvider.getPrivateKey(), + authenticationDetailsProvider.getPassPhrase()); } } diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/KeyIdType.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/KeyIdType.java index fa659044cbd..2193ec0f0b3 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/KeyIdType.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/KeyIdType.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/KeySupplier.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/KeySupplier.java index 980dfaba81c..e7ef9f6504e 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/KeySupplier.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/KeySupplier.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java index 29e4c6ba233..cf66293ab7f 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/RequestSignerImpl.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/RequestSignerImpl.java index 9c0e121c26f..ef831fd1b35 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/RequestSignerImpl.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/RequestSignerImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing.internal; @@ -27,11 +27,13 @@ import org.apache.commons.lang3.StringUtils; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import com.google.common.base.Supplier; import com.google.common.hash.Hashing; +import com.oracle.bmc.http.internal.RestClientFactory; import com.oracle.bmc.http.signing.RequestSigner; +import com.oracle.bmc.http.signing.SigningStrategy; import lombok.extern.slf4j.Slf4j; @@ -43,12 +45,11 @@ @Immutable @Slf4j public class RequestSignerImpl implements RequestSigner { - private static final ObjectMapper MAPPER = new ObjectMapper(); private static final SignatureSigner SIGNER = new SignatureSigner(); private final KeySupplier keySupplier; private final SigningStrategy signingStrategy; - private final String keyId; + private final Supplier keyIdSupplier; /** * Construct the RequestSigner with the specified KeySupplier. This will be @@ -60,10 +61,10 @@ public class RequestSignerImpl implements RequestSigner { public RequestSignerImpl( @Nonnull final KeySupplier keySupplier, @Nonnull final SigningStrategy signingStrategy, - @Nonnull final String keyId) { + @Nonnull final Supplier keyIdSupplier) { this.keySupplier = Preconditions.checkNotNull(keySupplier); this.signingStrategy = Preconditions.checkNotNull(signingStrategy); - this.keyId = Preconditions.checkNotNull(keyId); + this.keyIdSupplier = Preconditions.checkNotNull(keyIdSupplier); } @Override @@ -98,8 +99,9 @@ private Map signRequest( !StringUtils.isBlank(versionName), "versionName must not be null or empty"); try { + String keyId = keyIdSupplier.get(); Version version = validateVersion(versionName, algorithm); - final RSAPrivateKey key = getPrivateKey(); + final RSAPrivateKey key = getPrivateKey(keyId); // copy of headers as case-insensitive, do not modify input map final Map caseInsensitiveHeaders = ignoreCaseHeaders(headers); final String lowerHttpMethod = httpMethod.toLowerCase(); @@ -113,7 +115,12 @@ private Map signRequest( final String signature = sign(key, algorithm, stringToSign); injectAuthorizationHeader( - lowerHttpMethod, signedHeaders, signature, algorithm, version.getVersionName()); + keyId, + lowerHttpMethod, + signedHeaders, + signature, + algorithm, + version.getVersionName()); return signedHeaders; } catch (final Exception ex) { @@ -143,12 +150,8 @@ private Version validateVersion(String version, Algorithm algorithm) { return srVersion; } - private RSAPrivateKey getPrivateKey() { - Optional keyOptional = Optional.absent(); - - if (keySupplier != null) { - keyOptional = keySupplier.getKey(keyId); - } + private RSAPrivateKey getPrivateKey(String keyId) { + Optional keyOptional = keySupplier.getKey(keyId); // TODO: throw exception for now so it's re-thrown as // SignedRequestException @@ -195,14 +198,11 @@ private void injectMissingHeaders( caseInsensitiveHeaders.put(Constants.HOST, uri.getHost()); } + // supply content-type, content-length and x-content-sha256 if missing (PUT and POST only) if (httpMethod.equals("put") || httpMethod.equals("post")) { - // In normal cases, supply content-type, content-length and - // x-content-sha256 if missing (PUT and POST only). - // This is not needed if the body is streaming and the strategy - // says they can be skipped - + // only exception is for streaming bodies for PUT if the signing strategy allows it to be skipped if (body instanceof InputStream) { - if (signingStrategy.isSkipContentHeadersForStreamingRequests()) { + if (httpMethod.equals("put") && signingStrategy.isSkipContentHeadersForStreamingRequests()) { return; } else { throw new IllegalArgumentException( @@ -368,10 +368,11 @@ private String sign(RSAPrivateKey key, Algorithm algorithm, String stringToSign) } private void injectAuthorizationHeader( + final String keyId, final String httpMethod, final Map signedHeaders, final String signature, - Algorithm algorithm, + final Algorithm algorithm, final String version) { // Don't need a null check since the lookup would have failed when we // first signed the headers @@ -420,7 +421,9 @@ private static byte[] getJsonBody(Object body) throws JsonProcessingException { if (body == null) { return "".getBytes(); } - String bodyAsString = MAPPER.writeValueAsString(body); + // use the same object mapper as the rest client to ensure the configurations match + // what is sent + String bodyAsString = RestClientFactory.getObjectMapper().writeValueAsString(body); // Annoying ObjectMapper edge case: If given a set of empty braces, it // adds a set of quotes that causes auth to fail on the server-side as diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SignatureSigner.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SignatureSigner.java index 1bf42dfe275..67063035f2a 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SignatureSigner.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SignatureSigner.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SignedRequestException.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SignedRequestException.java index aecf6edc66b..27611acf6cd 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SignedRequestException.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SignedRequestException.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SignedRequestVersion.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SignedRequestVersion.java index 9e0bec145ef..6c4c8efd8e5 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SignedRequestVersion.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/SignedRequestVersion.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Version.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Version.java index 26d046b496f..bdbd9964e09 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Version.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Version.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.signing.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/io/DuplicatableInputStream.java b/bmc-common/src/main/java/com/oracle/bmc/io/DuplicatableInputStream.java new file mode 100644 index 00000000000..6d69ad8f6b2 --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/io/DuplicatableInputStream.java @@ -0,0 +1,24 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.io; + +import java.io.InputStream; + +/** + * Interface describing an InputStream that can safely be duplicated from its start and used + * in a thread-safe manner. + *

+ * Add this to any class that implements {@link InputStream} and can safely duplicate that stream. + * Duplicate streams can be used, for example, when uploading objects to object storage to allow + * for parallel uploads. + */ +public interface DuplicatableInputStream { + + /** + * Produces a duplicate stream of the source (from its start) that can be used in parallel + * to the original stream (ie, thread safe). + * @return A new input stream instance. + */ + InputStream duplicate(); +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/io/internal/WrappedByteArrayInputStream.java b/bmc-common/src/main/java/com/oracle/bmc/io/internal/WrappedByteArrayInputStream.java new file mode 100644 index 00000000000..357f709eba9 --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/io/internal/WrappedByteArrayInputStream.java @@ -0,0 +1,39 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.io.internal; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +import com.oracle.bmc.io.DuplicatableInputStream; + +/** + * Basic extension to {@link ByteArrayInputStream} that lets you create duplicate + * streams from the same underlying byte buffer. + */ +public class WrappedByteArrayInputStream extends ByteArrayInputStream + implements DuplicatableInputStream { + + /** + * Create a new stream from the given buffer. + * @param buf The byte buffer. + */ + public WrappedByteArrayInputStream(byte[] buf) { + super(buf); + } + + /** + * Returns the length of the underlying buffer (ie, the length of this stream). + * + * @return The length of the underlying buffer. + */ + public long length() { + return buf.length; + } + + @Override + public InputStream duplicate() { + return new WrappedByteArrayInputStream(this.buf); + } +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/io/internal/WrappedFileInputStream.java b/bmc-common/src/main/java/com/oracle/bmc/io/internal/WrappedFileInputStream.java new file mode 100644 index 00000000000..92dc122bbec --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/io/internal/WrappedFileInputStream.java @@ -0,0 +1,70 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.io.internal; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; + +import com.oracle.bmc.io.DuplicatableInputStream; + +import lombok.Getter; + +/** + * Simple wrapper over FileInputStream that also exposes the File used + * to create the stream. + *

+ * This version also support mark/reset. + */ +public class WrappedFileInputStream extends FileInputStream implements DuplicatableInputStream { + @Getter private final File sourceFile; + + private long markPosition = 0L; + + public WrappedFileInputStream(File file) throws FileNotFoundException { + super(file); + this.sourceFile = file; + } + + @Override + public boolean markSupported() { + return true; + } + + @Override + public synchronized void mark(int readlimit) { + try { + markPosition = super.getChannel().position(); + } catch (IOException e) { + throw new IllegalStateException("Could not mark position"); + } + } + + @Override + public synchronized void reset() throws IOException { + super.getChannel().position(markPosition); + } + + @Override + public InputStream duplicate() { + return create(sourceFile); + } + + /** + * Same as calling the ctor, except will throw an unchecked IllegalArgumentException + * if the file isn't found. + * + * @param file the file to read from. + * @return a new stream. + */ + public static WrappedFileInputStream create(File file) { + try { + return new WrappedFileInputStream(file); + } catch (FileNotFoundException e) { + throw new IllegalArgumentException("File not found", e); + } + } +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/model/BmcException.java b/bmc-common/src/main/java/com/oracle/bmc/model/BmcException.java index e3d02b688c0..9b888d081e9 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/model/BmcException.java +++ b/bmc-common/src/main/java/com/oracle/bmc/model/BmcException.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.model; diff --git a/bmc-common/src/main/java/com/oracle/bmc/model/Range.java b/bmc-common/src/main/java/com/oracle/bmc/model/Range.java index 9a3b09c9d11..63e3c55f658 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/model/Range.java +++ b/bmc-common/src/main/java/com/oracle/bmc/model/Range.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.model; diff --git a/bmc-common/src/main/java/com/oracle/bmc/responses/AsyncHandler.java b/bmc-common/src/main/java/com/oracle/bmc/responses/AsyncHandler.java index 5345cf9929b..1c5d00843b5 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/responses/AsyncHandler.java +++ b/bmc-common/src/main/java/com/oracle/bmc/responses/AsyncHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.responses; diff --git a/bmc-common/src/main/java/com/oracle/bmc/util/JavaRuntimeUtils.java b/bmc-common/src/main/java/com/oracle/bmc/util/JavaRuntimeUtils.java index dd87a4ebaa9..32de58a4eec 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/util/JavaRuntimeUtils.java +++ b/bmc-common/src/main/java/com/oracle/bmc/util/JavaRuntimeUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.util; diff --git a/bmc-common/src/main/java/com/oracle/bmc/util/StreamUtils.java b/bmc-common/src/main/java/com/oracle/bmc/util/StreamUtils.java new file mode 100644 index 00000000000..135927b52bd --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/util/StreamUtils.java @@ -0,0 +1,66 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.util; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +import com.oracle.bmc.io.internal.WrappedByteArrayInputStream; +import com.oracle.bmc.io.internal.WrappedFileInputStream; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +/** + * Utility methods to work with streams. + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +@Slf4j +public class StreamUtils { + + /** + * Close a stream without raising an exception. + * + * @param stream + * The stream to close. + */ + public static void closeQuietly(InputStream stream) { + if (stream != null) { + try { + stream.close(); + } catch (IOException e) { + LOG.debug("Did not close steam successfully", e); + } + } + } + + /** + * Convert a File to an InputStream. This uses {@link WrappedFileInputStream} + * so the caller still has access to the original file if needed. If the file + * is not valid, an IllegalArgumentException will be raised. + * + * @param file + * The file to convert to a stream. + * @return A new InputStream instance. + */ + public static InputStream toInputStream(File file) { + return WrappedFileInputStream.create(file); + } + + /** + * Creates a new {@link ByteArrayInputStream}. This uses + * {@link WrappedByteArrayInputStream} so the underlying buffer can be + * reused by multiple copies of the stream if needed. + * + * @param buffer + * The byte buffer. + * @return A new ByteArrayInputStream instance. + */ + public static ByteArrayInputStream createByteArrayInputStream(byte[] buffer) { + return new WrappedByteArrayInputStream(buffer); + } +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/util/internal/Consumer.java b/bmc-common/src/main/java/com/oracle/bmc/util/internal/Consumer.java index dd2fdf4c8a1..9a584c33e8e 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/util/internal/Consumer.java +++ b/bmc-common/src/main/java/com/oracle/bmc/util/internal/Consumer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.util.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/util/internal/FileUtils.java b/bmc-common/src/main/java/com/oracle/bmc/util/internal/FileUtils.java index 4f85a69fcca..68be724be95 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/util/internal/FileUtils.java +++ b/bmc-common/src/main/java/com/oracle/bmc/util/internal/FileUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.util.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/util/internal/HttpUtils.java b/bmc-common/src/main/java/com/oracle/bmc/util/internal/HttpUtils.java index 425f4f35479..02f2954f87e 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/util/internal/HttpUtils.java +++ b/bmc-common/src/main/java/com/oracle/bmc/util/internal/HttpUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.util.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/util/internal/ReflectionUtils.java b/bmc-common/src/main/java/com/oracle/bmc/util/internal/ReflectionUtils.java index d48da6a7446..106edb0795a 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/util/internal/ReflectionUtils.java +++ b/bmc-common/src/main/java/com/oracle/bmc/util/internal/ReflectionUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.util.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/util/internal/StreamDuplicator.java b/bmc-common/src/main/java/com/oracle/bmc/util/internal/StreamDuplicator.java new file mode 100644 index 00000000000..46bf3634f0b --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/util/internal/StreamDuplicator.java @@ -0,0 +1,67 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.util.internal; + +import java.io.InputStream; + +import com.google.common.base.Supplier; +import com.oracle.bmc.io.DuplicatableInputStream; + +import lombok.AccessLevel; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor(access = AccessLevel.PRIVATE) +public class StreamDuplicator { + private final Supplier streamSupplier; + + /** + * Test to see whether the stream can be duplicated, such that multiple + * readers can read from the same underlying stream in parallel without + * problems. + *

+ * Duplicatable streams are currently those that implement {@link DuplicatableInputStream}. + * + * @param stream + * The stream to test. + * @return true if the stream can be duplicated, false if not. + */ + public static boolean canDuplicate(InputStream stream) { + return stream instanceof DuplicatableInputStream; + } + + /** + * Creates a new duplicator that can copy a stream into a brand new instance + * that can be read from independently of the given one. + *

+ * Callers should first call {@link #canDuplicate(InputStream)} to verify the + * stream can be duplicated. + * + * @param stream + * The stream to duplicate. + * @return A new duplicator instance. + */ + public static StreamDuplicator createDuplicator(InputStream stream) { + DuplicatableInputStream duplicateStream = (DuplicatableInputStream) stream; + return new StreamDuplicator(new DuplicateSupplier(duplicateStream)); + } + + /** + * Creates a duplicate stream. + * + * @return A new stream. + */ + public InputStream duplicate() { + return streamSupplier.get(); + } + + @RequiredArgsConstructor + private static class DuplicateSupplier implements Supplier { + private final DuplicatableInputStream inputStream; + + @Override + public InputStream get() { + return inputStream.duplicate(); + } + } +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/util/internal/TransformingFuture.java b/bmc-common/src/main/java/com/oracle/bmc/util/internal/TransformingFuture.java index 55cc9c3bb1e..e95a82039b8 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/util/internal/TransformingFuture.java +++ b/bmc-common/src/main/java/com/oracle/bmc/util/internal/TransformingFuture.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.util.internal; diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/BmcGenericWaiter.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/BmcGenericWaiter.java index b452b3f0bce..4f6e7154bd5 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/waiter/BmcGenericWaiter.java +++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/BmcGenericWaiter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/DelayStrategy.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/DelayStrategy.java index f66f8955cad..5116ed4670a 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/waiter/DelayStrategy.java +++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/DelayStrategy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/ExponentialBackoffDelayStrategy.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/ExponentialBackoffDelayStrategy.java index f818687d98e..cd9bd034a94 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/waiter/ExponentialBackoffDelayStrategy.java +++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/ExponentialBackoffDelayStrategy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/FixedTimeDelayStrategy.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/FixedTimeDelayStrategy.java index 49d48f34ba3..d1864d5f84c 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/waiter/FixedTimeDelayStrategy.java +++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/FixedTimeDelayStrategy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/GenericWaiter.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/GenericWaiter.java index 8385bebebbe..53c94cc9420 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/waiter/GenericWaiter.java +++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/GenericWaiter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/MaxAttemptsTerminationStrategy.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/MaxAttemptsTerminationStrategy.java index 7a654b851ba..01f86204656 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/waiter/MaxAttemptsTerminationStrategy.java +++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/MaxAttemptsTerminationStrategy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/MaxTimeTerminationStrategy.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/MaxTimeTerminationStrategy.java index ac51f59cc8f..357af0de30c 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/waiter/MaxTimeTerminationStrategy.java +++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/MaxTimeTerminationStrategy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/TerminationStrategy.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/TerminationStrategy.java index aa4338df972..053cf7db27a 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/waiter/TerminationStrategy.java +++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/TerminationStrategy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/Waiter.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/Waiter.java index 96dc73866b1..c372381acf8 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/waiter/Waiter.java +++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/Waiter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/WaiterConfiguration.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/WaiterConfiguration.java index b80be927b53..f9234d1c9e2 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/waiter/WaiterConfiguration.java +++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/WaiterConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/Waiters.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/Waiters.java index cc0e507cec2..1aa68655df7 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/waiter/Waiters.java +++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/Waiters.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/internal/SimpleWaiterImpl.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/internal/SimpleWaiterImpl.java index dad0dd9723d..802ac51edda 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/waiter/internal/SimpleWaiterImpl.java +++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/internal/SimpleWaiterImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter.internal; diff --git a/bmc-common/src/test/java/com/oracle/bmc/ConfigFileReaderTest.java b/bmc-common/src/test/java/com/oracle/bmc/ConfigFileReaderTest.java index 858d9dba369..0991d5ca8ba 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/ConfigFileReaderTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/ConfigFileReaderTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc; diff --git a/bmc-common/src/test/java/com/oracle/bmc/OCIDTest.java b/bmc-common/src/test/java/com/oracle/bmc/OCIDTest.java index d952b2d5f44..115afeae96a 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/OCIDTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/OCIDTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc; diff --git a/bmc-common/src/test/java/com/oracle/bmc/http/internal/HttpDateUtilsTest.java b/bmc-common/src/test/java/com/oracle/bmc/http/internal/HttpDateUtilsTest.java index 30734764227..d2f0c20243a 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/http/internal/HttpDateUtilsTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/http/internal/HttpDateUtilsTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/test/java/com/oracle/bmc/http/internal/RequestIdFilterTest.java b/bmc-common/src/test/java/com/oracle/bmc/http/internal/RequestIdFilterTest.java index c22a1b99041..f476968a3e3 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/http/internal/RequestIdFilterTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/http/internal/RequestIdFilterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.http.internal; diff --git a/bmc-common/src/test/java/com/oracle/bmc/io/internal/WrappedByteArrayInputStreamTest.java b/bmc-common/src/test/java/com/oracle/bmc/io/internal/WrappedByteArrayInputStreamTest.java new file mode 100644 index 00000000000..d80ba331ee1 --- /dev/null +++ b/bmc-common/src/test/java/com/oracle/bmc/io/internal/WrappedByteArrayInputStreamTest.java @@ -0,0 +1,44 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.io.internal; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import org.junit.Test; + +@SuppressWarnings("resource") // no need to close any streams here +public class WrappedByteArrayInputStreamTest { + + @Test + public void length() { + byte[] buffer = new byte[35]; + + WrappedByteArrayInputStream stream = new WrappedByteArrayInputStream(buffer); + assertEquals(35, stream.length()); + } + + @Test + public void duplicate() throws IOException { + byte[] buffer = new byte[35]; + buffer[5] = 'c'; + buffer[8] = 'd'; + + WrappedByteArrayInputStream stream1 = new WrappedByteArrayInputStream(buffer); + byte[] stream1buffer = new byte[10]; + int read1 = stream1.read(stream1buffer); + assertEquals(10, read1); + + WrappedByteArrayInputStream stream2 = (WrappedByteArrayInputStream) stream1.duplicate(); + byte[] stream2buffer = new byte[10]; + int read2 = stream2.read(stream2buffer); + assertEquals(10, read2); + + for (int i = 0; i < 10; i++) { + assertEquals(buffer[i], stream1buffer[i]); + assertEquals(buffer[i], stream2buffer[i]); + } + } +} diff --git a/bmc-common/src/test/java/com/oracle/bmc/io/internal/WrappedFileInputStreamTest.java b/bmc-common/src/test/java/com/oracle/bmc/io/internal/WrappedFileInputStreamTest.java new file mode 100644 index 00000000000..42eba33943d --- /dev/null +++ b/bmc-common/src/test/java/com/oracle/bmc/io/internal/WrappedFileInputStreamTest.java @@ -0,0 +1,81 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.io.internal; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class WrappedFileInputStreamTest { + private static final String MESSAGE = "abcdefghijklmnopqrstuvwxyz"; + private File tmpFile; + + @Before + public void setUp() throws IOException { + tmpFile = File.createTempFile("WrappedFileInputStreamTest", null); + tmpFile.deleteOnExit(); + + FileOutputStream fos = new FileOutputStream(tmpFile); + fos.write(MESSAGE.getBytes()); + fos.close(); + } + + @After + public void tearDown() throws IOException { + if (tmpFile != null) { + tmpFile.delete(); + } + } + + @Test + public void getSourceFile() throws IOException { + try (WrappedFileInputStream wrappedStream = new WrappedFileInputStream(tmpFile)) { + assertSame(tmpFile, wrappedStream.getSourceFile()); + } + } + + @Test + public void markReset() throws IOException { + try (WrappedFileInputStream wrappedStream = new WrappedFileInputStream(tmpFile)) { + // mark supported + assertTrue(wrappedStream.markSupported()); + + // advance 3 + wrappedStream.read(); + wrappedStream.read(); + wrappedStream.read(); + + // mark + wrappedStream.mark(100); + + // advance 3 more + wrappedStream.read(); + wrappedStream.read(); + wrappedStream.read(); + + // verify location + assertEquals('g', wrappedStream.read()); + + // skip 3 + wrappedStream.skip(3L); + + // verify location + assertEquals('k', wrappedStream.read()); + + // reset + wrappedStream.reset(); + + // verify location + assertEquals('d', wrappedStream.read()); + } + } +} diff --git a/bmc-common/src/test/java/com/oracle/bmc/model/RangeTest.java b/bmc-common/src/test/java/com/oracle/bmc/model/RangeTest.java index 7a0bd444cf9..1c754477b4e 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/model/RangeTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/model/RangeTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.model; diff --git a/bmc-common/src/test/java/com/oracle/bmc/util/JavaRuntimeUtilsTest.java b/bmc-common/src/test/java/com/oracle/bmc/util/JavaRuntimeUtilsTest.java index 03c42771755..29b87919de2 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/util/JavaRuntimeUtilsTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/util/JavaRuntimeUtilsTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.util; diff --git a/bmc-common/src/test/java/com/oracle/bmc/util/StreamUtilsTest.java b/bmc-common/src/test/java/com/oracle/bmc/util/StreamUtilsTest.java new file mode 100644 index 00000000000..96170e15f69 --- /dev/null +++ b/bmc-common/src/test/java/com/oracle/bmc/util/StreamUtilsTest.java @@ -0,0 +1,33 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.util; + +import static org.junit.Assert.assertNotNull; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +import org.junit.Test; + +import com.oracle.bmc.util.StreamUtils; + +public class StreamUtilsTest { + + @Test(expected = IllegalArgumentException.class) + public void fileToInputStream_invalidFile() { + StreamUtils.toInputStream(new File("/asdfjkl")); + } + + @Test + public void fileToInputStream() throws IOException { + File file = File.createTempFile("StreamUtilsTest", null); + file.deleteOnExit(); + + InputStream stream = StreamUtils.toInputStream(file); + assertNotNull(stream); + + file.delete(); + } +} diff --git a/bmc-common/src/test/java/com/oracle/bmc/util/internal/FileUtilsTest.java b/bmc-common/src/test/java/com/oracle/bmc/util/internal/FileUtilsTest.java index eb5b6168c58..807e2bd4896 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/util/internal/FileUtilsTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/util/internal/FileUtilsTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.util.internal; diff --git a/bmc-common/src/test/java/com/oracle/bmc/util/internal/HttpUtilsTest.java b/bmc-common/src/test/java/com/oracle/bmc/util/internal/HttpUtilsTest.java index 794ada96a2b..0aa2075bdf4 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/util/internal/HttpUtilsTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/util/internal/HttpUtilsTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.util.internal; diff --git a/bmc-common/src/test/java/com/oracle/bmc/waiter/ExponentialBackoffDelayStrategyTest.java b/bmc-common/src/test/java/com/oracle/bmc/waiter/ExponentialBackoffDelayStrategyTest.java index 05987595421..4e8a831caad 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/waiter/ExponentialBackoffDelayStrategyTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/waiter/ExponentialBackoffDelayStrategyTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-common/src/test/java/com/oracle/bmc/waiter/MaxTimeTerminationStrategyTest.java b/bmc-common/src/test/java/com/oracle/bmc/waiter/MaxTimeTerminationStrategyTest.java index 17bf5e0186d..2b0b1497019 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/waiter/MaxTimeTerminationStrategyTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/waiter/MaxTimeTerminationStrategyTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.waiter; diff --git a/bmc-core/pom.xml b/bmc-core/pom.xml index d62b29459f0..868a8ae043b 100644 --- a/bmc-core/pom.xml +++ b/bmc-core/pom.xml @@ -5,7 +5,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk - 1.2.3-SNAPSHOT + 1.2.3 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk-common - 1.2.3-SNAPSHOT + 1.2.3 diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/Blockstorage.java b/bmc-core/src/main/java/com/oracle/bmc/core/Blockstorage.java index 42010bef9b8..eaa1e6e3836 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/Blockstorage.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/Blockstorage.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsync.java b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsync.java index 520fbc784c8..4a8b34814b4 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsync.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsync.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsyncClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsyncClient.java index 828fb1aaecf..22941aa7342 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsyncClient.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsyncClient.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.*; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.internal.*; +import com.oracle.bmc.http.signing.*; +import com.oracle.bmc.http.signing.internal.*; import com.oracle.bmc.responses.*; import com.oracle.bmc.util.internal.*; @@ -41,46 +43,62 @@ public class BlockstorageAsyncClient implements BlockstorageAsync { /** * Creates a new service instance using the given authentication provider. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. */ - public BlockstorageAsyncClient(AuthenticationDetailsProvider authenticationProvider) { - this.client = newClientBuilder().build().create(SERVICE, authenticationProvider); + public BlockstorageAsyncClient( + BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + this(authenticationDetailsProvider, null); } /** * Creates a new service instance using the given authentication provider and client configuration. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. */ public BlockstorageAsyncClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration) { - this.client = - newClientBuilder().build().create(SERVICE, authenticationProvider, configuration); + this(authenticationDetailsProvider, configuration, null); } /** * Creates a new service instance using the given authentication provider and client configuration. Additionally, * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. */ public BlockstorageAsyncClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { - this.client = - newClientBuilder() - .clientConfigurator(clientConfigurator) - .build() - .create(SERVICE, authenticationProvider, configuration); + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + new DefaultRequestSignerFactory(SigningStrategy.STANDARD)); } - private static RestClientFactoryBuilder newClientBuilder() { - RestClientFactoryBuilder builder = RestClientFactoryBuilder.builder(); - - return builder; + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param requestSignerFactory The request signer factory used to create the request signer for this service. + */ + public BlockstorageAsyncClient( + AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + ClientConfiguration configuration, + ClientConfigurator clientConfigurator, + RequestSignerFactory requestSignerFactory) { + RestClientFactory restClientFactory = + RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build(); + RequestSigner requestSigner = + requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider); + this.client = restClientFactory.create(requestSigner, configuration); } @Override diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageClient.java index 4cae7f20313..3f29e3a7384 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageClient.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageClient.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.*; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.internal.*; +import com.oracle.bmc.http.signing.*; +import com.oracle.bmc.http.signing.internal.*; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -43,52 +45,63 @@ public class BlockstorageClient implements Blockstorage { /** * Creates a new service instance using the given authentication provider. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. */ - public BlockstorageClient(AuthenticationDetailsProvider authenticationProvider) { - this.client = newClientBuilder().build().create(SERVICE, authenticationProvider); - - this.waiters = new BlockstorageWaiters(executorService, this); + public BlockstorageClient(BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + this(authenticationDetailsProvider, null); } /** * Creates a new service instance using the given authentication provider and client configuration. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. */ public BlockstorageClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration) { - this.client = - newClientBuilder().build().create(SERVICE, authenticationProvider, configuration); - - this.waiters = new BlockstorageWaiters(executorService, this); + this(authenticationDetailsProvider, configuration, null); } /** * Creates a new service instance using the given authentication provider and client configuration. Additionally, * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. */ public BlockstorageClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { - this.client = - newClientBuilder() - .clientConfigurator(clientConfigurator) - .build() - .create(SERVICE, authenticationProvider, configuration); - - this.waiters = new BlockstorageWaiters(executorService, this); + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + new DefaultRequestSignerFactory(SigningStrategy.STANDARD)); } - private static RestClientFactoryBuilder newClientBuilder() { - RestClientFactoryBuilder builder = RestClientFactoryBuilder.builder(); + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param requestSignerFactory The request signer factory used to create the request signer for this service. + */ + public BlockstorageClient( + AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + ClientConfiguration configuration, + ClientConfigurator clientConfigurator, + RequestSignerFactory requestSignerFactory) { + RestClientFactory restClientFactory = + RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build(); + RequestSigner requestSigner = + requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider); + this.client = restClientFactory.create(requestSigner, configuration); - return builder; + this.waiters = new BlockstorageWaiters(executorService, this); } @Override diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageWaiters.java b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageWaiters.java index 362180dee3a..b3ce1bf05b0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageWaiters.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageWaiters.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/Compute.java b/bmc-core/src/main/java/com/oracle/bmc/core/Compute.java index 44f38f8c003..ee07b7bfcea 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/Compute.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/Compute.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsync.java b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsync.java index 69ebd625049..52c9e0f24aa 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsync.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsync.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsyncClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsyncClient.java index 2c000c293d0..7c5c6187b2a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsyncClient.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsyncClient.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.*; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.internal.*; +import com.oracle.bmc.http.signing.*; +import com.oracle.bmc.http.signing.internal.*; import com.oracle.bmc.responses.*; import com.oracle.bmc.util.internal.*; @@ -41,46 +43,61 @@ public class ComputeAsyncClient implements ComputeAsync { /** * Creates a new service instance using the given authentication provider. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. */ - public ComputeAsyncClient(AuthenticationDetailsProvider authenticationProvider) { - this.client = newClientBuilder().build().create(SERVICE, authenticationProvider); + public ComputeAsyncClient(BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + this(authenticationDetailsProvider, null); } /** * Creates a new service instance using the given authentication provider and client configuration. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. */ public ComputeAsyncClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration) { - this.client = - newClientBuilder().build().create(SERVICE, authenticationProvider, configuration); + this(authenticationDetailsProvider, configuration, null); } /** * Creates a new service instance using the given authentication provider and client configuration. Additionally, * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. */ public ComputeAsyncClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { - this.client = - newClientBuilder() - .clientConfigurator(clientConfigurator) - .build() - .create(SERVICE, authenticationProvider, configuration); + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + new DefaultRequestSignerFactory(SigningStrategy.STANDARD)); } - private static RestClientFactoryBuilder newClientBuilder() { - RestClientFactoryBuilder builder = RestClientFactoryBuilder.builder(); - - return builder; + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param requestSignerFactory The request signer factory used to create the request signer for this service. + */ + public ComputeAsyncClient( + AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + ClientConfiguration configuration, + ClientConfigurator clientConfigurator, + RequestSignerFactory requestSignerFactory) { + RestClientFactory restClientFactory = + RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build(); + RequestSigner requestSigner = + requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider); + this.client = restClientFactory.create(requestSigner, configuration); } @Override diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeClient.java index 260f997cf90..7fff806ff59 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeClient.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeClient.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.*; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.internal.*; +import com.oracle.bmc.http.signing.*; +import com.oracle.bmc.http.signing.internal.*; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -43,52 +45,63 @@ public class ComputeClient implements Compute { /** * Creates a new service instance using the given authentication provider. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. */ - public ComputeClient(AuthenticationDetailsProvider authenticationProvider) { - this.client = newClientBuilder().build().create(SERVICE, authenticationProvider); - - this.waiters = new ComputeWaiters(executorService, this); + public ComputeClient(BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + this(authenticationDetailsProvider, null); } /** * Creates a new service instance using the given authentication provider and client configuration. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. */ public ComputeClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration) { - this.client = - newClientBuilder().build().create(SERVICE, authenticationProvider, configuration); - - this.waiters = new ComputeWaiters(executorService, this); + this(authenticationDetailsProvider, configuration, null); } /** * Creates a new service instance using the given authentication provider and client configuration. Additionally, * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. */ public ComputeClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { - this.client = - newClientBuilder() - .clientConfigurator(clientConfigurator) - .build() - .create(SERVICE, authenticationProvider, configuration); - - this.waiters = new ComputeWaiters(executorService, this); + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + new DefaultRequestSignerFactory(SigningStrategy.STANDARD)); } - private static RestClientFactoryBuilder newClientBuilder() { - RestClientFactoryBuilder builder = RestClientFactoryBuilder.builder(); + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param requestSignerFactory The request signer factory used to create the request signer for this service. + */ + public ComputeClient( + AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + ClientConfiguration configuration, + ClientConfigurator clientConfigurator, + RequestSignerFactory requestSignerFactory) { + RestClientFactory restClientFactory = + RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build(); + RequestSigner requestSigner = + requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider); + this.client = restClientFactory.create(requestSigner, configuration); - return builder; + this.waiters = new ComputeWaiters(executorService, this); } @Override diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeWaiters.java b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeWaiters.java index 1bf1327b13f..1bd92baad7a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeWaiters.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeWaiters.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetwork.java b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetwork.java index 3ad21a41290..c8ed79edf87 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetwork.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetwork.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; @@ -63,10 +63,8 @@ public interface VirtualNetwork extends AutoCloseable { CreateCpeResponse createCpe(CreateCpeRequest request); /** - * Creates a new set of DHCP options for the specified VCN. The only option available to use is - * {@link DhcpDnsOption}, which lets you specify how DNS (host name resolution) is - * handled in the subnets in your VCN. For more information, see - * [Managing DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDHCP.htm). + * Creates a new set of DHCP options for the specified VCN. For more information, see + * {@link DhcpOptions}. *

* For the purposes of access control, you must provide the OCID of the compartment where you want the set of * DHCP options to reside. Notice that the set of options doesn't have to be in the same compartment as the VCN, @@ -264,6 +262,10 @@ public interface VirtualNetwork extends AutoCloseable { *

* You may optionally specify a *display name* for the subnet, otherwise a default is provided. * It does not have to be unique, and you can change it. + *

+ * You can also add a DNS label for the subnet, which is required if you want the VCN Resolver to resolve + * hostnames for instances in the subnet. For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). * * * @param request The request object containing the details to send @@ -291,6 +293,10 @@ public interface VirtualNetwork extends AutoCloseable { * You may optionally specify a *display name* for the VCN, otherwise a default is provided. It does not have to * be unique, and you can change it. *

+ * You can also add a DNS label for the VCN, which is required if you want the instances to use the VCN Resolver + * option for DNS in the VCN. For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). + *

* The VCN automatically comes with a default route table, default security list, and default set of DHCP options. * The OCID for each is returned in the response. You can't delete these default objects, but you can change their * contents (i.e., route rules, etc.) diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsync.java b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsync.java index 56b0d0d658e..689c13ac53e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsync.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsync.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; @@ -71,10 +71,8 @@ Future createCpe( CreateCpeRequest request, AsyncHandler handler); /** - * Creates a new set of DHCP options for the specified VCN. The only option available to use is - * {@link DhcpDnsOption}, which lets you specify how DNS (host name resolution) is - * handled in the subnets in your VCN. For more information, see - * [Managing DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDHCP.htm). + * Creates a new set of DHCP options for the specified VCN. For more information, see + * {@link DhcpOptions}. *

* For the purposes of access control, you must provide the OCID of the compartment where you want the set of * DHCP options to reside. Notice that the set of options doesn't have to be in the same compartment as the VCN, @@ -306,6 +304,10 @@ Future createSecurityList( *

* You may optionally specify a *display name* for the subnet, otherwise a default is provided. * It does not have to be unique, and you can change it. + *

+ * You can also add a DNS label for the subnet, which is required if you want the VCN Resolver to resolve + * hostnames for instances in the subnet. For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). * * * @param request The request object containing the details to send @@ -338,6 +340,10 @@ Future createSubnet( * You may optionally specify a *display name* for the VCN, otherwise a default is provided. It does not have to * be unique, and you can change it. *

+ * You can also add a DNS label for the VCN, which is required if you want the instances to use the VCN Resolver + * option for DNS in the VCN. For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). + *

* The VCN automatically comes with a default route table, default security list, and default set of DHCP options. * The OCID for each is returned in the response. You can't delete these default objects, but you can change their * contents (i.e., route rules, etc.) diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsyncClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsyncClient.java index 8ff885b4a20..b5006c0a97e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsyncClient.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsyncClient.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.*; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.internal.*; +import com.oracle.bmc.http.signing.*; +import com.oracle.bmc.http.signing.internal.*; import com.oracle.bmc.responses.*; import com.oracle.bmc.util.internal.*; @@ -41,46 +43,62 @@ public class VirtualNetworkAsyncClient implements VirtualNetworkAsync { /** * Creates a new service instance using the given authentication provider. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. */ - public VirtualNetworkAsyncClient(AuthenticationDetailsProvider authenticationProvider) { - this.client = newClientBuilder().build().create(SERVICE, authenticationProvider); + public VirtualNetworkAsyncClient( + BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + this(authenticationDetailsProvider, null); } /** * Creates a new service instance using the given authentication provider and client configuration. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. */ public VirtualNetworkAsyncClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration) { - this.client = - newClientBuilder().build().create(SERVICE, authenticationProvider, configuration); + this(authenticationDetailsProvider, configuration, null); } /** * Creates a new service instance using the given authentication provider and client configuration. Additionally, * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. */ public VirtualNetworkAsyncClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { - this.client = - newClientBuilder() - .clientConfigurator(clientConfigurator) - .build() - .create(SERVICE, authenticationProvider, configuration); + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + new DefaultRequestSignerFactory(SigningStrategy.STANDARD)); } - private static RestClientFactoryBuilder newClientBuilder() { - RestClientFactoryBuilder builder = RestClientFactoryBuilder.builder(); - - return builder; + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param requestSignerFactory The request signer factory used to create the request signer for this service. + */ + public VirtualNetworkAsyncClient( + AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + ClientConfiguration configuration, + ClientConfigurator clientConfigurator, + RequestSignerFactory requestSignerFactory) { + RestClientFactory restClientFactory = + RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build(); + RequestSigner requestSigner = + requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider); + this.client = restClientFactory.create(requestSigner, configuration); } @Override diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkClient.java index af891a2685d..74a4adfc7ae 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkClient.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkClient.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.*; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.internal.*; +import com.oracle.bmc.http.signing.*; +import com.oracle.bmc.http.signing.internal.*; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -43,52 +45,63 @@ public class VirtualNetworkClient implements VirtualNetwork { /** * Creates a new service instance using the given authentication provider. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. */ - public VirtualNetworkClient(AuthenticationDetailsProvider authenticationProvider) { - this.client = newClientBuilder().build().create(SERVICE, authenticationProvider); - - this.waiters = new VirtualNetworkWaiters(executorService, this); + public VirtualNetworkClient(BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + this(authenticationDetailsProvider, null); } /** * Creates a new service instance using the given authentication provider and client configuration. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. */ public VirtualNetworkClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration) { - this.client = - newClientBuilder().build().create(SERVICE, authenticationProvider, configuration); - - this.waiters = new VirtualNetworkWaiters(executorService, this); + this(authenticationDetailsProvider, configuration, null); } /** * Creates a new service instance using the given authentication provider and client configuration. Additionally, * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. */ public VirtualNetworkClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { - this.client = - newClientBuilder() - .clientConfigurator(clientConfigurator) - .build() - .create(SERVICE, authenticationProvider, configuration); - - this.waiters = new VirtualNetworkWaiters(executorService, this); + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + new DefaultRequestSignerFactory(SigningStrategy.STANDARD)); } - private static RestClientFactoryBuilder newClientBuilder() { - RestClientFactoryBuilder builder = RestClientFactoryBuilder.builder(); + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param requestSignerFactory The request signer factory used to create the request signer for this service. + */ + public VirtualNetworkClient( + AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + ClientConfiguration configuration, + ClientConfigurator clientConfigurator, + RequestSignerFactory requestSignerFactory) { + RestClientFactory restClientFactory = + RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build(); + RequestSigner requestSigner = + requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider); + this.client = restClientFactory.create(requestSigner, configuration); - return builder; + this.waiters = new VirtualNetworkWaiters(executorService, this); } @Override diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkWaiters.java b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkWaiters.java index b93e06417ff..7f4716fcf90 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkWaiters.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkWaiters.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachVolumeConverter.java index fa396fd0fe4..c025ee4e615 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachVolumeConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CaptureConsoleHistoryConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CaptureConsoleHistoryConverter.java index aef21a4af29..2281bc71e65 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CaptureConsoleHistoryConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CaptureConsoleHistoryConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCpeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCpeConverter.java index 0d220338322..d0d67bd2378 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCpeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCpeConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDhcpOptionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDhcpOptionsConverter.java index 240bf617b59..371524ee332 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDhcpOptionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDhcpOptionsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgAttachmentConverter.java index 2ae659fdf8d..32c965ff325 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgAttachmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgAttachmentConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgConverter.java index 8057a030a00..17ba6a14981 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateIPSecConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateIPSecConnectionConverter.java index 3a0f9ea679b..dc622fcd542 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateIPSecConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateIPSecConnectionConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateImageConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateImageConverter.java index 463f289cc21..65d5805c167 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateImageConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateImageConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateInternetGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateInternetGatewayConverter.java index 05c4c863028..c55ddd4c08c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateInternetGatewayConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateInternetGatewayConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateRouteTableConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateRouteTableConverter.java index 8b9a991cd87..cc492ae0d7a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateRouteTableConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateRouteTableConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSecurityListConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSecurityListConverter.java index 5ec018990a1..f11043b0304 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSecurityListConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSecurityListConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSubnetConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSubnetConverter.java index 666bfb41794..e7c5efe0f83 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSubnetConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSubnetConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVcnConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVcnConverter.java index 59481ceb1af..267aa0917fe 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVcnConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVcnConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeBackupConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeBackupConverter.java index 248c29ad44e..e93b6afd3d2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeBackupConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeBackupConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeConverter.java index 030ae8e17cb..1dbf75ac117 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteConsoleHistoryConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteConsoleHistoryConverter.java index 0698da80576..348ae17eb9a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteConsoleHistoryConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteConsoleHistoryConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCpeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCpeConverter.java index 0f1bc236932..1912a7a1bcc 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCpeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCpeConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDhcpOptionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDhcpOptionsConverter.java index e10099988ca..1f7580d5fcb 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDhcpOptionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDhcpOptionsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgAttachmentConverter.java index c1241804885..94ae0f8dc78 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgAttachmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgAttachmentConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgConverter.java index 3669023fb05..3430ce9135e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteIPSecConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteIPSecConnectionConverter.java index c433dd8f77b..e2b9802a814 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteIPSecConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteIPSecConnectionConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteImageConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteImageConverter.java index d92e0d2d4b2..57a9081da61 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteImageConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteImageConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteInternetGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteInternetGatewayConverter.java index 75953ec8db8..81a5299d3f5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteInternetGatewayConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteInternetGatewayConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteRouteTableConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteRouteTableConverter.java index ba518d25477..3d73bd7e941 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteRouteTableConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteRouteTableConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSecurityListConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSecurityListConverter.java index 469bfc5c6cf..1b232a28080 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSecurityListConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSecurityListConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSubnetConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSubnetConverter.java index b3a91476c47..d9f92fa8ff1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSubnetConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSubnetConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVcnConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVcnConverter.java index d80fb705388..f728fda90fa 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVcnConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVcnConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeBackupConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeBackupConverter.java index 0aa1a8d08c8..19df1e4d98d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeBackupConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeBackupConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeConverter.java index 253ab2f9e52..97e2b4fbc62 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachVolumeConverter.java index c3cfab62aa5..0bbc1f3a69e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachVolumeConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryContentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryContentConverter.java index 1ac4e5f00d9..87e4b12fa97 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryContentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryContentConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryConverter.java index 520db3d1101..20628cae83b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCpeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCpeConverter.java index 1b8cc018276..c236aa03907 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCpeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCpeConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDhcpOptionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDhcpOptionsConverter.java index 87bb522db8c..b5f8ea789c3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDhcpOptionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDhcpOptionsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgAttachmentConverter.java index 47e9f52508b..7de36a2ebf7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgAttachmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgAttachmentConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgConverter.java index e1b9e251b5b..5162ca716c4 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionConverter.java index e801ff28ec5..eac45224fe2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceConfigConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceConfigConverter.java index 26379a6e9ef..6b1dfb6aeda 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceConfigConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceConfigConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceStatusConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceStatusConverter.java index 9967017dc4c..df1736b3c4e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceStatusConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceStatusConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetImageConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetImageConverter.java index 1cfc0513944..b32d8160f0e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetImageConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetImageConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInstanceConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInstanceConverter.java index 61ece33b455..876c50712bc 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInstanceConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInstanceConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInternetGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInternetGatewayConverter.java index 0ea1676f94a..65aa22e8b33 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInternetGatewayConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInternetGatewayConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetRouteTableConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetRouteTableConverter.java index 54a0474427e..f62effc2b99 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetRouteTableConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetRouteTableConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSecurityListConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSecurityListConverter.java index 9639e25247f..f15f14cc787 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSecurityListConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSecurityListConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSubnetConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSubnetConverter.java index 3c8b0ef0680..44a05533fca 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSubnetConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSubnetConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVcnConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVcnConverter.java index c17f0d045ad..6519f985f4b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVcnConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVcnConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVnicConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVnicConverter.java index d96155fadcd..ee5542744d8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVnicConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVnicConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeAttachmentConverter.java index 3a48377d423..8abdc37e5ed 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeAttachmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeAttachmentConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupConverter.java index dc2dc6a5986..7d43f40204e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeConverter.java index 263cb2ee397..538b21bc643 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/InstanceActionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/InstanceActionConverter.java index 9c00f06696f..d30779829e6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/InstanceActionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/InstanceActionConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/LaunchInstanceConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/LaunchInstanceConverter.java index 786718f74a6..79eed98c94d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/LaunchInstanceConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/LaunchInstanceConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListConsoleHistoriesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListConsoleHistoriesConverter.java index 7460d92be00..5c495d353a5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListConsoleHistoriesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListConsoleHistoriesConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCpesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCpesConverter.java index d02429400f1..8f6f0a929aa 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCpesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCpesConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDhcpOptionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDhcpOptionsConverter.java index 20ce26cf4cd..ab52e9f2506 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDhcpOptionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDhcpOptionsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgAttachmentsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgAttachmentsConverter.java index 7ad93bdeb27..ac73012cb29 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgAttachmentsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgAttachmentsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgsConverter.java index 45d67ce8853..0486ebb2120 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListIPSecConnectionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListIPSecConnectionsConverter.java index 84e022c51a8..8657dc1730a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListIPSecConnectionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListIPSecConnectionsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListImagesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListImagesConverter.java index 8514bb15a70..a848c2de92b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListImagesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListImagesConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInstancesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInstancesConverter.java index 165a363a59d..82930bacc2c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInstancesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInstancesConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInternetGatewaysConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInternetGatewaysConverter.java index 8959525a0b0..4f5061e6d4c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInternetGatewaysConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInternetGatewaysConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListRouteTablesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListRouteTablesConverter.java index 579bed1a717..c83434dd362 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListRouteTablesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListRouteTablesConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSecurityListsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSecurityListsConverter.java index 8126d3e64ce..cd7a94e3f34 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSecurityListsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSecurityListsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListShapesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListShapesConverter.java index ae90cb8dbad..08b1e79082d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListShapesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListShapesConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSubnetsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSubnetsConverter.java index 84120e9d758..43eaf68d3e6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSubnetsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSubnetsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVcnsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVcnsConverter.java index 21fc22bc749..8bcefabb210 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVcnsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVcnsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVnicAttachmentsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVnicAttachmentsConverter.java index 950756569be..b87d64232b6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVnicAttachmentsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVnicAttachmentsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeAttachmentsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeAttachmentsConverter.java index d5fcb5c99ff..44ca6cc5c24 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeAttachmentsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeAttachmentsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeBackupsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeBackupsConverter.java index 6795ceb15d3..81ab2ef821b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeBackupsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeBackupsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumesConverter.java index 2b26a0bb787..4ddf09d347b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumesConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/TerminateInstanceConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/TerminateInstanceConverter.java index 59c3a9b0d55..39273b3e23e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/TerminateInstanceConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/TerminateInstanceConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCpeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCpeConverter.java index 9e544b03c95..06b9f34432b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCpeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCpeConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDhcpOptionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDhcpOptionsConverter.java index 36a647413b1..f69c14ec829 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDhcpOptionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDhcpOptionsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgAttachmentConverter.java index 83646cff5f2..d1259989452 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgAttachmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgAttachmentConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgConverter.java index 0f7ec07f3ed..f9093cf9b88 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateIPSecConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateIPSecConnectionConverter.java index 6088f481c73..f10c0d4ee80 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateIPSecConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateIPSecConnectionConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateImageConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateImageConverter.java index 55c4696ac3d..26211dc93b3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateImageConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateImageConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInstanceConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInstanceConverter.java index 6c6374a0c84..a5d3cfbc37e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInstanceConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInstanceConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInternetGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInternetGatewayConverter.java index ba46b6ce504..eef15cf7aa2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInternetGatewayConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInternetGatewayConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateRouteTableConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateRouteTableConverter.java index 55b010ea510..163afd7db4c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateRouteTableConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateRouteTableConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSecurityListConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSecurityListConverter.java index cce0fa404b9..c9c5b9ef232 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSecurityListConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSecurityListConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSubnetConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSubnetConverter.java index eb496d79d49..ac17ae5cdf6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSubnetConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSubnetConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVcnConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVcnConverter.java index 8c70c519d11..8a19eabe916 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVcnConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVcnConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeBackupConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeBackupConverter.java index b25e0561612..311a21a354f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeBackupConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeBackupConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeConverter.java index f3d2f126189..8206175384d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.internal.http; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachIScsiVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachIScsiVolumeDetails.java index 0aabd4f1cfc..22e7ee3018c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachIScsiVolumeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachIScsiVolumeDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachVolumeDetails.java index db890742930..1d3004f570f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachVolumeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachVolumeDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; @@ -18,9 +18,14 @@ @Value @NonFinal @AllArgsConstructor(access = AccessLevel.PROTECTED) -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.PROPERTY, + property = "type", + defaultImpl = AttachVolumeDetails.class +) @JsonSubTypes({@JsonSubTypes.Type(value = AttachIScsiVolumeDetails.class, name = "iscsi")}) -public abstract class AttachVolumeDetails { +public class AttachVolumeDetails { /** * A user-friendly name. Does not have to be unique, and it cannot be changed. diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CaptureConsoleHistoryDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CaptureConsoleHistoryDetails.java index 93d64222eb2..344d3a59e29 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CaptureConsoleHistoryDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CaptureConsoleHistoryDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/ConsoleHistory.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/ConsoleHistory.java index 00897e695a8..3a54b1d514d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/ConsoleHistory.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/ConsoleHistory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Cpe.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Cpe.java index e3e14396526..7f92bd24ad5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Cpe.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Cpe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCpeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCpeDetails.java index 01a80385c86..23586b2956e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCpeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCpeDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDhcpDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDhcpDetails.java index 174408c68f0..0555dee805d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDhcpDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDhcpDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgAttachmentDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgAttachmentDetails.java index cb5f6631caf..06c0b8416a6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgAttachmentDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgAttachmentDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgDetails.java index 3b4d17987ee..22abd38f7ce 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateIPSecConnectionDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateIPSecConnectionDetails.java index a6f6d9a52e3..bcc5b53c04b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateIPSecConnectionDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateIPSecConnectionDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateImageDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateImageDetails.java index 8df528eab7a..d354d4e3879 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateImageDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateImageDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInternetGatewayDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInternetGatewayDetails.java index 281a04f0343..748bd902b8c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInternetGatewayDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInternetGatewayDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateRouteTableDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateRouteTableDetails.java index 08beee9bf4a..67db7209694 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateRouteTableDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateRouteTableDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSecurityListDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSecurityListDetails.java index 0d7c8cc335a..d8903e820af 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSecurityListDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSecurityListDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSubnetDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSubnetDetails.java index 7100f2d358b..7b1817b2628 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSubnetDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSubnetDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; @@ -37,6 +37,9 @@ public static class Builder { @JsonProperty("displayName") private String displayName; + @JsonProperty("dnsLabel") + private String dnsLabel; + @JsonProperty("routeTableId") private String routeTableId; @@ -53,6 +56,7 @@ public CreateSubnetDetails build() { compartmentId, dhcpOptionsId, displayName, + dnsLabel, routeTableId, securityListIds, vcnId); @@ -65,6 +69,7 @@ public Builder copy(CreateSubnetDetails o) { .compartmentId(o.getCompartmentId()) .dhcpOptionsId(o.getDhcpOptionsId()) .displayName(o.getDisplayName()) + .dnsLabel(o.getDnsLabel()) .routeTableId(o.getRouteTableId()) .securityListIds(o.getSecurityListIds()) .vcnId(o.getVcnId()); @@ -127,6 +132,28 @@ public static Builder builder() { @Size(min = 1, max = 255) String displayName; + /** + * A DNS label for the subnet, used in conjunction with the VNIC's hostname and + * VCN's DNS label to form a fully qualified domain name (FQDN) for each VNIC + * within this subnet (e.g., `bminstance-1.subnet-123.vcn-1.oraclevcn.com`). + * Must be unique within the VCN and comply with + * [RFC 952](https://tools.ietf.org/html/rfc952) and + * [RFC 1123](https://tools.ietf.org/html/rfc1123). The value cannot be changed. + *

+ * This value must be set if you want to use the VCN Resolver to resolve the + * hostnames of instances in the subnet. It can only be set if the VCN itself + * was created with a DNS label. + *

+ * For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). + *

+ * Example: `subnet-123` + * + **/ + @JsonProperty("dnsLabel") + @Size(min = 1, max = 63) + String dnsLabel; + /** * The OCID of the route table the subnet will use. If you don't provide a value, * the subnet will use the VCN's default route table. diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVcnDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVcnDetails.java index 7184d08547f..abf2397d520 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVcnDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVcnDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; @@ -31,15 +31,19 @@ public static class Builder { @JsonProperty("displayName") private String displayName; + @JsonProperty("dnsLabel") + private String dnsLabel; + public CreateVcnDetails build() { - return new CreateVcnDetails(cidrBlock, compartmentId, displayName); + return new CreateVcnDetails(cidrBlock, compartmentId, displayName, dnsLabel); } @JsonIgnore public Builder copy(CreateVcnDetails o) { return cidrBlock(o.getCidrBlock()) .compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()); + .displayName(o.getDisplayName()) + .dnsLabel(o.getDnsLabel()); } } @@ -77,4 +81,26 @@ public static Builder builder() { @JsonProperty("displayName") @Size(min = 1, max = 255) String displayName; + + /** + * A DNS label for the VCN, used in conjunction with the VNIC's hostname and + * subnet's DNS label to form a fully qualified domain name (FQDN) for each VNIC + * within this subnet (e.g., `bminstance-1.subnet-123.vcn-1.oraclevcn.com`). + * Not required to be unique, but it's a best practice to set unique DNS labels + * for VCNs in your tenancy. Must comply with + * [RFC 952](https://tools.ietf.org/html/rfc952) and + * [RFC 1123](https://tools.ietf.org/html/rfc1123). The value cannot be changed. + *

+ * You must set this value if you want instances to be able to use hostnames to + * resolve other instances in the VCN. Otherwise the VCN Resolver will not work. + *

+ * For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). + *

+ * Example: `vcn-1` + * + **/ + @JsonProperty("dnsLabel") + @Size(min = 1, max = 63) + String dnsLabel; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeBackupDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeBackupDetails.java index 86ade93f435..0f73c031977 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeBackupDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeBackupDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeDetails.java index 917d2012f12..f62ff4170ac 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpDnsOption.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpDnsOption.java index 73ce404e0ba..0337df407be 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpDnsOption.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpDnsOption.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; @@ -15,7 +15,9 @@ import lombok.experimental.*; /** - * DHCP option for specifying how DNS (host name resolution) is handled in the VCN. + * DHCP option for specifying how DNS (hostname resolution) is handled in the subnets in the VCN. + * For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). * **/ @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @@ -66,12 +68,17 @@ public DhcpDnsOption(List customDnsServers, ServerType serverType) { @JsonProperty("customDnsServers") List customDnsServers; /** - * - *VcnLocal:* Reserved for future use. - * - *VcnLocalPlusInternet:* Instances can resolve only internet host - * names (no Internet Gateway is required). The instances still need to use - * their IP addresses to communicate with each other. This is the default - * value in the default set of DHCP options in the VCN. - * - *CustomDnsServer:* Instances use a DNS server of your choice (three maximum). + * - **VcnLocal:** Reserved for future use. + *

+ * - **VcnLocalPlusInternet:** Also referred to as \"Internet and VCN Resolver\". + * Instances can resolve internet hostnames (no Internet Gateway is required), + * and can resolve hostnames of instances in the VCN. This is the default + * value in the default set of DHCP options in the VCN. For the VCN Resolver to + * work across the VCN, there must also be a DNS label set for the VCN, a DNS + * label set for each subnet, and a hostname for each instance. For more information, + * see [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). + *

+ * - **CustomDnsServer:** Instances use a DNS server of your choice (three maximum). * **/ public enum ServerType { @@ -108,12 +115,17 @@ public static ServerType create(String key) { } }; /** - * - *VcnLocal:* Reserved for future use. - * - *VcnLocalPlusInternet:* Instances can resolve only internet host - * names (no Internet Gateway is required). The instances still need to use - * their IP addresses to communicate with each other. This is the default - * value in the default set of DHCP options in the VCN. - * - *CustomDnsServer:* Instances use a DNS server of your choice (three maximum). + * - **VcnLocal:** Reserved for future use. + *

+ * - **VcnLocalPlusInternet:** Also referred to as \"Internet and VCN Resolver\". + * Instances can resolve internet hostnames (no Internet Gateway is required), + * and can resolve hostnames of instances in the VCN. This is the default + * value in the default set of DHCP options in the VCN. For the VCN Resolver to + * work across the VCN, there must also be a DNS label set for the VCN, a DNS + * label set for each subnet, and a hostname for each instance. For more information, + * see [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). + *

+ * - **CustomDnsServer:** Instances use a DNS server of your choice (three maximum). * **/ @JsonProperty("serverType") diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOption.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOption.java index 75d95a35d3a..db432846aaf 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOption.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOption.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; @@ -16,13 +16,20 @@ /** * A single DHCP option according to [RFC 1533](https://tools.ietf.org/html/rfc1533). - * The only option available to use is {@link DhcpDnsOption}. + * The one option you can set is {@link DhcpDnsOption}. For more + * information, see [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm) + * and [Managing DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDHCP.htm). * **/ @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @Value @NonFinal @AllArgsConstructor(access = AccessLevel.PROTECTED) -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.PROPERTY, + property = "type", + defaultImpl = DhcpOption.class +) @JsonSubTypes({@JsonSubTypes.Type(value = DhcpDnsOption.class, name = "DomainNameServer")}) -public abstract class DhcpOption {} +public class DhcpOption {} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOptions.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOptions.java index 1ce1e9d5011..2b24580a036 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOptions.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOptions.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; @@ -16,7 +16,13 @@ /** * A set of DHCP options. Used by the VCN to automatically provide configuration - * information to the instances when they boot up. + * information to the instances when they boot up. There is one option you can set: + * + * - {@link DhcpDnsOption}: Lets you specify how DNS (hostname resolution) is + * handled in the subnets in your VCN. + * + * For more information, see [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm) + * and [Managing DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDHCP.htm). *

* To use any of the API operations, you must be authorized in an IAM policy. If you're not authorized, * talk to an administrator. If you're an administrator who needs to write policies to give users access, see diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Drg.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Drg.java index 5a73275d7a6..1b718c9c298 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Drg.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Drg.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/DrgAttachment.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/DrgAttachment.java index 08a1aeb5405..bc06c943bd5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/DrgAttachment.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/DrgAttachment.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/EgressSecurityRule.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/EgressSecurityRule.java index 9d9c8d83118..52cf1c9690b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/EgressSecurityRule.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/EgressSecurityRule.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnection.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnection.java index aa53bbd2174..825ed954562 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnection.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnection.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceConfig.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceConfig.java index 035225716ce..428abbede66 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceConfig.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceConfig.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceStatus.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceStatus.java index cb4cd894523..f3127cb1cd1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceStatus.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceStatus.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/IScsiVolumeAttachment.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/IScsiVolumeAttachment.java index 94857ed1088..f58e5f02d6c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/IScsiVolumeAttachment.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/IScsiVolumeAttachment.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/IcmpOptions.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/IcmpOptions.java index 0407a6c8fdb..781bde4132a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/IcmpOptions.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/IcmpOptions.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Image.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Image.java index f47b6a05bbd..688a625c753 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Image.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Image.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/IngressSecurityRule.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/IngressSecurityRule.java index 2897bac3e72..af24859c5d3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/IngressSecurityRule.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/IngressSecurityRule.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Instance.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Instance.java index e806657e805..2387107e167 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Instance.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Instance.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/InternetGateway.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/InternetGateway.java index aa399b99435..fa44d4bf666 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/InternetGateway.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/InternetGateway.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceDetails.java index 476e3ee945c..b500f7eb26f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; @@ -31,6 +31,9 @@ public static class Builder { @JsonProperty("displayName") private String displayName; + @JsonProperty("hostnameLabel") + private String hostnameLabel; + @JsonProperty("imageId") private String imageId; @@ -51,6 +54,7 @@ public LaunchInstanceDetails build() { availabilityDomain, compartmentId, displayName, + hostnameLabel, imageId, ipxeScript, metadata, @@ -63,6 +67,7 @@ public Builder copy(LaunchInstanceDetails o) { return availabilityDomain(o.getAvailabilityDomain()) .compartmentId(o.getCompartmentId()) .displayName(o.getDisplayName()) + .hostnameLabel(o.getHostnameLabel()) .imageId(o.getImageId()) .ipxeScript(o.getIpxeScript()) .metadata(o.getMetadata()) @@ -109,6 +114,27 @@ public static Builder builder() { @Size(min = 1, max = 255) String displayName; + /** + * The hostname for the VNIC that is created during instance launch. + * Used for DNS. The value is the hostname portion of the instance's + * fully qualified domain name (FQDN) (e.g., `bminstance-1` in FQDN + * `bminstance-1.subnet-123.vcn-1.oraclevcn.com`). + * Must be unique across all VNICs in the subnet and comply with + * [RFC 952](https://tools.ietf.org/html/rfc952) and + * [RFC 1123](https://tools.ietf.org/html/rfc1123). + * The value cannot be changed, and it can be retrieved from the + * {@link Vnic}. + *

+ * For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). + *

+ * Example: `bminstance-1` + * + **/ + @JsonProperty("hostnameLabel") + @Size(min = 1, max = 63) + String hostnameLabel; + /** * The OCID of the image used to boot the instance. **/ diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/PortRange.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/PortRange.java index 6511a319ec4..d18909dcd84 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/PortRange.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/PortRange.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteRule.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteRule.java index a3756ef4231..2d5dd946446 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteRule.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteRule.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteTable.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteTable.java index 2b5c02f689c..0954d01247c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteTable.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/SecurityList.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/SecurityList.java index 94f097af802..d3a6fabb1e5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/SecurityList.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/SecurityList.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Shape.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Shape.java index 62d9d7e4915..25c0a57ef5f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Shape.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Shape.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Subnet.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Subnet.java index c70f6c1edc0..a8446b845ed 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Subnet.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Subnet.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; @@ -48,6 +48,9 @@ public static class Builder { @JsonProperty("displayName") private String displayName; + @JsonProperty("dnsLabel") + private String dnsLabel; + @JsonProperty("id") private String id; @@ -60,6 +63,9 @@ public static class Builder { @JsonProperty("securityListIds") private List securityListIds; + @JsonProperty("subnetDomainName") + private String subnetDomainName; + @JsonProperty("timeCreated") private Date timeCreated; @@ -79,10 +85,12 @@ public Subnet build() { compartmentId, dhcpOptionsId, displayName, + dnsLabel, id, lifecycleState, routeTableId, securityListIds, + subnetDomainName, timeCreated, vcnId, virtualRouterIp, @@ -96,10 +104,12 @@ public Builder copy(Subnet o) { .compartmentId(o.getCompartmentId()) .dhcpOptionsId(o.getDhcpOptionsId()) .displayName(o.getDisplayName()) + .dnsLabel(o.getDnsLabel()) .id(o.getId()) .lifecycleState(o.getLifecycleState()) .routeTableId(o.getRouteTableId()) .securityListIds(o.getSecurityListIds()) + .subnetDomainName(o.getSubnetDomainName()) .timeCreated(o.getTimeCreated()) .vcnId(o.getVcnId()) .virtualRouterIp(o.getVirtualRouterIp()) @@ -162,6 +172,24 @@ public static Builder builder() { @Size(min = 1, max = 255) String displayName; + /** + * A DNS label for the subnet, used in conjunction with the VNIC's hostname and + * VCN's DNS label to form a fully qualified domain name (FQDN) for each VNIC + * within this subnet (e.g., `bminstance-1.subnet-123.vcn-1.oraclevcn.com`). + *

+ * The absence of this parameter means the VCN Resolver will not resolve hostnames + * of instances in this subnet. + *

+ * For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). + *

+ * Example: `subnet-123` + * + **/ + @JsonProperty("dnsLabel") + @Size(min = 1, max = 63) + String dnsLabel; + /** * The subnet's Oracle ID (OCID). **/ @@ -230,6 +258,20 @@ public static LifecycleState create(String key) { @JsonProperty("securityListIds") List securityListIds; + /** + * The subnet's domain name, which consists of the subnet's DNS label, + * the VCN's DNS label, and the `oraclevcn.com` domain. + *

+ * For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). + *

+ * Example: `subnet-123.vcn-1.oraclevcn.com` + * + **/ + @JsonProperty("subnetDomainName") + @Size(min = 1, max = 253) + String subnetDomainName; + /** * The date and time the subnet was created, in the format defined by RFC3339. *

diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/TcpOptions.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/TcpOptions.java index f573f0cd0f3..252eadbfcdf 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/TcpOptions.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/TcpOptions.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelConfig.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelConfig.java index 559be7309b2..b137f12fc24 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelConfig.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelConfig.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelStatus.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelStatus.java index 3df0ea511ae..3883d49f562 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelStatus.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelStatus.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UdpOptions.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UdpOptions.java index f6f29fc8eeb..f315a384491 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UdpOptions.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UdpOptions.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCpeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCpeDetails.java index 18cc3408ece..0c0823c6408 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCpeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCpeDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDhcpDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDhcpDetails.java index 424e19e0e7f..6b9f6df9198 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDhcpDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDhcpDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgAttachmentDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgAttachmentDetails.java index c1d160697e9..1d11eb58356 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgAttachmentDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgAttachmentDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgDetails.java index 7f788e19bed..f641c137e6c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateIPSecConnectionDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateIPSecConnectionDetails.java index 7c7c429e2e3..29ef31d0291 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateIPSecConnectionDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateIPSecConnectionDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateImageDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateImageDetails.java index b693227fc2a..1e385a6a726 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateImageDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateImageDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceDetails.java index 4c0d9b727cc..ec61c75fa3e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInternetGatewayDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInternetGatewayDetails.java index f2a73016b63..79ad8a62f05 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInternetGatewayDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInternetGatewayDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateRouteTableDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateRouteTableDetails.java index 3a263d1d880..ab8bcd93c12 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateRouteTableDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateRouteTableDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSecurityListDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSecurityListDetails.java index 826b2024983..aa2b091ac5c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSecurityListDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSecurityListDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSubnetDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSubnetDetails.java index f5e71fb9a4a..6c52395376a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSubnetDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSubnetDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVcnDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVcnDetails.java index 18d45d7496e..80ab1847cf5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVcnDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVcnDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeBackupDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeBackupDetails.java index 7f48bf520a9..9e4317c3839 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeBackupDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeBackupDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeDetails.java index aa929554e1c..8ef87e15fb0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Vcn.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Vcn.java index a3b7c7c7ff0..6571a5f4e15 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Vcn.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Vcn.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; @@ -49,6 +49,9 @@ public static class Builder { @JsonProperty("displayName") private String displayName; + @JsonProperty("dnsLabel") + private String dnsLabel; + @JsonProperty("id") private String id; @@ -58,6 +61,9 @@ public static class Builder { @JsonProperty("timeCreated") private Date timeCreated; + @JsonProperty("vcnDomainName") + private String vcnDomainName; + public Vcn build() { return new Vcn( cidrBlock, @@ -66,9 +72,11 @@ public Vcn build() { defaultRouteTableId, defaultSecurityListId, displayName, + dnsLabel, id, lifecycleState, - timeCreated); + timeCreated, + vcnDomainName); } @JsonIgnore @@ -79,9 +87,11 @@ public Builder copy(Vcn o) { .defaultRouteTableId(o.getDefaultRouteTableId()) .defaultSecurityListId(o.getDefaultSecurityListId()) .displayName(o.getDisplayName()) + .dnsLabel(o.getDnsLabel()) .id(o.getId()) .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()); + .timeCreated(o.getTimeCreated()) + .vcnDomainName(o.getVcnDomainName()); } } @@ -142,6 +152,23 @@ public static Builder builder() { @Size(min = 1, max = 255) String displayName; + /** + * A DNS label for the VCN, used in conjunction with the VNIC's hostname and + * subnet's DNS label to form a fully qualified domain name (FQDN) for each VNIC + * within this subnet (e.g., `bminstance-1.subnet-123.vcn-1.oraclevcn.com`). + *

+ * The absence of this parameter means the VCN Resolver will not work for this VCN. + *

+ * For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). + *

+ * Example: `vcn-1` + * + **/ + @JsonProperty("dnsLabel") + @Size(min = 1, max = 63) + String dnsLabel; + /** * The VCN's Oracle ID (OCID). **/ @@ -203,4 +230,18 @@ public static LifecycleState create(String key) { **/ @JsonProperty("timeCreated") Date timeCreated; + + /** + * The VCN's domain name, which consists of the VCN's DNS label, and the + * `oraclevcn.com` domain. + *

+ * For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). + *

+ * Example: `vcn-1.oraclevcn.com` + * + **/ + @JsonProperty("vcnDomainName") + @Size(min = 1, max = 253) + String vcnDomainName; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Vnic.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Vnic.java index 68c8da5e056..7753871535a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Vnic.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Vnic.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; @@ -41,6 +41,9 @@ public static class Builder { @JsonProperty("displayName") private String displayName; + @JsonProperty("hostnameLabel") + private String hostnameLabel; + @JsonProperty("id") private String id; @@ -64,6 +67,7 @@ public Vnic build() { availabilityDomain, compartmentId, displayName, + hostnameLabel, id, lifecycleState, privateIp, @@ -77,6 +81,7 @@ public Builder copy(Vnic o) { return availabilityDomain(o.getAvailabilityDomain()) .compartmentId(o.getCompartmentId()) .displayName(o.getDisplayName()) + .hostnameLabel(o.getHostnameLabel()) .id(o.getId()) .lifecycleState(o.getLifecycleState()) .privateIp(o.getPrivateIp()) @@ -118,7 +123,27 @@ public static Builder builder() { String displayName; /** - * The VNIC's Oracle ID (OCID). + * The hostname for the VNIC that is created during instance launch. + * Used for DNS. The value is the hostname portion of the instance's + * fully qualified domain name (FQDN) (e.g., `bminstance-1` in FQDN + * `bminstance-1.subnet-123.vcn-1.oraclevcn.com`). + * Must be unique across all VNICs in the subnet and comply with + * [RFC 952](https://tools.ietf.org/html/rfc952) and + * [RFC 1123](https://tools.ietf.org/html/rfc1123). + * The value cannot be changed. + *

+ * For more information, see + * [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm). + *

+ * Example: `bminstance-1` + * + **/ + @JsonProperty("hostnameLabel") + @Size(min = 1, max = 63) + String hostnameLabel; + + /** + * The OCID of the VNIC. **/ @JsonProperty("id") @Size(min = 1, max = 255) @@ -167,7 +192,7 @@ public static LifecycleState create(String key) { LifecycleState lifecycleState; /** - * The private IP addresses of the VNIC, which is within the VNIC subnet + * The private IP address of the VNIC. The address is within the subnet's CIDR * and is accessible within the VCN. * **/ @@ -175,7 +200,7 @@ public static LifecycleState create(String key) { String privateIp; /** - * The public IP address of the VNIC, which Oracle performs NAT for at the gateway. + * The public IP address of the VNIC. * **/ @JsonProperty("publicIp") diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VnicAttachment.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VnicAttachment.java index 80f39d24cf7..7a052edcdcc 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VnicAttachment.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VnicAttachment.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Volume.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Volume.java index c7a4add7b56..6382f05c324 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Volume.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Volume.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeAttachment.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeAttachment.java index 04783ce8771..d592a0493ff 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeAttachment.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeAttachment.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; @@ -30,10 +30,11 @@ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, - property = "attachmentType" + property = "attachmentType", + defaultImpl = VolumeAttachment.class ) @JsonSubTypes({@JsonSubTypes.Type(value = IScsiVolumeAttachment.class, name = "iscsi")}) -public abstract class VolumeAttachment { +public class VolumeAttachment { /** * The Availability Domain of an instance. diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackup.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackup.java index 08169c1340e..33b022da26d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackup.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackup.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.model; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVolumeRequest.java index 1623fd18f3a..6d8a7f66584 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVolumeRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class AttachVolumeRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(AttachVolumeRequest o) { + attachVolumeDetails(o.getAttachVolumeDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CaptureConsoleHistoryRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CaptureConsoleHistoryRequest.java index 017738907a7..20ae27178dc 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CaptureConsoleHistoryRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CaptureConsoleHistoryRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CaptureConsoleHistoryRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CaptureConsoleHistoryRequest o) { + captureConsoleHistoryDetails(o.getCaptureConsoleHistoryDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCpeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCpeRequest.java index 0eb518ef120..0060cf72b99 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCpeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCpeRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateCpeRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateCpeRequest o) { + createCpeDetails(o.getCreateCpeDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDhcpOptionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDhcpOptionsRequest.java index 3a021c3ef51..f6cd70eec1e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDhcpOptionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDhcpOptionsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateDhcpOptionsRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateDhcpOptionsRequest o) { + createDhcpDetails(o.getCreateDhcpDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgAttachmentRequest.java index 162523e77de..8726836898a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgAttachmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgAttachmentRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateDrgAttachmentRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateDrgAttachmentRequest o) { + createDrgAttachmentDetails(o.getCreateDrgAttachmentDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgRequest.java index 09585793d40..ef9ecd5236e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateDrgRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateDrgRequest o) { + createDrgDetails(o.getCreateDrgDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateIPSecConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateIPSecConnectionRequest.java index d4a7bede5fb..6840fcab87d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateIPSecConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateIPSecConnectionRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateIPSecConnectionRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateIPSecConnectionRequest o) { + createIPSecConnectionDetails(o.getCreateIPSecConnectionDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateImageRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateImageRequest.java index 41d201291e0..dfe31f242a1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateImageRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateImageRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateImageRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateImageRequest o) { + createImageDetails(o.getCreateImageDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInternetGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInternetGatewayRequest.java index a5538f4beb1..f0b6384e280 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInternetGatewayRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInternetGatewayRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateInternetGatewayRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateInternetGatewayRequest o) { + createInternetGatewayDetails(o.getCreateInternetGatewayDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRouteTableRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRouteTableRequest.java index 572b2981534..d9d7afc3abf 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRouteTableRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRouteTableRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateRouteTableRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateRouteTableRequest o) { + createRouteTableDetails(o.getCreateRouteTableDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSecurityListRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSecurityListRequest.java index cec2fa7e212..6687f2efdc2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSecurityListRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSecurityListRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateSecurityListRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateSecurityListRequest o) { + createSecurityListDetails(o.getCreateSecurityListDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSubnetRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSubnetRequest.java index 967ef5c010c..79c203702a8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSubnetRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSubnetRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateSubnetRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateSubnetRequest o) { + createSubnetDetails(o.getCreateSubnetDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVcnRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVcnRequest.java index 71165bff097..9927c423a3d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVcnRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVcnRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateVcnRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateVcnRequest o) { + createVcnDetails(o.getCreateVcnDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupRequest.java index 7a3c0c9c02b..152b76985f3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateVolumeBackupRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateVolumeBackupRequest o) { + createVolumeBackupDetails(o.getCreateVolumeBackupDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeRequest.java index 54f4dbdcca6..d86d7c8f50b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class CreateVolumeRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateVolumeRequest o) { + createVolumeDetails(o.getCreateVolumeDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteConsoleHistoryRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteConsoleHistoryRequest.java index 121610a792a..8a093e3abb2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteConsoleHistoryRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteConsoleHistoryRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteConsoleHistoryRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteConsoleHistoryRequest o) { + instanceConsoleHistoryId(o.getInstanceConsoleHistoryId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCpeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCpeRequest.java index ee604d1c7e4..6d7a9225563 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCpeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCpeRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteCpeRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteCpeRequest o) { + cpeId(o.getCpeId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDhcpOptionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDhcpOptionsRequest.java index 9bc0b685efb..9244a44d01c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDhcpOptionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDhcpOptionsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteDhcpOptionsRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteDhcpOptionsRequest o) { + dhcpId(o.getDhcpId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgAttachmentRequest.java index c6344e787c8..377c0085426 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgAttachmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgAttachmentRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteDrgAttachmentRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteDrgAttachmentRequest o) { + drgAttachmentId(o.getDrgAttachmentId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgRequest.java index f72b8dfc7b1..1d937216b26 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteDrgRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteDrgRequest o) { + drgId(o.getDrgId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteIPSecConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteIPSecConnectionRequest.java index 5d002d96d26..d0f54521aa9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteIPSecConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteIPSecConnectionRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteIPSecConnectionRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteIPSecConnectionRequest o) { + ipscId(o.getIpscId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteImageRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteImageRequest.java index b4a456c4414..5fe00fe8f1d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteImageRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteImageRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteImageRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteImageRequest o) { + imageId(o.getImageId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInternetGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInternetGatewayRequest.java index d15e07004f3..93a2ebd5ee2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInternetGatewayRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInternetGatewayRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteInternetGatewayRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteInternetGatewayRequest o) { + igId(o.getIgId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteRouteTableRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteRouteTableRequest.java index 1247881ca8c..dd0cd7f20bd 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteRouteTableRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteRouteTableRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteRouteTableRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteRouteTableRequest o) { + rtId(o.getRtId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSecurityListRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSecurityListRequest.java index d24f7d060a9..de74e833458 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSecurityListRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSecurityListRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteSecurityListRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteSecurityListRequest o) { + securityListId(o.getSecurityListId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSubnetRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSubnetRequest.java index 3cdc3ad2986..e76c86fe046 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSubnetRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSubnetRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteSubnetRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteSubnetRequest o) { + subnetId(o.getSubnetId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVcnRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVcnRequest.java index 6d15ff9f766..cfc80588b6f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVcnRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVcnRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteVcnRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteVcnRequest o) { + vcnId(o.getVcnId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeBackupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeBackupRequest.java index dc5f166f18a..1cf3218146e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeBackupRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeBackupRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteVolumeBackupRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteVolumeBackupRequest o) { + volumeBackupId(o.getVolumeBackupId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeRequest.java index a0fc2aa9a16..afbce583bba 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DeleteVolumeRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteVolumeRequest o) { + volumeId(o.getVolumeId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachVolumeRequest.java index 7c450030884..4031e68bdd3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachVolumeRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class DetachVolumeRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DetachVolumeRequest o) { + volumeAttachmentId(o.getVolumeAttachmentId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryContentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryContentRequest.java index 64b94da09ef..2b3f25a68db 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryContentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryContentRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,17 @@ public class GetConsoleHistoryContentRequest { * Length of the snapshot data to retrieve. */ private Integer length; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetConsoleHistoryContentRequest o) { + instanceConsoleHistoryId(o.getInstanceConsoleHistoryId()); + offset(o.getOffset()); + length(o.getLength()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryRequest.java index 1165b6e5b32..9434aebe2ec 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetConsoleHistoryRequest { * The OCID of the console history. */ private String instanceConsoleHistoryId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetConsoleHistoryRequest o) { + instanceConsoleHistoryId(o.getInstanceConsoleHistoryId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCpeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCpeRequest.java index 114674615f4..5a9e8feddb6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCpeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCpeRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetCpeRequest { * The OCID of the CPE. */ private String cpeId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetCpeRequest o) { + cpeId(o.getCpeId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDhcpOptionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDhcpOptionsRequest.java index 74b2a3c6ad2..5dd5bddb026 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDhcpOptionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDhcpOptionsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetDhcpOptionsRequest { * The OCID for the set of DHCP options. */ private String dhcpId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetDhcpOptionsRequest o) { + dhcpId(o.getDhcpId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgAttachmentRequest.java index e86d48d88db..12c1c8f1239 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgAttachmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgAttachmentRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetDrgAttachmentRequest { * The OCID of the DRG attachment. */ private String drgAttachmentId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetDrgAttachmentRequest o) { + drgAttachmentId(o.getDrgAttachmentId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgRequest.java index 56cd0044e0e..bc3cadd7053 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetDrgRequest { * The OCID of the DRG. */ private String drgId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetDrgRequest o) { + drgId(o.getDrgId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceConfigRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceConfigRequest.java index 9502aec9c8a..680a8aa3fe4 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceConfigRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceConfigRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetIPSecConnectionDeviceConfigRequest { * The OCID of the IPSec connection. */ private String ipscId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetIPSecConnectionDeviceConfigRequest o) { + ipscId(o.getIpscId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceStatusRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceStatusRequest.java index 80a10dbac7e..cb882efdd6d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceStatusRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceStatusRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetIPSecConnectionDeviceStatusRequest { * The OCID of the IPSec connection. */ private String ipscId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetIPSecConnectionDeviceStatusRequest o) { + ipscId(o.getIpscId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionRequest.java index 7c99501ed88..88fc85a4146 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetIPSecConnectionRequest { * The OCID of the IPSec connection. */ private String ipscId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetIPSecConnectionRequest o) { + ipscId(o.getIpscId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetImageRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetImageRequest.java index 27b4dde45a9..2204068f950 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetImageRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetImageRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetImageRequest { * The OCID of the image. */ private String imageId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetImageRequest o) { + imageId(o.getImageId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceRequest.java index 39a50c511b1..d6ad9dfa9ab 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetInstanceRequest { * The OCID of the instance. */ private String instanceId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetInstanceRequest o) { + instanceId(o.getInstanceId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInternetGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInternetGatewayRequest.java index 7ac2ca824d7..85c43ac8cc7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInternetGatewayRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInternetGatewayRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetInternetGatewayRequest { * The OCID of the Internet Gateway. */ private String igId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetInternetGatewayRequest o) { + igId(o.getIgId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetRouteTableRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetRouteTableRequest.java index 9e5bed2b86c..85e6e27ac58 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetRouteTableRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetRouteTableRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetRouteTableRequest { * The OCID of the route table. */ private String rtId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetRouteTableRequest o) { + rtId(o.getRtId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSecurityListRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSecurityListRequest.java index 2c5f27f4b44..a6e399df956 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSecurityListRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSecurityListRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetSecurityListRequest { * The OCID of the security list. */ private String securityListId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetSecurityListRequest o) { + securityListId(o.getSecurityListId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSubnetRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSubnetRequest.java index 33bb79eca91..792efaca2a7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSubnetRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSubnetRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetSubnetRequest { * The OCID of the subnet. */ private String subnetId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetSubnetRequest o) { + subnetId(o.getSubnetId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVcnRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVcnRequest.java index 7296ccd7392..f34760c6c8f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVcnRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVcnRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetVcnRequest { * The OCID of the VCN. */ private String vcnId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetVcnRequest o) { + vcnId(o.getVcnId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVnicRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVnicRequest.java index 644550228ec..41dabea9dd8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVnicRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVnicRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetVnicRequest { * The OCID of the VNIC. */ private String vnicId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetVnicRequest o) { + vnicId(o.getVnicId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeAttachmentRequest.java index 913a6bba2e5..52a18d96e71 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeAttachmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeAttachmentRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetVolumeAttachmentRequest { * The OCID of the volume attachment. */ private String volumeAttachmentId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetVolumeAttachmentRequest o) { + volumeAttachmentId(o.getVolumeAttachmentId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupRequest.java index 5c65530e9f3..6d61e1cd7e1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetVolumeBackupRequest { * The OCID of the volume backup. */ private String volumeBackupId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetVolumeBackupRequest o) { + volumeBackupId(o.getVolumeBackupId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeRequest.java index 5dbf2f71f22..e42ecbe3a46 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -22,4 +22,15 @@ public class GetVolumeRequest { * The OCID of the volume. */ private String volumeId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetVolumeRequest o) { + volumeId(o.getVolumeId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/InstanceActionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/InstanceActionRequest.java index c455ed022f5..d94eed4c2c7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/InstanceActionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/InstanceActionRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -45,4 +45,18 @@ public class InstanceActionRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(InstanceActionRequest o) { + instanceId(o.getInstanceId()); + action(o.getAction()); + opcRetryToken(o.getOpcRetryToken()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/LaunchInstanceRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/LaunchInstanceRequest.java index e25d7bbe177..d8e72d64165 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/LaunchInstanceRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/LaunchInstanceRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -32,4 +32,16 @@ public class LaunchInstanceRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(LaunchInstanceRequest o) { + launchInstanceDetails(o.getLaunchInstanceDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListConsoleHistoriesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListConsoleHistoriesRequest.java index 17a66e7bae3..181fa19230c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListConsoleHistoriesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListConsoleHistoriesRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -49,4 +49,19 @@ public class ListConsoleHistoriesRequest { * The OCID of the instance. */ private String instanceId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListConsoleHistoriesRequest o) { + compartmentId(o.getCompartmentId()); + availabilityDomain(o.getAvailabilityDomain()); + limit(o.getLimit()); + page(o.getPage()); + instanceId(o.getInstanceId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCpesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCpesRequest.java index 31ffc6702c3..d7ad7bf1eae 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCpesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCpesRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -36,4 +36,17 @@ public class ListCpesRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListCpesRequest o) { + compartmentId(o.getCompartmentId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDhcpOptionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDhcpOptionsRequest.java index 138c72c6dd7..0dad9208367 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDhcpOptionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDhcpOptionsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -41,4 +41,18 @@ public class ListDhcpOptionsRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListDhcpOptionsRequest o) { + compartmentId(o.getCompartmentId()); + vcnId(o.getVcnId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgAttachmentsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgAttachmentsRequest.java index fa661c763a1..d3f9caf5013 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgAttachmentsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgAttachmentsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -46,4 +46,19 @@ public class ListDrgAttachmentsRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListDrgAttachmentsRequest o) { + compartmentId(o.getCompartmentId()); + vcnId(o.getVcnId()); + drgId(o.getDrgId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgsRequest.java index 21995d9ead2..b9af9a6dc00 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -36,4 +36,17 @@ public class ListDrgsRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListDrgsRequest o) { + compartmentId(o.getCompartmentId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListIPSecConnectionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListIPSecConnectionsRequest.java index 7ae4b1857f8..0de6dfe2f0d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListIPSecConnectionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListIPSecConnectionsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -46,4 +46,19 @@ public class ListIPSecConnectionsRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListIPSecConnectionsRequest o) { + compartmentId(o.getCompartmentId()); + drgId(o.getDrgId()); + cpeId(o.getCpeId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListImagesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListImagesRequest.java index a12f36e1735..6a08b766f38 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListImagesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListImagesRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -60,4 +60,20 @@ public class ListImagesRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListImagesRequest o) { + compartmentId(o.getCompartmentId()); + displayName(o.getDisplayName()); + operatingSystem(o.getOperatingSystem()); + operatingSystemVersion(o.getOperatingSystemVersion()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstancesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstancesRequest.java index e1efc39d632..d1973dd8071 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstancesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstancesRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -52,4 +52,19 @@ public class ListInstancesRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListInstancesRequest o) { + compartmentId(o.getCompartmentId()); + availabilityDomain(o.getAvailabilityDomain()); + displayName(o.getDisplayName()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInternetGatewaysRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInternetGatewaysRequest.java index 4d84fa62009..ba43ffd9ee4 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInternetGatewaysRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInternetGatewaysRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -41,4 +41,18 @@ public class ListInternetGatewaysRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListInternetGatewaysRequest o) { + compartmentId(o.getCompartmentId()); + vcnId(o.getVcnId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListRouteTablesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListRouteTablesRequest.java index 833e3ba8b6c..1f6691714b3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListRouteTablesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListRouteTablesRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -41,4 +41,18 @@ public class ListRouteTablesRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListRouteTablesRequest o) { + compartmentId(o.getCompartmentId()); + vcnId(o.getVcnId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSecurityListsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSecurityListsRequest.java index 28bfb67f2e0..353177c93a0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSecurityListsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSecurityListsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -41,4 +41,18 @@ public class ListSecurityListsRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListSecurityListsRequest o) { + compartmentId(o.getCompartmentId()); + vcnId(o.getVcnId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListShapesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListShapesRequest.java index c2186916ba6..d9e62d0711f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListShapesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListShapesRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -49,4 +49,19 @@ public class ListShapesRequest { * The OCID of an image. */ private String imageId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListShapesRequest o) { + compartmentId(o.getCompartmentId()); + availabilityDomain(o.getAvailabilityDomain()); + limit(o.getLimit()); + page(o.getPage()); + imageId(o.getImageId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSubnetsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSubnetsRequest.java index 64535907468..cd73daad627 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSubnetsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSubnetsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -41,4 +41,18 @@ public class ListSubnetsRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListSubnetsRequest o) { + compartmentId(o.getCompartmentId()); + vcnId(o.getVcnId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVcnsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVcnsRequest.java index 82243833a41..b23522cf6ca 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVcnsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVcnsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -36,4 +36,17 @@ public class ListVcnsRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListVcnsRequest o) { + compartmentId(o.getCompartmentId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVnicAttachmentsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVnicAttachmentsRequest.java index 17db27f08c8..2fac5bd4546 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVnicAttachmentsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVnicAttachmentsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -54,4 +54,20 @@ public class ListVnicAttachmentsRequest { * The OCID of the VNIC. */ private String vnicId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListVnicAttachmentsRequest o) { + compartmentId(o.getCompartmentId()); + availabilityDomain(o.getAvailabilityDomain()); + instanceId(o.getInstanceId()); + limit(o.getLimit()); + page(o.getPage()); + vnicId(o.getVnicId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeAttachmentsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeAttachmentsRequest.java index 90b76dd607c..f90368439c3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeAttachmentsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeAttachmentsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -54,4 +54,20 @@ public class ListVolumeAttachmentsRequest { * The OCID of the volume. */ private String volumeId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListVolumeAttachmentsRequest o) { + compartmentId(o.getCompartmentId()); + availabilityDomain(o.getAvailabilityDomain()); + limit(o.getLimit()); + page(o.getPage()); + instanceId(o.getInstanceId()); + volumeId(o.getVolumeId()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeBackupsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeBackupsRequest.java index 2d64fba3ce1..2bc5ee5ca46 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeBackupsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeBackupsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -41,4 +41,18 @@ public class ListVolumeBackupsRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListVolumeBackupsRequest o) { + compartmentId(o.getCompartmentId()); + volumeId(o.getVolumeId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumesRequest.java index ef3a2f492a9..19631d469fa 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumesRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -44,4 +44,18 @@ public class ListVolumesRequest { * */ private String page; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListVolumesRequest o) { + compartmentId(o.getCompartmentId()); + availabilityDomain(o.getAvailabilityDomain()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/TerminateInstanceRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/TerminateInstanceRequest.java index a078fd8b61e..25467f86827 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/TerminateInstanceRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/TerminateInstanceRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -30,4 +30,16 @@ public class TerminateInstanceRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(TerminateInstanceRequest o) { + instanceId(o.getInstanceId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCpeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCpeRequest.java index e1f54b110f2..d1833756035 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCpeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCpeRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -35,4 +35,17 @@ public class UpdateCpeRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateCpeRequest o) { + cpeId(o.getCpeId()); + updateCpeDetails(o.getUpdateCpeDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDhcpOptionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDhcpOptionsRequest.java index 2715ec31369..7acd9701f78 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDhcpOptionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDhcpOptionsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -35,4 +35,17 @@ public class UpdateDhcpOptionsRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateDhcpOptionsRequest o) { + dhcpId(o.getDhcpId()); + updateDhcpDetails(o.getUpdateDhcpDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgAttachmentRequest.java index 17ce9f9dfa3..4c938749711 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgAttachmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgAttachmentRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -35,4 +35,17 @@ public class UpdateDrgAttachmentRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateDrgAttachmentRequest o) { + drgAttachmentId(o.getDrgAttachmentId()); + updateDrgAttachmentDetails(o.getUpdateDrgAttachmentDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgRequest.java index be07f5f1315..252ee10a529 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -35,4 +35,17 @@ public class UpdateDrgRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateDrgRequest o) { + drgId(o.getDrgId()); + updateDrgDetails(o.getUpdateDrgDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateIPSecConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateIPSecConnectionRequest.java index 211d08b4a6f..80811bfc0aa 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateIPSecConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateIPSecConnectionRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -35,4 +35,17 @@ public class UpdateIPSecConnectionRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateIPSecConnectionRequest o) { + ipscId(o.getIpscId()); + updateIPSecConnectionDetails(o.getUpdateIPSecConnectionDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateImageRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateImageRequest.java index 7954a80df1f..df25192dd04 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateImageRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateImageRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -45,4 +45,18 @@ public class UpdateImageRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateImageRequest o) { + imageId(o.getImageId()); + updateImageDetails(o.getUpdateImageDetails()); + opcRetryToken(o.getOpcRetryToken()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInstanceRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInstanceRequest.java index 2eb4066fc1b..95a10643d01 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInstanceRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInstanceRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -45,4 +45,18 @@ public class UpdateInstanceRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateInstanceRequest o) { + instanceId(o.getInstanceId()); + updateInstanceDetails(o.getUpdateInstanceDetails()); + opcRetryToken(o.getOpcRetryToken()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInternetGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInternetGatewayRequest.java index 2423cc5c199..90670cd8b21 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInternetGatewayRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInternetGatewayRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -35,4 +35,17 @@ public class UpdateInternetGatewayRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateInternetGatewayRequest o) { + igId(o.getIgId()); + updateInternetGatewayDetails(o.getUpdateInternetGatewayDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateRouteTableRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateRouteTableRequest.java index 7b202d02327..353b66259b4 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateRouteTableRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateRouteTableRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -35,4 +35,17 @@ public class UpdateRouteTableRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateRouteTableRequest o) { + rtId(o.getRtId()); + updateRouteTableDetails(o.getUpdateRouteTableDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSecurityListRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSecurityListRequest.java index 183054a7cc1..f606c735eb6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSecurityListRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSecurityListRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -35,4 +35,17 @@ public class UpdateSecurityListRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateSecurityListRequest o) { + securityListId(o.getSecurityListId()); + updateSecurityListDetails(o.getUpdateSecurityListDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSubnetRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSubnetRequest.java index 078b78fa6be..45a2d4323db 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSubnetRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSubnetRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -35,4 +35,17 @@ public class UpdateSubnetRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateSubnetRequest o) { + subnetId(o.getSubnetId()); + updateSubnetDetails(o.getUpdateSubnetDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVcnRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVcnRequest.java index 1c3b21da66b..6216f130efe 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVcnRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVcnRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -35,4 +35,17 @@ public class UpdateVcnRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateVcnRequest o) { + vcnId(o.getVcnId()); + updateVcnDetails(o.getUpdateVcnDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeBackupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeBackupRequest.java index ef060b16350..9c9514da932 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeBackupRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeBackupRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -35,4 +35,17 @@ public class UpdateVolumeBackupRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateVolumeBackupRequest o) { + volumeBackupId(o.getVolumeBackupId()); + updateVolumeBackupDetails(o.getUpdateVolumeBackupDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeRequest.java index ff32a8c707c..32d6d540f39 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.requests; @@ -35,4 +35,17 @@ public class UpdateVolumeRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateVolumeRequest o) { + volumeId(o.getVolumeId()); + updateVolumeDetails(o.getUpdateVolumeDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/AttachVolumeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/AttachVolumeResponse.java index 74634b0c13e..2335822181a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/AttachVolumeResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/AttachVolumeResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class AttachVolumeResponse { * The returned VolumeAttachment instance. */ private VolumeAttachment volumeAttachment; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(AttachVolumeResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + volumeAttachment(o.getVolumeAttachment()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CaptureConsoleHistoryResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CaptureConsoleHistoryResponse.java index a86b8f44fd9..0b6d7cc0192 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CaptureConsoleHistoryResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CaptureConsoleHistoryResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CaptureConsoleHistoryResponse { * The returned ConsoleHistory instance. */ private ConsoleHistory consoleHistory; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CaptureConsoleHistoryResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + consoleHistory(o.getConsoleHistory()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateCpeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateCpeResponse.java index 6fdf4db7b8e..db479e9f8a5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateCpeResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateCpeResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateCpeResponse { * The returned Cpe instance. */ private Cpe cpe; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateCpeResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + cpe(o.getCpe()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateDhcpOptionsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateDhcpOptionsResponse.java index 871de9986f1..7f9aa654c22 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateDhcpOptionsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateDhcpOptionsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateDhcpOptionsResponse { * The returned DhcpOptions instance. */ private DhcpOptions dhcpOptions; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateDhcpOptionsResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + dhcpOptions(o.getDhcpOptions()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateDrgAttachmentResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateDrgAttachmentResponse.java index 2567592c66f..85d37d37052 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateDrgAttachmentResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateDrgAttachmentResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateDrgAttachmentResponse { * The returned DrgAttachment instance. */ private DrgAttachment drgAttachment; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateDrgAttachmentResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + drgAttachment(o.getDrgAttachment()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateDrgResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateDrgResponse.java index 9ff69d3e877..bc33503bc7d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateDrgResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateDrgResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateDrgResponse { * The returned Drg instance. */ private Drg drg; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateDrgResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + drg(o.getDrg()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateIPSecConnectionResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateIPSecConnectionResponse.java index cc50cbe9081..584048a9eb1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateIPSecConnectionResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateIPSecConnectionResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateIPSecConnectionResponse { * The returned IPSecConnection instance. */ private IPSecConnection iPSecConnection; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateIPSecConnectionResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + iPSecConnection(o.getIPSecConnection()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateImageResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateImageResponse.java index 57c97ccb86e..9c1c1c8358f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateImageResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateImageResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateImageResponse { * The returned Image instance. */ private Image image; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateImageResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + image(o.getImage()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateInternetGatewayResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateInternetGatewayResponse.java index c965c407caf..54a11117afb 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateInternetGatewayResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateInternetGatewayResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateInternetGatewayResponse { * The returned InternetGateway instance. */ private InternetGateway internetGateway; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateInternetGatewayResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + internetGateway(o.getInternetGateway()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateRouteTableResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateRouteTableResponse.java index b1184333ff3..c8c3bbbe22d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateRouteTableResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateRouteTableResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateRouteTableResponse { * The returned RouteTable instance. */ private RouteTable routeTable; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateRouteTableResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + routeTable(o.getRouteTable()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateSecurityListResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateSecurityListResponse.java index 66804e4a231..c25b65946ca 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateSecurityListResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateSecurityListResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateSecurityListResponse { * The returned SecurityList instance. */ private SecurityList securityList; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateSecurityListResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + securityList(o.getSecurityList()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateSubnetResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateSubnetResponse.java index 5539ceab2a0..4ff2e649a5b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateSubnetResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateSubnetResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateSubnetResponse { * The returned Subnet instance. */ private Subnet subnet; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateSubnetResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + subnet(o.getSubnet()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateVcnResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateVcnResponse.java index 732bc73be1e..446ac7391ae 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateVcnResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateVcnResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateVcnResponse { * The returned Vcn instance. */ private Vcn vcn; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateVcnResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + vcn(o.getVcn()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateVolumeBackupResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateVolumeBackupResponse.java index 5785a4442e9..ae18d5398e2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateVolumeBackupResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateVolumeBackupResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateVolumeBackupResponse { * The returned VolumeBackup instance. */ private VolumeBackup volumeBackup; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateVolumeBackupResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + volumeBackup(o.getVolumeBackup()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateVolumeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateVolumeResponse.java index 6a179f61428..c98e15a7f13 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateVolumeResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateVolumeResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class CreateVolumeResponse { * The returned Volume instance. */ private Volume volume; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateVolumeResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + volume(o.getVolume()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteConsoleHistoryResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteConsoleHistoryResponse.java index 1c090162804..0433c2713e5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteConsoleHistoryResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteConsoleHistoryResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteConsoleHistoryResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteConsoleHistoryResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteCpeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteCpeResponse.java index 80c9e0c4e95..6e1c86117ce 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteCpeResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteCpeResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteCpeResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteCpeResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteDhcpOptionsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteDhcpOptionsResponse.java index 94e3db77137..c8606eb81e0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteDhcpOptionsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteDhcpOptionsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteDhcpOptionsResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteDhcpOptionsResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteDrgAttachmentResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteDrgAttachmentResponse.java index 9902ddde5b1..1cedb728ccd 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteDrgAttachmentResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteDrgAttachmentResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteDrgAttachmentResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteDrgAttachmentResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteDrgResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteDrgResponse.java index 9f5f3c83a26..0b8a2338279 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteDrgResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteDrgResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteDrgResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteDrgResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteIPSecConnectionResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteIPSecConnectionResponse.java index e1092040e54..04c3e9bfb1d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteIPSecConnectionResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteIPSecConnectionResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteIPSecConnectionResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteIPSecConnectionResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteImageResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteImageResponse.java index 0a80ce3b8bb..bb455cb9780 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteImageResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteImageResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteImageResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteImageResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteInternetGatewayResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteInternetGatewayResponse.java index 3b77341577f..27e842bf069 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteInternetGatewayResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteInternetGatewayResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteInternetGatewayResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteInternetGatewayResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteRouteTableResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteRouteTableResponse.java index b93f790e2fe..24df267f99a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteRouteTableResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteRouteTableResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteRouteTableResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteRouteTableResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteSecurityListResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteSecurityListResponse.java index 7a18aa65c86..7a579d383d2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteSecurityListResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteSecurityListResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteSecurityListResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteSecurityListResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteSubnetResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteSubnetResponse.java index 3694c7af92b..56aa0b456db 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteSubnetResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteSubnetResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteSubnetResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteSubnetResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteVcnResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteVcnResponse.java index dfefddbd600..748155287d7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteVcnResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteVcnResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteVcnResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteVcnResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteVolumeBackupResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteVolumeBackupResponse.java index 8fb0ae47193..ecf6d644a79 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteVolumeBackupResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteVolumeBackupResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteVolumeBackupResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteVolumeBackupResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteVolumeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteVolumeResponse.java index 10010a890b5..e8dee046961 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteVolumeResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteVolumeResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DeleteVolumeResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteVolumeResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DetachVolumeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DetachVolumeResponse.java index aaa7b7c2a63..012588754cb 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DetachVolumeResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DetachVolumeResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class DetachVolumeResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DetachVolumeResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetConsoleHistoryContentResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetConsoleHistoryContentResponse.java index 0b828757163..36687987012 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetConsoleHistoryContentResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetConsoleHistoryContentResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetConsoleHistoryContentResponse { * The returned String instance. */ private String value; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetConsoleHistoryContentResponse o) { + opcBytesRemaining(o.getOpcBytesRemaining()); + opcRequestId(o.getOpcRequestId()); + value(o.getValue()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetConsoleHistoryResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetConsoleHistoryResponse.java index ea6188f9d4c..f76dd40e7bd 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetConsoleHistoryResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetConsoleHistoryResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetConsoleHistoryResponse { * The returned ConsoleHistory instance. */ private ConsoleHistory consoleHistory; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetConsoleHistoryResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + consoleHistory(o.getConsoleHistory()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetCpeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetCpeResponse.java index 27fe8475ab7..109a448bfe7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetCpeResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetCpeResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetCpeResponse { * The returned Cpe instance. */ private Cpe cpe; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetCpeResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + cpe(o.getCpe()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetDhcpOptionsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetDhcpOptionsResponse.java index 6b369e31f43..eedef733c3f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetDhcpOptionsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetDhcpOptionsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetDhcpOptionsResponse { * The returned DhcpOptions instance. */ private DhcpOptions dhcpOptions; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetDhcpOptionsResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + dhcpOptions(o.getDhcpOptions()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetDrgAttachmentResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetDrgAttachmentResponse.java index dcba06195eb..9f286b9749d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetDrgAttachmentResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetDrgAttachmentResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetDrgAttachmentResponse { * The returned DrgAttachment instance. */ private DrgAttachment drgAttachment; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetDrgAttachmentResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + drgAttachment(o.getDrgAttachment()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetDrgResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetDrgResponse.java index 0a9603a53b2..7d9f8675e53 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetDrgResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetDrgResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetDrgResponse { * The returned Drg instance. */ private Drg drg; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetDrgResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + drg(o.getDrg()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetIPSecConnectionDeviceConfigResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetIPSecConnectionDeviceConfigResponse.java index 19633ee1055..e7d809028f0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetIPSecConnectionDeviceConfigResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetIPSecConnectionDeviceConfigResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetIPSecConnectionDeviceConfigResponse { * The returned IPSecConnectionDeviceConfig instance. */ private IPSecConnectionDeviceConfig iPSecConnectionDeviceConfig; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetIPSecConnectionDeviceConfigResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + iPSecConnectionDeviceConfig(o.getIPSecConnectionDeviceConfig()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetIPSecConnectionDeviceStatusResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetIPSecConnectionDeviceStatusResponse.java index 7fa1ebd858a..ff5894e3dd5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetIPSecConnectionDeviceStatusResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetIPSecConnectionDeviceStatusResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetIPSecConnectionDeviceStatusResponse { * The returned IPSecConnectionDeviceStatus instance. */ private IPSecConnectionDeviceStatus iPSecConnectionDeviceStatus; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetIPSecConnectionDeviceStatusResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + iPSecConnectionDeviceStatus(o.getIPSecConnectionDeviceStatus()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetIPSecConnectionResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetIPSecConnectionResponse.java index c66d097dcaa..c1472ebdf40 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetIPSecConnectionResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetIPSecConnectionResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetIPSecConnectionResponse { * The returned IPSecConnection instance. */ private IPSecConnection iPSecConnection; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetIPSecConnectionResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + iPSecConnection(o.getIPSecConnection()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetImageResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetImageResponse.java index eb8e01e726d..18a46ad2618 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetImageResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetImageResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetImageResponse { * The returned Image instance. */ private Image image; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetImageResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + image(o.getImage()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetInstanceResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetInstanceResponse.java index 6fa42cf799b..d3c91c91fb8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetInstanceResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetInstanceResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetInstanceResponse { * The returned Instance instance. */ private Instance instance; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetInstanceResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + instance(o.getInstance()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetInternetGatewayResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetInternetGatewayResponse.java index c569469ea5e..e9cbcb58404 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetInternetGatewayResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetInternetGatewayResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetInternetGatewayResponse { * The returned InternetGateway instance. */ private InternetGateway internetGateway; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetInternetGatewayResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + internetGateway(o.getInternetGateway()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetRouteTableResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetRouteTableResponse.java index bef5f1b5266..0870e7d8a48 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetRouteTableResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetRouteTableResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetRouteTableResponse { * The returned RouteTable instance. */ private RouteTable routeTable; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetRouteTableResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + routeTable(o.getRouteTable()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetSecurityListResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetSecurityListResponse.java index 0c801f71d5f..1c34278a1e0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetSecurityListResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetSecurityListResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetSecurityListResponse { * The returned SecurityList instance. */ private SecurityList securityList; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetSecurityListResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + securityList(o.getSecurityList()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetSubnetResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetSubnetResponse.java index 08ee212a61f..b6319083c0c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetSubnetResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetSubnetResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetSubnetResponse { * The returned Subnet instance. */ private Subnet subnet; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetSubnetResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + subnet(o.getSubnet()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVcnResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVcnResponse.java index a3c865817a5..fe1854281bf 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVcnResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVcnResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetVcnResponse { * The returned Vcn instance. */ private Vcn vcn; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetVcnResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + vcn(o.getVcn()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVnicResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVnicResponse.java index bc78f9dc99e..55498584dcd 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVnicResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVnicResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetVnicResponse { * The returned Vnic instance. */ private Vnic vnic; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetVnicResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + vnic(o.getVnic()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVolumeAttachmentResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVolumeAttachmentResponse.java index b17b7d2dd42..7874d2419e9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVolumeAttachmentResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVolumeAttachmentResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetVolumeAttachmentResponse { * The returned VolumeAttachment instance. */ private VolumeAttachment volumeAttachment; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetVolumeAttachmentResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + volumeAttachment(o.getVolumeAttachment()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVolumeBackupResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVolumeBackupResponse.java index 231dd4332e9..a52a1fca5e9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVolumeBackupResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVolumeBackupResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetVolumeBackupResponse { * The returned VolumeBackup instance. */ private VolumeBackup volumeBackup; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetVolumeBackupResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + volumeBackup(o.getVolumeBackup()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVolumeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVolumeResponse.java index 566b592606e..0ce0eb9b3d4 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVolumeResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetVolumeResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class GetVolumeResponse { * The returned Volume instance. */ private Volume volume; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetVolumeResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + volume(o.getVolume()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/InstanceActionResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/InstanceActionResponse.java index a93c27b2950..dd1a0d8ae29 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/InstanceActionResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/InstanceActionResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class InstanceActionResponse { * The returned Instance instance. */ private Instance instance; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(InstanceActionResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + instance(o.getInstance()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/LaunchInstanceResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/LaunchInstanceResponse.java index bda8d4093c8..d692d1c424f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/LaunchInstanceResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/LaunchInstanceResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class LaunchInstanceResponse { * The returned Instance instance. */ private Instance instance; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(LaunchInstanceResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + instance(o.getInstance()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListConsoleHistoriesResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListConsoleHistoriesResponse.java index 24addc95cfe..e1ccb2561bd 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListConsoleHistoriesResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListConsoleHistoriesResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListConsoleHistoriesResponse { * A list of ConsoleHistory instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListConsoleHistoriesResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListCpesResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListCpesResponse.java index 97c88cfa19f..a11674118f0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListCpesResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListCpesResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListCpesResponse { * A list of Cpe instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListCpesResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListDhcpOptionsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListDhcpOptionsResponse.java index 809b60f9bda..82609d74954 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListDhcpOptionsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListDhcpOptionsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListDhcpOptionsResponse { * A list of DhcpOptions instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListDhcpOptionsResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListDrgAttachmentsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListDrgAttachmentsResponse.java index fcce5d5a90f..1b91a40ea63 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListDrgAttachmentsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListDrgAttachmentsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListDrgAttachmentsResponse { * A list of DrgAttachment instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListDrgAttachmentsResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListDrgsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListDrgsResponse.java index 7f0ba6e0719..c7a17cbd969 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListDrgsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListDrgsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListDrgsResponse { * A list of Drg instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListDrgsResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListIPSecConnectionsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListIPSecConnectionsResponse.java index 06ab47292b8..dce7c152b47 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListIPSecConnectionsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListIPSecConnectionsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListIPSecConnectionsResponse { * A list of IPSecConnection instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListIPSecConnectionsResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListImagesResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListImagesResponse.java index 9d60560e0b4..7f9c61369c9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListImagesResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListImagesResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListImagesResponse { * A list of Image instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListImagesResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListInstancesResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListInstancesResponse.java index 601a941f482..798f327cd7e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListInstancesResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListInstancesResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListInstancesResponse { * A list of Instance instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListInstancesResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListInternetGatewaysResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListInternetGatewaysResponse.java index 2368dc191fa..3c64aedfae2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListInternetGatewaysResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListInternetGatewaysResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListInternetGatewaysResponse { * A list of InternetGateway instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListInternetGatewaysResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListRouteTablesResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListRouteTablesResponse.java index 6afe9f11a47..883fa672185 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListRouteTablesResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListRouteTablesResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListRouteTablesResponse { * A list of RouteTable instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListRouteTablesResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListSecurityListsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListSecurityListsResponse.java index 941b5361780..2858bdd1919 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListSecurityListsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListSecurityListsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListSecurityListsResponse { * A list of SecurityList instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListSecurityListsResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListShapesResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListShapesResponse.java index 66c9187ad7f..7d4ded7185e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListShapesResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListShapesResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListShapesResponse { * A list of Shape instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListShapesResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListSubnetsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListSubnetsResponse.java index dbd475f6919..5c0c1865717 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListSubnetsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListSubnetsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListSubnetsResponse { * A list of Subnet instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListSubnetsResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVcnsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVcnsResponse.java index 3c02772e2bc..795f7129462 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVcnsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVcnsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListVcnsResponse { * A list of Vcn instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListVcnsResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVnicAttachmentsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVnicAttachmentsResponse.java index c0543bcf049..ab09fe7816b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVnicAttachmentsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVnicAttachmentsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListVnicAttachmentsResponse { * A list of VnicAttachment instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListVnicAttachmentsResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVolumeAttachmentsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVolumeAttachmentsResponse.java index 6b616a0ad20..ddab25933f5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVolumeAttachmentsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVolumeAttachmentsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListVolumeAttachmentsResponse { * A list of VolumeAttachment instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListVolumeAttachmentsResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVolumeBackupsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVolumeBackupsResponse.java index 492bb581c78..d20da9d7d31 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVolumeBackupsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVolumeBackupsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListVolumeBackupsResponse { * A list of VolumeBackup instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListVolumeBackupsResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVolumesResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVolumesResponse.java index 8b32024f98e..3d29a9b131a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVolumesResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListVolumesResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -39,4 +39,18 @@ public class ListVolumesResponse { * A list of Volume instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListVolumesResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/TerminateInstanceResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/TerminateInstanceResponse.java index f99138abd7c..65771cb35d5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/TerminateInstanceResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/TerminateInstanceResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -26,4 +26,16 @@ public class TerminateInstanceResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(TerminateInstanceResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateCpeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateCpeResponse.java index 1e1b3eaa5bf..78e0222d771 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateCpeResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateCpeResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateCpeResponse { * The returned Cpe instance. */ private Cpe cpe; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateCpeResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + cpe(o.getCpe()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateDhcpOptionsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateDhcpOptionsResponse.java index d219d216cd6..9334e489c2d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateDhcpOptionsResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateDhcpOptionsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateDhcpOptionsResponse { * The returned DhcpOptions instance. */ private DhcpOptions dhcpOptions; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateDhcpOptionsResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + dhcpOptions(o.getDhcpOptions()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateDrgAttachmentResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateDrgAttachmentResponse.java index ae4d6598d8c..d841b9955eb 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateDrgAttachmentResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateDrgAttachmentResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateDrgAttachmentResponse { * The returned DrgAttachment instance. */ private DrgAttachment drgAttachment; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateDrgAttachmentResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + drgAttachment(o.getDrgAttachment()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateDrgResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateDrgResponse.java index 601d9d6f07f..d1122c6918d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateDrgResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateDrgResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateDrgResponse { * The returned Drg instance. */ private Drg drg; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateDrgResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + drg(o.getDrg()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateIPSecConnectionResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateIPSecConnectionResponse.java index 143ddcc7c43..cd129cb549b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateIPSecConnectionResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateIPSecConnectionResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateIPSecConnectionResponse { * The returned IPSecConnection instance. */ private IPSecConnection iPSecConnection; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateIPSecConnectionResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + iPSecConnection(o.getIPSecConnection()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateImageResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateImageResponse.java index cf55c78da09..485c5a0311a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateImageResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateImageResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateImageResponse { * The returned Image instance. */ private Image image; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateImageResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + image(o.getImage()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateInstanceResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateInstanceResponse.java index 7e40a33d548..8462376fdea 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateInstanceResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateInstanceResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateInstanceResponse { * The returned Instance instance. */ private Instance instance; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateInstanceResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + instance(o.getInstance()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateInternetGatewayResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateInternetGatewayResponse.java index 4b495468419..4ee82e5ba7b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateInternetGatewayResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateInternetGatewayResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateInternetGatewayResponse { * The returned InternetGateway instance. */ private InternetGateway internetGateway; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateInternetGatewayResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + internetGateway(o.getInternetGateway()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateRouteTableResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateRouteTableResponse.java index b3503379ed5..4f89a6c4eb3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateRouteTableResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateRouteTableResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateRouteTableResponse { * The returned RouteTable instance. */ private RouteTable routeTable; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateRouteTableResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + routeTable(o.getRouteTable()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateSecurityListResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateSecurityListResponse.java index 0c551d74141..4ad85130758 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateSecurityListResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateSecurityListResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateSecurityListResponse { * The returned SecurityList instance. */ private SecurityList securityList; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateSecurityListResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + securityList(o.getSecurityList()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateSubnetResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateSubnetResponse.java index 2df729566e8..3b548e48309 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateSubnetResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateSubnetResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateSubnetResponse { * The returned Subnet instance. */ private Subnet subnet; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateSubnetResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + subnet(o.getSubnet()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateVcnResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateVcnResponse.java index 0bdc3ac0377..d4c638fe568 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateVcnResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateVcnResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateVcnResponse { * The returned Vcn instance. */ private Vcn vcn; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateVcnResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + vcn(o.getVcn()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateVolumeBackupResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateVolumeBackupResponse.java index 36354d99a3b..a8395d3744b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateVolumeBackupResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateVolumeBackupResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -29,4 +29,17 @@ public class UpdateVolumeBackupResponse { * The returned VolumeBackup instance. */ private VolumeBackup volumeBackup; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateVolumeBackupResponse o) { + etag(o.getEtag()); + volumeBackup(o.getVolumeBackup()); + + return this; + } + } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateVolumeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateVolumeResponse.java index 0c05e03012c..0bc20382ec5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateVolumeResponse.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateVolumeResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.core.responses; @@ -36,4 +36,18 @@ public class UpdateVolumeResponse { * The returned Volume instance. */ private Volume volume; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateVolumeResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + volume(o.getVolume()); + + return this; + } + } } diff --git a/bmc-examples/pom.xml b/bmc-examples/pom.xml index f81e9356c35..a6e45b8fe6d 100644 --- a/bmc-examples/pom.xml +++ b/bmc-examples/pom.xml @@ -5,7 +5,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk - 1.2.3-SNAPSHOT + 1.2.3 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk-bom - 1.2.3-SNAPSHOT + 1.2.3 pom import diff --git a/bmc-examples/src/main/java/CreateInstanceExample.java b/bmc-examples/src/main/java/CreateInstanceExample.java index 33a45917b1e..7b0b2862693 100644 --- a/bmc-examples/src/main/java/CreateInstanceExample.java +++ b/bmc-examples/src/main/java/CreateInstanceExample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ import java.util.ArrayList; import java.util.HashMap; diff --git a/bmc-examples/src/main/java/GetImageLatestVersionExample.java b/bmc-examples/src/main/java/GetImageLatestVersionExample.java index 4bd567b1dff..6c6148a67af 100644 --- a/bmc-examples/src/main/java/GetImageLatestVersionExample.java +++ b/bmc-examples/src/main/java/GetImageLatestVersionExample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ import java.util.List; @@ -19,7 +19,7 @@ public static void main(String[] args) throws Exception { Region region = Region.US_PHOENIX_1; String operatingSystem = "Oracle Linux"; String operatingSystemVersion = "6.7"; - + String configurationFilePath = "~/.oraclebmc/config"; String profile = "DEFAULT"; @@ -29,22 +29,22 @@ public static void main(String[] args) throws Exception { // Find matching images ComputeClient computeClient = new ComputeClient(provider); computeClient.setRegion(region); - - ListImagesResponse listImagesResponse = computeClient.listImages( - ListImagesRequest.builder() - .compartmentId(provider.getTenantId()) - .operatingSystem(operatingSystem) - .operatingSystemVersion(operatingSystemVersion) - .build()); - + + ListImagesResponse listImagesResponse = + computeClient.listImages( + ListImagesRequest.builder() + .compartmentId(provider.getTenantId()) + .operatingSystem(operatingSystem) + .operatingSystemVersion(operatingSystemVersion) + .build()); + computeClient.close(); - + List matchingImages = listImagesResponse.getItems(); - - if(matchingImages.size() == 0) { + + if (matchingImages.size() == 0) { System.out.println("No matching images found."); - } - else { + } else { /* * Images are sorted by system images first, then custom images, secondarily sorted by image display name. * Since image display names take the format of "--..-", @@ -52,8 +52,8 @@ public static void main(String[] args) throws Exception { * image for that OS / OS version. */ Image latestImageVersion = matchingImages.get(0); - + System.out.println(latestImageVersion); } } -} \ No newline at end of file +} diff --git a/bmc-examples/src/main/java/GetInstancePublicIpExample.java b/bmc-examples/src/main/java/GetInstancePublicIpExample.java index 6799c83a24d..444eb4d1443 100644 --- a/bmc-examples/src/main/java/GetInstancePublicIpExample.java +++ b/bmc-examples/src/main/java/GetInstancePublicIpExample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ import java.util.List; diff --git a/bmc-examples/src/main/java/ListAuditEventsExample.java b/bmc-examples/src/main/java/ListAuditEventsExample.java index c542e02db20..c41541ae0a0 100644 --- a/bmc-examples/src/main/java/ListAuditEventsExample.java +++ b/bmc-examples/src/main/java/ListAuditEventsExample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ import java.util.Date; diff --git a/bmc-examples/src/main/java/ObjectStorageAsyncExample.java b/bmc-examples/src/main/java/ObjectStorageAsyncExample.java index 0ebccebf9bd..825b9fdc824 100644 --- a/bmc-examples/src/main/java/ObjectStorageAsyncExample.java +++ b/bmc-examples/src/main/java/ObjectStorageAsyncExample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ import java.util.concurrent.CountDownLatch; diff --git a/bmc-examples/src/main/java/ObjectStorageSyncExample.java b/bmc-examples/src/main/java/ObjectStorageSyncExample.java index ebc70a2a27a..502fc6c2183 100644 --- a/bmc-examples/src/main/java/ObjectStorageSyncExample.java +++ b/bmc-examples/src/main/java/ObjectStorageSyncExample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ import com.oracle.bmc.Region; import com.oracle.bmc.auth.AuthenticationDetailsProvider; diff --git a/bmc-examples/src/main/java/RawRestCallExample.java b/bmc-examples/src/main/java/RawRestCallExample.java new file mode 100644 index 00000000000..d320c51c214 --- /dev/null +++ b/bmc-examples/src/main/java/RawRestCallExample.java @@ -0,0 +1,96 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.Map; + +import javax.annotation.Priority; +import javax.ws.rs.Priorities; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.ClientRequestContext; +import javax.ws.rs.client.ClientRequestFilter; +import javax.ws.rs.client.Invocation; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.Response; + +import com.google.common.net.UrlEscapers; +import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider; +import com.oracle.bmc.http.signing.DefaultRequestSigner; +import com.oracle.bmc.http.signing.RequestSigner; + +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + +public class RawRestCallExample { + + public static void main(String[] args) throws Exception { + // fill this out + String instanceId = null; + + String configurationFilePath = "~/.oraclebmc/config"; + String profile = "DEFAULT"; + + // 1) Create your auth provider and request signer + AuthenticationDetailsProvider provider = + new ConfigFileAuthenticationDetailsProvider(configurationFilePath, profile); + RequestSigner requestSigner = DefaultRequestSigner.createRequestSigner(provider); + + // 2) Create a Jersey client + Client client = + ClientBuilder.newBuilder().build().register(new SigningFilter(requestSigner)); + + // 3) Target an endpoint. You must ensure that path arguments and query + // params are escaped correctly yourself + WebTarget target = + client.target("https://iaas.us-phoenix-1.oraclecloud.com") + .path("20160918") + .path("instances") + .path(UrlEscapers.urlPathSegmentEscaper().escape(instanceId)); + + // 4) Set the expected type and invoke the call + Invocation.Builder ib = target.request(); + ib.accept(MediaType.APPLICATION_JSON); + Response response = ib.get(); + + // 5) Print the response headers and the body (JSON) as a string + MultivaluedMap responseHeaders = response.getHeaders(); + System.out.println(responseHeaders); + InputStream responseBody = (InputStream) response.getEntity(); + try (final BufferedReader reader = + new BufferedReader(new InputStreamReader(responseBody))) { + StringBuilder jsonBody = new StringBuilder(); + String line; + while ((line = reader.readLine()) != null) { + jsonBody.append(line); + } + System.out.println(jsonBody.toString()); + } + } + + @Priority(Priorities.AUTHENTICATION) + @RequiredArgsConstructor + private static class SigningFilter implements ClientRequestFilter { + private final RequestSigner requestSigner; + + @Override + public void filter(@NonNull ClientRequestContext clientRequestContext) throws IOException { + Map authHeaders = + requestSigner.signRequest( + clientRequestContext.getUri(), + clientRequestContext.getMethod(), + clientRequestContext.getStringHeaders(), + clientRequestContext.getEntity()); + + for (String key : authHeaders.keySet()) { + clientRequestContext.getHeaders().putSingle(key, authHeaders.get(key)); + } + } + } +} diff --git a/bmc-identity/pom.xml b/bmc-identity/pom.xml index 2b7299eb385..e34471c3751 100644 --- a/bmc-identity/pom.xml +++ b/bmc-identity/pom.xml @@ -5,7 +5,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk - 1.2.3-SNAPSHOT + 1.2.3 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk-common - 1.2.3-SNAPSHOT + 1.2.3 diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/Identity.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/Identity.java index e47f2850fdb..0ac6915307b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/Identity.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/Identity.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsync.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsync.java index af352a516d3..7bb890f6dc6 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsync.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsync.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsyncClient.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsyncClient.java index 8f6c4a05b1b..eb159491677 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsyncClient.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsyncClient.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.*; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.internal.*; +import com.oracle.bmc.http.signing.*; +import com.oracle.bmc.http.signing.internal.*; import com.oracle.bmc.responses.*; import com.oracle.bmc.util.internal.*; @@ -41,46 +43,61 @@ public class IdentityAsyncClient implements IdentityAsync { /** * Creates a new service instance using the given authentication provider. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. */ - public IdentityAsyncClient(AuthenticationDetailsProvider authenticationProvider) { - this.client = newClientBuilder().build().create(SERVICE, authenticationProvider); + public IdentityAsyncClient(BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + this(authenticationDetailsProvider, null); } /** * Creates a new service instance using the given authentication provider and client configuration. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. */ public IdentityAsyncClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration) { - this.client = - newClientBuilder().build().create(SERVICE, authenticationProvider, configuration); + this(authenticationDetailsProvider, configuration, null); } /** * Creates a new service instance using the given authentication provider and client configuration. Additionally, * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. */ public IdentityAsyncClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { - this.client = - newClientBuilder() - .clientConfigurator(clientConfigurator) - .build() - .create(SERVICE, authenticationProvider, configuration); + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + new DefaultRequestSignerFactory(SigningStrategy.STANDARD)); } - private static RestClientFactoryBuilder newClientBuilder() { - RestClientFactoryBuilder builder = RestClientFactoryBuilder.builder(); - - return builder; + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param requestSignerFactory The request signer factory used to create the request signer for this service. + */ + public IdentityAsyncClient( + AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + ClientConfiguration configuration, + ClientConfigurator clientConfigurator, + RequestSignerFactory requestSignerFactory) { + RestClientFactory restClientFactory = + RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build(); + RequestSigner requestSigner = + requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider); + this.client = restClientFactory.create(requestSigner, configuration); } @Override diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityClient.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityClient.java index c49a0072160..8e7c30a31cf 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityClient.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityClient.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.*; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.internal.*; +import com.oracle.bmc.http.signing.*; +import com.oracle.bmc.http.signing.internal.*; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -43,52 +45,63 @@ public class IdentityClient implements Identity { /** * Creates a new service instance using the given authentication provider. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. */ - public IdentityClient(AuthenticationDetailsProvider authenticationProvider) { - this.client = newClientBuilder().build().create(SERVICE, authenticationProvider); - - this.waiters = new IdentityWaiters(executorService, this); + public IdentityClient(BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + this(authenticationDetailsProvider, null); } /** * Creates a new service instance using the given authentication provider and client configuration. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. */ public IdentityClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration) { - this.client = - newClientBuilder().build().create(SERVICE, authenticationProvider, configuration); - - this.waiters = new IdentityWaiters(executorService, this); + this(authenticationDetailsProvider, configuration, null); } /** * Creates a new service instance using the given authentication provider and client configuration. Additionally, * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. */ public IdentityClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { - this.client = - newClientBuilder() - .clientConfigurator(clientConfigurator) - .build() - .create(SERVICE, authenticationProvider, configuration); - - this.waiters = new IdentityWaiters(executorService, this); + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + new DefaultRequestSignerFactory(SigningStrategy.STANDARD)); } - private static RestClientFactoryBuilder newClientBuilder() { - RestClientFactoryBuilder builder = RestClientFactoryBuilder.builder(); + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param requestSignerFactory The request signer factory used to create the request signer for this service. + */ + public IdentityClient( + AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + ClientConfiguration configuration, + ClientConfigurator clientConfigurator, + RequestSignerFactory requestSignerFactory) { + RestClientFactory restClientFactory = + RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build(); + RequestSigner requestSigner = + requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider); + this.client = restClientFactory.create(requestSigner, configuration); - return builder; + this.waiters = new IdentityWaiters(executorService, this); } @Override diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityWaiters.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityWaiters.java index 04ec8837616..3ccf56262cc 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityWaiters.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityWaiters.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/AddUserToGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/AddUserToGroupConverter.java index 8688292a825..8f1733c77ed 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/AddUserToGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/AddUserToGroupConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateCompartmentConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateCompartmentConverter.java index 91a5c900a1e..89b8413e2a8 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateCompartmentConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateCompartmentConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateGroupConverter.java index 07c5266d7b0..3dac8f26952 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateGroupConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateOrResetUIPasswordConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateOrResetUIPasswordConverter.java index 8e871917a6e..38c54654317 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateOrResetUIPasswordConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateOrResetUIPasswordConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreatePolicyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreatePolicyConverter.java index 71665bd46d9..320a52c23ed 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreatePolicyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreatePolicyConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateSwiftPasswordConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateSwiftPasswordConverter.java index df376278301..0bac3597b2e 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateSwiftPasswordConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateSwiftPasswordConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateUserConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateUserConverter.java index 895efd2904f..b27a33b8fa5 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateUserConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateUserConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteApiKeyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteApiKeyConverter.java index 6d9c928626d..7b9b4c1ab85 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteApiKeyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteApiKeyConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteGroupConverter.java index 528381b2b27..4c1d5168b36 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteGroupConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeletePolicyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeletePolicyConverter.java index 28898ae48c9..edfad54ff0b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeletePolicyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeletePolicyConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteSwiftPasswordConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteSwiftPasswordConverter.java index 10828f23135..d27de3a3cd4 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteSwiftPasswordConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteSwiftPasswordConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteUserConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteUserConverter.java index 9bd4f12552a..bf26a717999 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteUserConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteUserConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetCompartmentConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetCompartmentConverter.java index b48ac36a9cb..056ce62e3d3 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetCompartmentConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetCompartmentConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetGroupConverter.java index 80d92aaf23f..db42220128d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetGroupConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetPolicyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetPolicyConverter.java index 23109942942..9685b111468 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetPolicyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetPolicyConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserConverter.java index 8fd4339a7a2..81ee51b61dd 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserGroupMembershipConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserGroupMembershipConverter.java index 790621a0746..e90f3a8fd0c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserGroupMembershipConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserGroupMembershipConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListApiKeysConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListApiKeysConverter.java index 93e197c625b..77afc02ff10 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListApiKeysConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListApiKeysConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListAvailabilityDomainsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListAvailabilityDomainsConverter.java index 3b612f7ade5..a459ffc655b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListAvailabilityDomainsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListAvailabilityDomainsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListCompartmentsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListCompartmentsConverter.java index ce9963ace5f..989d1a65185 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListCompartmentsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListCompartmentsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListGroupsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListGroupsConverter.java index 544a82b068c..bbb40578ea2 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListGroupsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListGroupsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListPoliciesConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListPoliciesConverter.java index dd94213913f..fdac296ad44 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListPoliciesConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListPoliciesConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListSwiftPasswordsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListSwiftPasswordsConverter.java index 25a42604848..4fb636ef951 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListSwiftPasswordsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListSwiftPasswordsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUserGroupMembershipsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUserGroupMembershipsConverter.java index 60b6cfe6587..c98bdc47aee 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUserGroupMembershipsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUserGroupMembershipsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUsersConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUsersConverter.java index cd9e8444e2d..f8a0d11c3cf 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUsersConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUsersConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/RemoveUserFromGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/RemoveUserFromGroupConverter.java index d797806ba49..06695bf31e7 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/RemoveUserFromGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/RemoveUserFromGroupConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateCompartmentConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateCompartmentConverter.java index 31caad0dccc..76e687f0594 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateCompartmentConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateCompartmentConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateGroupConverter.java index 04956f6a6eb..b500a413640 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateGroupConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdatePolicyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdatePolicyConverter.java index 619dab0d353..4111658cbaf 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdatePolicyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdatePolicyConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateSwiftPasswordConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateSwiftPasswordConverter.java index 78fd5d0217c..1143ae2b3ed 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateSwiftPasswordConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateSwiftPasswordConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserConverter.java index acebb61d4d6..14290f5f6df 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserStateConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserStateConverter.java index 58dd360b17b..d6394c73a2b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserStateConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserStateConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UploadApiKeyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UploadApiKeyConverter.java index a8af9a7d27c..a1d6ea7bf66 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UploadApiKeyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UploadApiKeyConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.internal.http; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AddUserToGroupDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AddUserToGroupDetails.java index ba180bee1f7..c316bd176b9 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AddUserToGroupDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AddUserToGroupDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/ApiKey.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/ApiKey.java index d8d927f433e..8360f945cb5 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/ApiKey.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/ApiKey.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AvailabilityDomain.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AvailabilityDomain.java index 830aa66738a..e94689a1a89 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AvailabilityDomain.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AvailabilityDomain.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Compartment.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Compartment.java index edb185e4f90..4bcf6c2dc53 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Compartment.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Compartment.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateApiKeyDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateApiKeyDetails.java index c7c0e8894a7..eed487a8066 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateApiKeyDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateApiKeyDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateCompartmentDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateCompartmentDetails.java index 1eaf78681fe..4c876d5cc50 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateCompartmentDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateCompartmentDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateGroupDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateGroupDetails.java index a07be6dc9e4..9062e32e340 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateGroupDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateGroupDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreatePolicyDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreatePolicyDetails.java index 7852652a45b..fc13e78c7e6 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreatePolicyDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreatePolicyDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateSwiftPasswordDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateSwiftPasswordDetails.java index 152d30a0f97..22e9a5bdd53 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateSwiftPasswordDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateSwiftPasswordDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateUserDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateUserDetails.java index 508f716bde3..e126cdc8b56 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateUserDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateUserDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Group.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Group.java index 4e5b16cf071..c181076007d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Group.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Group.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Policy.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Policy.java index f6f72e0f16a..7bbcb2271de 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Policy.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Policy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/SwiftPassword.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/SwiftPassword.java index 8fcef1de5f8..51b111b460e 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/SwiftPassword.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/SwiftPassword.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UIPassword.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UIPassword.java index e532f0bc127..65870cf8cc7 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UIPassword.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UIPassword.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCompartmentDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCompartmentDetails.java index bf82b76e39e..72bc2cfb28f 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCompartmentDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCompartmentDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateGroupDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateGroupDetails.java index 7398d74be57..196b1898a04 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateGroupDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateGroupDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdatePolicyDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdatePolicyDetails.java index 667d5585a3b..752b9ad3928 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdatePolicyDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdatePolicyDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateStateDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateStateDetails.java index 37381557b12..c49d2c15cf9 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateStateDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateStateDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateSwiftPasswordDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateSwiftPasswordDetails.java index 9c5dbb5cb78..a137bc9b528 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateSwiftPasswordDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateSwiftPasswordDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateUserDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateUserDetails.java index 53f09371695..57b85feb334 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateUserDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateUserDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/User.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/User.java index 84b34e19821..1f1a6b03d22 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/User.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/User.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UserGroupMembership.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UserGroupMembership.java index 0dd988171a5..4724587ff6b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UserGroupMembership.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UserGroupMembership.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.model; diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/AddUserToGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/AddUserToGroupRequest.java index a5845615b03..3b14c3577f8 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/AddUserToGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/AddUserToGroupRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -32,4 +32,16 @@ public class AddUserToGroupRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(AddUserToGroupRequest o) { + addUserToGroupDetails(o.getAddUserToGroupDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCompartmentRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCompartmentRequest.java index 0eec2bd7e9a..26461dde0c2 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCompartmentRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCompartmentRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -32,4 +32,16 @@ public class CreateCompartmentRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateCompartmentRequest o) { + createCompartmentDetails(o.getCreateCompartmentDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateGroupRequest.java index fab2ccef8ab..b5c72e8b6e0 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateGroupRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -32,4 +32,16 @@ public class CreateGroupRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateGroupRequest o) { + createGroupDetails(o.getCreateGroupDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateOrResetUIPasswordRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateOrResetUIPasswordRequest.java index 47be2754619..ed70e66e9ee 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateOrResetUIPasswordRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateOrResetUIPasswordRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -32,4 +32,16 @@ public class CreateOrResetUIPasswordRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateOrResetUIPasswordRequest o) { + userId(o.getUserId()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreatePolicyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreatePolicyRequest.java index ffdaca706b5..9aaacd396b7 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreatePolicyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreatePolicyRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -32,4 +32,16 @@ public class CreatePolicyRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreatePolicyRequest o) { + createPolicyDetails(o.getCreatePolicyDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateSwiftPasswordRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateSwiftPasswordRequest.java index 752dce1085f..8f60d9fe00f 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateSwiftPasswordRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateSwiftPasswordRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -37,4 +37,17 @@ public class CreateSwiftPasswordRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateSwiftPasswordRequest o) { + createSwiftPasswordDetails(o.getCreateSwiftPasswordDetails()); + userId(o.getUserId()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateUserRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateUserRequest.java index d14578597ac..b247bcfcb10 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateUserRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateUserRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -32,4 +32,16 @@ public class CreateUserRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateUserRequest o) { + createUserDetails(o.getCreateUserDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteApiKeyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteApiKeyRequest.java index ff98ccc6685..07408052283 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteApiKeyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteApiKeyRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -35,4 +35,17 @@ public class DeleteApiKeyRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteApiKeyRequest o) { + userId(o.getUserId()); + fingerprint(o.getFingerprint()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteGroupRequest.java index d55d1ea24ed..94388cdbd3a 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteGroupRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -30,4 +30,16 @@ public class DeleteGroupRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteGroupRequest o) { + groupId(o.getGroupId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeletePolicyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeletePolicyRequest.java index 497d21fc9fa..353a61ae0a8 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeletePolicyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeletePolicyRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -30,4 +30,16 @@ public class DeletePolicyRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeletePolicyRequest o) { + policyId(o.getPolicyId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteSwiftPasswordRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteSwiftPasswordRequest.java index ec445f4894e..23e4cb25351 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteSwiftPasswordRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteSwiftPasswordRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -35,4 +35,17 @@ public class DeleteSwiftPasswordRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteSwiftPasswordRequest o) { + userId(o.getUserId()); + swiftPasswordId(o.getSwiftPasswordId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteUserRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteUserRequest.java index b52f4e4dc96..4da2716b428 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteUserRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteUserRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -30,4 +30,16 @@ public class DeleteUserRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteUserRequest o) { + userId(o.getUserId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetCompartmentRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetCompartmentRequest.java index 484942affa2..5c5e6ad7c1b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetCompartmentRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetCompartmentRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -22,4 +22,15 @@ public class GetCompartmentRequest { * The OCID of the compartment. */ private String compartmentId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetCompartmentRequest o) { + compartmentId(o.getCompartmentId()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetGroupRequest.java index 4017677fb00..04af6698970 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetGroupRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -22,4 +22,15 @@ public class GetGroupRequest { * The OCID of the group. */ private String groupId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetGroupRequest o) { + groupId(o.getGroupId()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetPolicyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetPolicyRequest.java index f68b8c0d210..7b81deb1ecc 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetPolicyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetPolicyRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -22,4 +22,15 @@ public class GetPolicyRequest { * The OCID of the policy. */ private String policyId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetPolicyRequest o) { + policyId(o.getPolicyId()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserGroupMembershipRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserGroupMembershipRequest.java index 47ad8d293cb..46629a6f202 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserGroupMembershipRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserGroupMembershipRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -22,4 +22,15 @@ public class GetUserGroupMembershipRequest { * The OCID of the userGroupMembership. */ private String userGroupMembershipId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetUserGroupMembershipRequest o) { + userGroupMembershipId(o.getUserGroupMembershipId()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserRequest.java index 3a1def9aa1d..d29d5b0b39c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -22,4 +22,15 @@ public class GetUserRequest { * The OCID of the user. */ private String userId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetUserRequest o) { + userId(o.getUserId()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListApiKeysRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListApiKeysRequest.java index a2a3742eba0..43af287d96f 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListApiKeysRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListApiKeysRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -22,4 +22,15 @@ public class ListApiKeysRequest { * The OCID of the user. */ private String userId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListApiKeysRequest o) { + userId(o.getUserId()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListAvailabilityDomainsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListAvailabilityDomainsRequest.java index 856233a3435..625eba314ff 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListAvailabilityDomainsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListAvailabilityDomainsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -23,4 +23,15 @@ public class ListAvailabilityDomainsRequest { * */ private String compartmentId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListAvailabilityDomainsRequest o) { + compartmentId(o.getCompartmentId()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCompartmentsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCompartmentsRequest.java index 6b8f53ad0d1..9b55cf01579 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCompartmentsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCompartmentsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -35,4 +35,17 @@ public class ListCompartmentsRequest { * */ private Integer limit; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListCompartmentsRequest o) { + compartmentId(o.getCompartmentId()); + page(o.getPage()); + limit(o.getLimit()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListGroupsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListGroupsRequest.java index 683c6685236..2cf25b801f8 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListGroupsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListGroupsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -35,4 +35,17 @@ public class ListGroupsRequest { * */ private Integer limit; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListGroupsRequest o) { + compartmentId(o.getCompartmentId()); + page(o.getPage()); + limit(o.getLimit()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListPoliciesRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListPoliciesRequest.java index cfb68db0a48..deae221dfab 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListPoliciesRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListPoliciesRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -35,4 +35,17 @@ public class ListPoliciesRequest { * */ private Integer limit; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListPoliciesRequest o) { + compartmentId(o.getCompartmentId()); + page(o.getPage()); + limit(o.getLimit()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListSwiftPasswordsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListSwiftPasswordsRequest.java index c793a8f37b6..d4e65015359 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListSwiftPasswordsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListSwiftPasswordsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -22,4 +22,15 @@ public class ListSwiftPasswordsRequest { * The OCID of the user. */ private String userId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListSwiftPasswordsRequest o) { + userId(o.getUserId()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUserGroupMembershipsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUserGroupMembershipsRequest.java index 1764a4c11cc..216fd3f6da1 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUserGroupMembershipsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUserGroupMembershipsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -45,4 +45,19 @@ public class ListUserGroupMembershipsRequest { * */ private Integer limit; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListUserGroupMembershipsRequest o) { + compartmentId(o.getCompartmentId()); + userId(o.getUserId()); + groupId(o.getGroupId()); + page(o.getPage()); + limit(o.getLimit()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUsersRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUsersRequest.java index 8d62216c007..39523302b21 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUsersRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUsersRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -35,4 +35,17 @@ public class ListUsersRequest { * */ private Integer limit; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListUsersRequest o) { + compartmentId(o.getCompartmentId()); + page(o.getPage()); + limit(o.getLimit()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/RemoveUserFromGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/RemoveUserFromGroupRequest.java index 7a60c367218..8e6c6a9c106 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/RemoveUserFromGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/RemoveUserFromGroupRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -30,4 +30,16 @@ public class RemoveUserFromGroupRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(RemoveUserFromGroupRequest o) { + userGroupMembershipId(o.getUserGroupMembershipId()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCompartmentRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCompartmentRequest.java index 5d794d13bf3..b68152ecbc7 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCompartmentRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCompartmentRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -35,4 +35,17 @@ public class UpdateCompartmentRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateCompartmentRequest o) { + compartmentId(o.getCompartmentId()); + updateCompartmentDetails(o.getUpdateCompartmentDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateGroupRequest.java index a9faa164b59..41bb4eb402a 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateGroupRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -35,4 +35,17 @@ public class UpdateGroupRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateGroupRequest o) { + groupId(o.getGroupId()); + updateGroupDetails(o.getUpdateGroupDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdatePolicyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdatePolicyRequest.java index 5e6c2c256d4..57d6d17380e 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdatePolicyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdatePolicyRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -35,4 +35,17 @@ public class UpdatePolicyRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdatePolicyRequest o) { + policyId(o.getPolicyId()); + updatePolicyDetails(o.getUpdatePolicyDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateSwiftPasswordRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateSwiftPasswordRequest.java index 0640a2251e0..5be77f4b254 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateSwiftPasswordRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateSwiftPasswordRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -40,4 +40,18 @@ public class UpdateSwiftPasswordRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateSwiftPasswordRequest o) { + userId(o.getUserId()); + swiftPasswordId(o.getSwiftPasswordId()); + updateSwiftPasswordDetails(o.getUpdateSwiftPasswordDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserRequest.java index 5cc1b15e243..2af4fab66c6 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -35,4 +35,17 @@ public class UpdateUserRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateUserRequest o) { + userId(o.getUserId()); + updateUserDetails(o.getUpdateUserDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserStateRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserStateRequest.java index 6ee65f9d5f3..125657458c1 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserStateRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserStateRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -35,4 +35,17 @@ public class UpdateUserStateRequest { * */ private String ifMatch; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateUserStateRequest o) { + userId(o.getUserId()); + updateStateDetails(o.getUpdateStateDetails()); + ifMatch(o.getIfMatch()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UploadApiKeyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UploadApiKeyRequest.java index c95733c35c8..5649e301054 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UploadApiKeyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UploadApiKeyRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.requests; @@ -37,4 +37,17 @@ public class UploadApiKeyRequest { * */ private String opcRetryToken; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UploadApiKeyRequest o) { + userId(o.getUserId()); + createApiKeyDetails(o.getCreateApiKeyDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/AddUserToGroupResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/AddUserToGroupResponse.java index 7882d383421..9061ed272b3 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/AddUserToGroupResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/AddUserToGroupResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class AddUserToGroupResponse { * The returned UserGroupMembership instance. */ private UserGroupMembership userGroupMembership; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(AddUserToGroupResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + userGroupMembership(o.getUserGroupMembership()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateCompartmentResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateCompartmentResponse.java index 0a9562fbfdc..6b9cf26dca4 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateCompartmentResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateCompartmentResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class CreateCompartmentResponse { * The returned Compartment instance. */ private Compartment compartment; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateCompartmentResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + compartment(o.getCompartment()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateGroupResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateGroupResponse.java index 9eac1be1fc4..b1e4a0a00d7 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateGroupResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateGroupResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class CreateGroupResponse { * The returned Group instance. */ private Group group; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateGroupResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + group(o.getGroup()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateOrResetUIPasswordResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateOrResetUIPasswordResponse.java index e924a2e395b..7edc5b6f96d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateOrResetUIPasswordResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateOrResetUIPasswordResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class CreateOrResetUIPasswordResponse { * The returned UIPassword instance. */ private UIPassword uIPassword; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateOrResetUIPasswordResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + uIPassword(o.getUIPassword()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreatePolicyResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreatePolicyResponse.java index 4ebea358e39..6fa65442f30 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreatePolicyResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreatePolicyResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class CreatePolicyResponse { * The returned Policy instance. */ private Policy policy; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreatePolicyResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + policy(o.getPolicy()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateSwiftPasswordResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateSwiftPasswordResponse.java index e84ab3375c6..b3790f9269d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateSwiftPasswordResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateSwiftPasswordResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class CreateSwiftPasswordResponse { * The returned SwiftPassword instance. */ private SwiftPassword swiftPassword; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateSwiftPasswordResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + swiftPassword(o.getSwiftPassword()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateUserResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateUserResponse.java index d466a498b79..1b5a843bbe6 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateUserResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateUserResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class CreateUserResponse { * The returned User instance. */ private User user; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateUserResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + user(o.getUser()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteApiKeyResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteApiKeyResponse.java index ca89e50c949..2fea0a99179 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteApiKeyResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteApiKeyResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -26,4 +26,16 @@ public class DeleteApiKeyResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteApiKeyResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteGroupResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteGroupResponse.java index 750b56b0134..0c8f26179d1 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteGroupResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteGroupResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -26,4 +26,16 @@ public class DeleteGroupResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteGroupResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeletePolicyResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeletePolicyResponse.java index d737eb25129..85017dbd1ff 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeletePolicyResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeletePolicyResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -26,4 +26,16 @@ public class DeletePolicyResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeletePolicyResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteSwiftPasswordResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteSwiftPasswordResponse.java index 59b990ca0a4..8531a8e8132 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteSwiftPasswordResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteSwiftPasswordResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -26,4 +26,16 @@ public class DeleteSwiftPasswordResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteSwiftPasswordResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteUserResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteUserResponse.java index 9b6fbedc655..9b1c5bc524d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteUserResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteUserResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -26,4 +26,16 @@ public class DeleteUserResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteUserResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetCompartmentResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetCompartmentResponse.java index 71848ae14ad..2df37a2bf70 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetCompartmentResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetCompartmentResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class GetCompartmentResponse { * The returned Compartment instance. */ private Compartment compartment; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetCompartmentResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + compartment(o.getCompartment()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetGroupResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetGroupResponse.java index 5b38380daab..d16532e4dcb 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetGroupResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetGroupResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class GetGroupResponse { * The returned Group instance. */ private Group group; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetGroupResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + group(o.getGroup()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetPolicyResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetPolicyResponse.java index 7a465b0fa49..91c22233bb3 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetPolicyResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetPolicyResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class GetPolicyResponse { * The returned Policy instance. */ private Policy policy; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetPolicyResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + policy(o.getPolicy()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetUserGroupMembershipResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetUserGroupMembershipResponse.java index a346900f2de..3f9a1246063 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetUserGroupMembershipResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetUserGroupMembershipResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class GetUserGroupMembershipResponse { * The returned UserGroupMembership instance. */ private UserGroupMembership userGroupMembership; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetUserGroupMembershipResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + userGroupMembership(o.getUserGroupMembership()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetUserResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetUserResponse.java index a3d5fa8dbf9..9af864acc20 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetUserResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/GetUserResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class GetUserResponse { * The returned User instance. */ private User user; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetUserResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + user(o.getUser()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListApiKeysResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListApiKeysResponse.java index 19d83eac335..8497990b4d4 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListApiKeysResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListApiKeysResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -39,4 +39,18 @@ public class ListApiKeysResponse { * A list of ApiKey instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListApiKeysResponse o) { + opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListAvailabilityDomainsResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListAvailabilityDomainsResponse.java index 42136f95682..93e414dedc1 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListAvailabilityDomainsResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListAvailabilityDomainsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -39,4 +39,18 @@ public class ListAvailabilityDomainsResponse { * A list of AvailabilityDomain instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListAvailabilityDomainsResponse o) { + opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListCompartmentsResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListCompartmentsResponse.java index 3575906922c..fba0787750e 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListCompartmentsResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListCompartmentsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -39,4 +39,18 @@ public class ListCompartmentsResponse { * A list of Compartment instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListCompartmentsResponse o) { + opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListGroupsResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListGroupsResponse.java index 13f770bbf68..15eff7e4fec 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListGroupsResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListGroupsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -39,4 +39,18 @@ public class ListGroupsResponse { * A list of Group instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListGroupsResponse o) { + opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListPoliciesResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListPoliciesResponse.java index 88b8bfdbfb6..ba3fafdb775 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListPoliciesResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListPoliciesResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -39,4 +39,18 @@ public class ListPoliciesResponse { * A list of Policy instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListPoliciesResponse o) { + opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListSwiftPasswordsResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListSwiftPasswordsResponse.java index b49e6275eab..c297c888d24 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListSwiftPasswordsResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListSwiftPasswordsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -39,4 +39,18 @@ public class ListSwiftPasswordsResponse { * A list of SwiftPassword instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListSwiftPasswordsResponse o) { + opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListUserGroupMembershipsResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListUserGroupMembershipsResponse.java index 1f3eb612154..96c9a09fabe 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListUserGroupMembershipsResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListUserGroupMembershipsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -39,4 +39,18 @@ public class ListUserGroupMembershipsResponse { * A list of UserGroupMembership instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListUserGroupMembershipsResponse o) { + opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListUsersResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListUsersResponse.java index de9e923a5b3..568c2e26fbb 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListUsersResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListUsersResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -39,4 +39,18 @@ public class ListUsersResponse { * A list of User instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListUsersResponse o) { + opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/RemoveUserFromGroupResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/RemoveUserFromGroupResponse.java index 8bef592a562..3b29dad1076 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/RemoveUserFromGroupResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/RemoveUserFromGroupResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -26,4 +26,16 @@ public class RemoveUserFromGroupResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(RemoveUserFromGroupResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateCompartmentResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateCompartmentResponse.java index b9df3ba42f4..a63d463cf99 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateCompartmentResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateCompartmentResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class UpdateCompartmentResponse { * The returned Compartment instance. */ private Compartment compartment; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateCompartmentResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + compartment(o.getCompartment()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateGroupResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateGroupResponse.java index 42e52f13c23..3e25aa1bd12 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateGroupResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateGroupResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class UpdateGroupResponse { * The returned Group instance. */ private Group group; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateGroupResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + group(o.getGroup()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdatePolicyResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdatePolicyResponse.java index c631d9ae883..67e2c561c36 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdatePolicyResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdatePolicyResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class UpdatePolicyResponse { * The returned Policy instance. */ private Policy policy; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdatePolicyResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + policy(o.getPolicy()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateSwiftPasswordResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateSwiftPasswordResponse.java index 8df27f9af16..3553030d3c4 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateSwiftPasswordResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateSwiftPasswordResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class UpdateSwiftPasswordResponse { * The returned SwiftPassword instance. */ private SwiftPassword swiftPassword; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateSwiftPasswordResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + swiftPassword(o.getSwiftPassword()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateUserResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateUserResponse.java index 0cf1f2df000..541f56eb627 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateUserResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateUserResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class UpdateUserResponse { * The returned User instance. */ private User user; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateUserResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + user(o.getUser()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateUserStateResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateUserStateResponse.java index 5b614dd98de..b5178dc71fb 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateUserStateResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateUserStateResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class UpdateUserStateResponse { * The returned User instance. */ private User user; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateUserStateResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + user(o.getUser()); + + return this; + } + } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UploadApiKeyResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UploadApiKeyResponse.java index 98bc49ba0d3..b8d9a630d7b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UploadApiKeyResponse.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UploadApiKeyResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.identity.responses; @@ -36,4 +36,18 @@ public class UploadApiKeyResponse { * The returned ApiKey instance. */ private ApiKey apiKey; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UploadApiKeyResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + apiKey(o.getApiKey()); + + return this; + } + } } diff --git a/bmc-objectstorage/pom.xml b/bmc-objectstorage/pom.xml index 8ecf87aea6a..8a03a096278 100644 --- a/bmc-objectstorage/pom.xml +++ b/bmc-objectstorage/pom.xml @@ -5,7 +5,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk - 1.2.3-SNAPSHOT + 1.2.3 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk-common - 1.2.3-SNAPSHOT + 1.2.3 diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorage.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorage.java index 2410beaf7a8..a3ed16b39ed 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorage.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorage.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsync.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsync.java index fc204a0db19..41494b18524 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsync.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsync.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsyncClient.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsyncClient.java index a6981265467..03a835ce6db 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsyncClient.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsyncClient.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.*; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.internal.*; +import com.oracle.bmc.http.signing.*; +import com.oracle.bmc.http.signing.internal.*; import com.oracle.bmc.responses.*; import com.oracle.bmc.util.internal.*; @@ -41,46 +43,62 @@ public class ObjectStorageAsyncClient implements ObjectStorageAsync { /** * Creates a new service instance using the given authentication provider. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. */ - public ObjectStorageAsyncClient(AuthenticationDetailsProvider authenticationProvider) { - this.client = newClientBuilder().build().create(SERVICE, authenticationProvider); + public ObjectStorageAsyncClient( + BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + this(authenticationDetailsProvider, null); } /** * Creates a new service instance using the given authentication provider and client configuration. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. */ public ObjectStorageAsyncClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration) { - this.client = - newClientBuilder().build().create(SERVICE, authenticationProvider, configuration); + this(authenticationDetailsProvider, configuration, null); } /** * Creates a new service instance using the given authentication provider and client configuration. Additionally, * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. */ public ObjectStorageAsyncClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { - this.client = - newClientBuilder() - .clientConfigurator(clientConfigurator) - .build() - .create(SERVICE, authenticationProvider, configuration); + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + new DefaultRequestSignerFactory(SigningStrategy.OBJECT_STORAGE)); } - private static RestClientFactoryBuilder newClientBuilder() { - RestClientFactoryBuilder builder = RestClientFactoryBuilder.builder(); - - return builder; + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param requestSignerFactory The request signer factory used to create the request signer for this service. + */ + public ObjectStorageAsyncClient( + AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + ClientConfiguration configuration, + ClientConfigurator clientConfigurator, + RequestSignerFactory requestSignerFactory) { + RestClientFactory restClientFactory = + RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build(); + RequestSigner requestSigner = + requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider); + this.client = restClientFactory.create(requestSigner, configuration); } @Override diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageClient.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageClient.java index eedb6a22e7e..58a769c4158 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageClient.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageClient.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage; import com.oracle.bmc.ClientConfiguration; -import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.*; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.internal.*; +import com.oracle.bmc.http.signing.*; +import com.oracle.bmc.http.signing.internal.*; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -40,46 +42,61 @@ public class ObjectStorageClient implements ObjectStorage { /** * Creates a new service instance using the given authentication provider. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. */ - public ObjectStorageClient(AuthenticationDetailsProvider authenticationProvider) { - this.client = newClientBuilder().build().create(SERVICE, authenticationProvider); + public ObjectStorageClient(BasicAuthenticationDetailsProvider authenticationDetailsProvider) { + this(authenticationDetailsProvider, null); } /** * Creates a new service instance using the given authentication provider and client configuration. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. */ public ObjectStorageClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration) { - this.client = - newClientBuilder().build().create(SERVICE, authenticationProvider, configuration); + this(authenticationDetailsProvider, configuration, null); } /** * Creates a new service instance using the given authentication provider and client configuration. Additionally, * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. - * @param authenticationProvider The authentication details provider, required. + * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. */ public ObjectStorageClient( - AuthenticationDetailsProvider authenticationProvider, + BasicAuthenticationDetailsProvider authenticationDetailsProvider, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { - this.client = - newClientBuilder() - .clientConfigurator(clientConfigurator) - .build() - .create(SERVICE, authenticationProvider, configuration); + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + new DefaultRequestSignerFactory(SigningStrategy.OBJECT_STORAGE)); } - private static RestClientFactoryBuilder newClientBuilder() { - RestClientFactoryBuilder builder = RestClientFactoryBuilder.builder(); - - return builder; + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param requestSignerFactory The request signer factory used to create the request signer for this service. + */ + public ObjectStorageClient( + AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + ClientConfiguration configuration, + ClientConfigurator clientConfigurator, + RequestSignerFactory requestSignerFactory) { + RestClientFactory restClientFactory = + RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build(); + RequestSigner requestSigner = + requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider); + this.client = restClientFactory.create(requestSigner, configuration); } @Override diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreateBucketConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreateBucketConverter.java index 7edecede753..f5bd0adbad0 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreateBucketConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreateBucketConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.internal.http; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteBucketConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteBucketConverter.java index 0f45fa081c4..396a235715c 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteBucketConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteBucketConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.internal.http; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteObjectConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteObjectConverter.java index c4c30946fc6..d48bde2460e 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteObjectConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteObjectConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.internal.http; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetBucketConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetBucketConverter.java index 6911a2d2621..9e5d00957a0 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetBucketConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetBucketConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.internal.http; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetNamespaceConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetNamespaceConverter.java index 97bdc13e2c0..f1428237fd7 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetNamespaceConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetNamespaceConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.internal.http; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetObjectConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetObjectConverter.java index 2684bdbcef8..29deb28c9af 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetObjectConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetObjectConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.internal.http; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadBucketConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadBucketConverter.java index fc239ffadc2..5d9a00c457c 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadBucketConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadBucketConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.internal.http; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadObjectConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadObjectConverter.java index 0ab0fb889b2..06ad03833f9 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadObjectConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadObjectConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.internal.http; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListBucketsConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListBucketsConverter.java index 48f498a672b..7c7fa1baa56 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListBucketsConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListBucketsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.internal.http; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListObjectsConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListObjectsConverter.java index 33281b4715a..ddf431c80ae 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListObjectsConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListObjectsConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.internal.http; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/PutObjectConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/PutObjectConverter.java index e232287e74e..4e41c84a831 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/PutObjectConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/PutObjectConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.internal.http; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/UpdateBucketConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/UpdateBucketConverter.java index 4c3e16f458a..fc5586a545d 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/UpdateBucketConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/UpdateBucketConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.internal.http; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/Bucket.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/Bucket.java index 73b4a8268b4..95c3dded309 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/Bucket.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/Bucket.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.model; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/BucketSummary.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/BucketSummary.java index b6150e1bafc..9b428a18a7c 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/BucketSummary.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/BucketSummary.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.model; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreateBucketDetails.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreateBucketDetails.java index c6d8908dac2..b258086024e 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreateBucketDetails.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreateBucketDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.model; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ListObjects.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ListObjects.java index ee4b24c74a9..22c02eaa787 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ListObjects.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ListObjects.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.model; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ObjectSummary.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ObjectSummary.java index cd1c612b8e4..6c33d7a9879 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ObjectSummary.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ObjectSummary.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.model; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/UpdateBucketDetails.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/UpdateBucketDetails.java index f61a365b53a..7dc2313287e 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/UpdateBucketDetails.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/UpdateBucketDetails.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.model; diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/CreateBucketRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/CreateBucketRequest.java index a2f565b9921..4919dfdd147 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/CreateBucketRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/CreateBucketRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.requests; @@ -32,4 +32,17 @@ public class CreateBucketRequest { * The client request ID for tracing */ private String opcClientRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateBucketRequest o) { + namespaceName(o.getNamespaceName()); + createBucketDetails(o.getCreateBucketDetails()); + opcClientRequestId(o.getOpcClientRequestId()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteBucketRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteBucketRequest.java index 7f703b47eaa..3edbae4467d 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteBucketRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteBucketRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.requests; @@ -40,4 +40,18 @@ public class DeleteBucketRequest { * The client request ID for tracing */ private String opcClientRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteBucketRequest o) { + namespaceName(o.getNamespaceName()); + bucketName(o.getBucketName()); + ifMatch(o.getIfMatch()); + opcClientRequestId(o.getOpcClientRequestId()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteObjectRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteObjectRequest.java index f257f5974df..dd2cb600268 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteObjectRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteObjectRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.requests; @@ -48,4 +48,19 @@ public class DeleteObjectRequest { * The client request ID for tracing */ private String opcClientRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteObjectRequest o) { + namespaceName(o.getNamespaceName()); + bucketName(o.getBucketName()); + objectName(o.getObjectName()); + ifMatch(o.getIfMatch()); + opcClientRequestId(o.getOpcClientRequestId()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/GetBucketRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/GetBucketRequest.java index 24a75a657ab..19bea9ec1a7 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/GetBucketRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/GetBucketRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.requests; @@ -46,4 +46,19 @@ public class GetBucketRequest { * The client request ID for tracing */ private String opcClientRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetBucketRequest o) { + namespaceName(o.getNamespaceName()); + bucketName(o.getBucketName()); + ifMatch(o.getIfMatch()); + ifNoneMatch(o.getIfNoneMatch()); + opcClientRequestId(o.getOpcClientRequestId()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/GetNamespaceRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/GetNamespaceRequest.java index f6671b62790..17ef631a52c 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/GetNamespaceRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/GetNamespaceRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.requests; @@ -22,4 +22,15 @@ public class GetNamespaceRequest { * The client request ID for tracing */ private String opcClientRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetNamespaceRequest o) { + opcClientRequestId(o.getOpcClientRequestId()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/GetObjectRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/GetObjectRequest.java index fef381faba5..67749cdb4a6 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/GetObjectRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/GetObjectRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.requests; @@ -61,4 +61,21 @@ public class GetObjectRequest { * */ private Range range; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetObjectRequest o) { + namespaceName(o.getNamespaceName()); + bucketName(o.getBucketName()); + objectName(o.getObjectName()); + ifMatch(o.getIfMatch()); + ifNoneMatch(o.getIfNoneMatch()); + opcClientRequestId(o.getOpcClientRequestId()); + range(o.getRange()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/HeadBucketRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/HeadBucketRequest.java index 93bc7d72c4a..306889c5829 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/HeadBucketRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/HeadBucketRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.requests; @@ -46,4 +46,19 @@ public class HeadBucketRequest { * The client request ID for tracing */ private String opcClientRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(HeadBucketRequest o) { + namespaceName(o.getNamespaceName()); + bucketName(o.getBucketName()); + ifMatch(o.getIfMatch()); + ifNoneMatch(o.getIfNoneMatch()); + opcClientRequestId(o.getOpcClientRequestId()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/HeadObjectRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/HeadObjectRequest.java index fb9b0cd23bb..464b1c25ac7 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/HeadObjectRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/HeadObjectRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.requests; @@ -54,4 +54,20 @@ public class HeadObjectRequest { * The client request ID for tracing */ private String opcClientRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(HeadObjectRequest o) { + namespaceName(o.getNamespaceName()); + bucketName(o.getBucketName()); + objectName(o.getObjectName()); + ifMatch(o.getIfMatch()); + ifNoneMatch(o.getIfNoneMatch()); + opcClientRequestId(o.getOpcClientRequestId()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/ListBucketsRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/ListBucketsRequest.java index 9a4311186d8..2d7581e76c1 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/ListBucketsRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/ListBucketsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.requests; @@ -42,4 +42,19 @@ public class ListBucketsRequest { * The client request ID for tracing */ private String opcClientRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListBucketsRequest o) { + namespaceName(o.getNamespaceName()); + compartmentId(o.getCompartmentId()); + limit(o.getLimit()); + page(o.getPage()); + opcClientRequestId(o.getOpcClientRequestId()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/ListObjectsRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/ListObjectsRequest.java index 4ce46cc7b0e..bedfa490c94 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/ListObjectsRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/ListObjectsRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.requests; @@ -74,4 +74,23 @@ public class ListObjectsRequest { * The client request ID for tracing */ private String opcClientRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListObjectsRequest o) { + namespaceName(o.getNamespaceName()); + bucketName(o.getBucketName()); + prefix(o.getPrefix()); + start(o.getStart()); + end(o.getEnd()); + limit(o.getLimit()); + delimiter(o.getDelimiter()); + fields(o.getFields()); + opcClientRequestId(o.getOpcClientRequestId()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/PutObjectRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/PutObjectRequest.java index 638f7f10c9d..33c89453a19 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/PutObjectRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/PutObjectRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.requests; @@ -94,4 +94,28 @@ public class PutObjectRequest { * Optional user-defined metadata key and value. */ private Map opcMeta; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(PutObjectRequest o) { + namespaceName(o.getNamespaceName()); + bucketName(o.getBucketName()); + objectName(o.getObjectName()); + contentLength(o.getContentLength()); + putObjectBody(o.getPutObjectBody()); + ifMatch(o.getIfMatch()); + ifNoneMatch(o.getIfNoneMatch()); + opcClientRequestId(o.getOpcClientRequestId()); + expect(o.getExpect()); + contentMD5(o.getContentMD5()); + contentType(o.getContentType()); + contentLanguage(o.getContentLanguage()); + contentEncoding(o.getContentEncoding()); + opcMeta(o.getOpcMeta()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/UpdateBucketRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/UpdateBucketRequest.java index 8a799a63656..bf8beec36db 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/UpdateBucketRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/requests/UpdateBucketRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.requests; @@ -45,4 +45,19 @@ public class UpdateBucketRequest { * The client request ID for tracing */ private String opcClientRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateBucketRequest o) { + namespaceName(o.getNamespaceName()); + bucketName(o.getBucketName()); + updateBucketDetails(o.getUpdateBucketDetails()); + ifMatch(o.getIfMatch()); + opcClientRequestId(o.getOpcClientRequestId()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/CreateBucketResponse.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/CreateBucketResponse.java index 53fc9ea7508..dcc47bee886 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/CreateBucketResponse.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/CreateBucketResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.responses; @@ -46,4 +46,20 @@ public class CreateBucketResponse { * The returned Bucket instance. */ private Bucket bucket; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateBucketResponse o) { + opcClientRequestId(o.getOpcClientRequestId()); + opcRequestId(o.getOpcRequestId()); + eTag(o.getETag()); + location(o.getLocation()); + bucket(o.getBucket()); + + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/DeleteBucketResponse.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/DeleteBucketResponse.java index de254daf557..44457d46317 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/DeleteBucketResponse.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/DeleteBucketResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.responses; @@ -31,4 +31,17 @@ public class DeleteBucketResponse { * */ private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteBucketResponse o) { + opcClientRequestId(o.getOpcClientRequestId()); + opcRequestId(o.getOpcRequestId()); + + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/DeleteObjectResponse.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/DeleteObjectResponse.java index 182eda1bc7a..20206430e37 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/DeleteObjectResponse.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/DeleteObjectResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.responses; @@ -36,4 +36,18 @@ public class DeleteObjectResponse { * The object modification time, per RFC 2616 */ private Date lastModified; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteObjectResponse o) { + opcClientRequestId(o.getOpcClientRequestId()); + opcRequestId(o.getOpcRequestId()); + lastModified(o.getLastModified()); + + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/GetBucketResponse.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/GetBucketResponse.java index 27115c8ffdb..8d077358e86 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/GetBucketResponse.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/GetBucketResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.responses; @@ -49,4 +49,19 @@ public class GetBucketResponse { * response (like 'if-match'/'if-none-match'). */ private boolean isNotModified; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetBucketResponse o) { + opcClientRequestId(o.getOpcClientRequestId()); + opcRequestId(o.getOpcRequestId()); + eTag(o.getETag()); + bucket(o.getBucket()); + isNotModified(o.isNotModified()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/GetNamespaceResponse.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/GetNamespaceResponse.java index 09d6279e842..8a213b5e359 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/GetNamespaceResponse.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/GetNamespaceResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.responses; @@ -24,4 +24,17 @@ public class GetNamespaceResponse { * The returned String instance. */ private String value; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetNamespaceResponse o) { + + value(o.getValue()); + + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/GetObjectResponse.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/GetObjectResponse.java index 9b43449d140..89109c08c81 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/GetObjectResponse.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/GetObjectResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.responses; @@ -89,4 +89,27 @@ public class GetObjectResponse { * response (like 'if-match'/'if-none-match'). */ private boolean isNotModified; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetObjectResponse o) { + opcClientRequestId(o.getOpcClientRequestId()); + opcRequestId(o.getOpcRequestId()); + eTag(o.getETag()); + opcMeta(o.getOpcMeta()); + contentLength(o.getContentLength()); + contentRange(o.getContentRange()); + contentMd5(o.getContentMd5()); + contentType(o.getContentType()); + contentLanguage(o.getContentLanguage()); + contentEncoding(o.getContentEncoding()); + lastModified(o.getLastModified()); + inputStream(o.getInputStream()); + isNotModified(o.isNotModified()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/HeadBucketResponse.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/HeadBucketResponse.java index 73a2539b94d..aa3823b3cf0 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/HeadBucketResponse.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/HeadBucketResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.responses; @@ -44,4 +44,19 @@ public class HeadBucketResponse { * response (like 'if-match'/'if-none-match'). */ private boolean isNotModified; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(HeadBucketResponse o) { + opcClientRequestId(o.getOpcClientRequestId()); + opcRequestId(o.getOpcRequestId()); + eTag(o.getETag()); + + isNotModified(o.isNotModified()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/HeadObjectResponse.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/HeadObjectResponse.java index 24a6815b17e..9b76a8acd65 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/HeadObjectResponse.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/HeadObjectResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.responses; @@ -79,4 +79,26 @@ public class HeadObjectResponse { * response (like 'if-match'/'if-none-match'). */ private boolean isNotModified; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(HeadObjectResponse o) { + opcClientRequestId(o.getOpcClientRequestId()); + opcRequestId(o.getOpcRequestId()); + eTag(o.getETag()); + opcMeta(o.getOpcMeta()); + contentLength(o.getContentLength()); + contentMd5(o.getContentMd5()); + contentType(o.getContentType()); + contentLanguage(o.getContentLanguage()); + contentEncoding(o.getContentEncoding()); + lastModified(o.getLastModified()); + + isNotModified(o.isNotModified()); + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/ListBucketsResponse.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/ListBucketsResponse.java index aee3d3f1de5..8b7675f284d 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/ListBucketsResponse.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/ListBucketsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.responses; @@ -45,4 +45,19 @@ public class ListBucketsResponse { * A list of BucketSummary instances. */ private List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListBucketsResponse o) { + opcClientRequestId(o.getOpcClientRequestId()); + opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); + items(o.getItems()); + + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/ListObjectsResponse.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/ListObjectsResponse.java index 0b7e6fc5c1e..36d772c5a7d 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/ListObjectsResponse.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/ListObjectsResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.responses; @@ -36,4 +36,18 @@ public class ListObjectsResponse { * The returned ListObjects instance. */ private ListObjects listObjects; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListObjectsResponse o) { + opcClientRequestId(o.getOpcClientRequestId()); + opcRequestId(o.getOpcRequestId()); + listObjects(o.getListObjects()); + + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/PutObjectResponse.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/PutObjectResponse.java index dd258ca8849..3cc89db2a41 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/PutObjectResponse.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/PutObjectResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.responses; @@ -46,4 +46,20 @@ public class PutObjectResponse { * The object modification time, per RFC 2616 */ private Date lastModified; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(PutObjectResponse o) { + opcClientRequestId(o.getOpcClientRequestId()); + opcRequestId(o.getOpcRequestId()); + opcContentMd5(o.getOpcContentMd5()); + eTag(o.getETag()); + lastModified(o.getLastModified()); + + return this; + } + } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/UpdateBucketResponse.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/UpdateBucketResponse.java index e92faa41503..8458a5242a7 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/UpdateBucketResponse.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/responses/UpdateBucketResponse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. */ package com.oracle.bmc.objectstorage.responses; @@ -41,4 +41,19 @@ public class UpdateBucketResponse { * The returned Bucket instance. */ private Bucket bucket; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateBucketResponse o) { + opcClientRequestId(o.getOpcClientRequestId()); + opcRequestId(o.getOpcRequestId()); + eTag(o.getETag()); + bucket(o.getBucket()); + + return this; + } + } } diff --git a/licenseheader.txt b/licenseheader.txt index 44729defe71..281ccf53ee4 100644 --- a/licenseheader.txt +++ b/licenseheader.txt @@ -1 +1 @@ -Copyright (c) ${license.git.copyrightYears} Oracle and/or its affiliates. All rights reserved. \ No newline at end of file +Copyright (c) ${project.inceptionYear}, ${current.year}, Oracle and/or its affiliates. All rights reserved. \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5bb0157745b..748b6a533e8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.oracle.bmc.sdk oracle-bmc-java-sdk - 1.2.3-SNAPSHOT + 1.2.3 pom Oracle Bare Metal Cloud Services SDK @@ -27,7 +27,6 @@ UTF-8 - 3.0 2.7.4 2.24.1 19.0 @@ -41,6 +40,23 @@ dev + + org.codehaus.mojo + build-helper-maven-plugin + + + timestamp-property + + timestamp-property + + validate + + current.year + yyyy + + + + org.apache.maven.plugins maven-antrun-plugin @@ -90,6 +106,11 @@ format + + + ${current.year} + + @@ -154,10 +175,15 @@ googleformatter-maven-plugin 1.0.5 + + org.codehaus.mojo + build-helper-maven-plugin + 1.12 + com.mycila license-maven-plugin - ${license.plugin.version} + 3.0 true

licenseheader.txt
@@ -166,14 +192,6 @@ src/test/java/**/*.java - - - com.mycila - license-maven-plugin-git - - ${license.plugin.version} - - org.apache.maven.plugins @@ -288,6 +306,12 @@ 2.0.0.0 test + + org.mockito + mockito-core + 2.7.5 + test +