Singularity 13d2fe94ec83f4e11b43844e67aeb7674952e07e

13d2fe94ec83f4e11b43844e67aeb7674952e07e

Files Diff

Added: 5
Removed: 1
Renamed: 0
Modified: 17

Link to commit

Dependency Action

Refactorings reported:

Refactoring Name	Occurences
Move And Inline Method	1
Move And Inline Method public setLoggingS3Bucket(loggingS3Bucket Optional<String>) : ExecutorDataBuilder moved from class com.hubspot.deploy.ExecutorDataBuilder to class com.hubspot.singularity.mesos.SingularityMesosTaskBuilder & inlined to private prepareCustomExecutor(bldr TaskInfo.Builder, taskId SingularityTaskId, task SingularityTaskRequest, offer Protos.Offer, ports Optional<long[]>, desiredExecutorResources Resources) : void	From	To
Change Parameter Type	2
Change Parameter Type executorData : ExecutorData to executorData : SingularityTaskExecutorData in method public SingularityExecutorTaskDefinition(taskId String, executorData SingularityTaskExecutorData, taskDirectory String, executorPid String, serviceLogOut String, serviceLogOutExtension String, serviceFinishedTailLog String, taskAppDirectory String, executorBashOut String, logrotateStateFile String, signatureVerifyOut String) in class com.hubspot.singularity.executor.task.SingularityExecutorTaskDefinition	From	To
Change Parameter Type s3UploaderAdditionalFiles : List<SingularityExecutorS3UploaderAdditionalFile> to s3UploaderAdditionalFiles : List<SingularityS3UploaderFile> in method public setS3UploaderAdditionalFiles(s3UploaderAdditionalFiles List<SingularityS3UploaderFile>) : void in class com.hubspot.singularity.config.S3Configuration	From	To
Move Method	10
Move Method public setApplyS3StorageClassAfterBytes(applyS3StorageClassAfterBytes Optional<Long>) : void from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to public setApplyS3StorageClassAfterBytes(applyS3StorageClassAfterBytes Optional<Long>) : void from class com.hubspot.singularity.config.S3Configuration	From	To
Move Method public getServiceFinishedTailLog() : String from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to public getServiceFinishedTailLog() : String from class com.hubspot.singularity.SingularityTaskExecutorData	From	To
Move Method public getServiceLog() : String from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to public getServiceLog() : String from class com.hubspot.singularity.SingularityTaskExecutorData	From	To
Move Method public setS3UploaderAdditionalFiles(s3UploaderAdditionalFiles List<SingularityExecutorS3UploaderAdditionalFile>) : void from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to public setS3UploaderAdditionalFiles(s3UploaderAdditionalFiles List<SingularityS3UploaderFile>) : void from class com.hubspot.singularity.config.S3Configuration	From	To
Move Method public getS3UploaderKeyPattern() : String from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to public getS3UploaderKeyPattern() : String from class com.hubspot.singularity.SingularityTaskExecutorData	From	To
Move Method public getApplyS3StorageClassAfterBytes() : Optional<Long> from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to public getApplyS3StorageClassAfterBytes() : Optional<Long> from class com.hubspot.singularity.SingularityTaskExecutorData	From	To
Move Method public setS3StorageClass(s3StorageClass Optional<String>) : void from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to public setS3StorageClass(s3StorageClass Optional<String>) : void from class com.hubspot.singularity.config.S3Configuration	From	To
Move Method public getS3StorageClass() : Optional<String> from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to public getS3StorageClass() : Optional<String> from class com.hubspot.singularity.SingularityTaskExecutorData	From	To
Move Method public setServiceFinishedTailLog(serviceFinishedTailLog String) : void from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to public setServiceFinishedTailLog(serviceFinishedTailLog String) : void from class com.hubspot.singularity.config.CustomExecutorConfiguration	From	To
Move Method public setServiceLog(serviceLog String) : void from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to public setServiceLog(serviceLog String) : void from class com.hubspot.singularity.config.CustomExecutorConfiguration	From	To
Pull Up Attribute	7
Pull Up Attribute private startTime : Optional<Long> from class com.hubspot.singularity.SingularityS3Log to private startTime : Optional<Long> from class com.hubspot.singularity.SingularityS3LogMetadata	From	To
Pull Up Attribute private endTime : Optional<Long> from class com.hubspot.singularity.SingularityS3Log to private endTime : Optional<Long> from class com.hubspot.singularity.SingularityS3LogMetadata	From	To
Pull Up Attribute public LOG_END_S3_ATTR : String from class com.hubspot.singularity.SingularityS3Log to public LOG_END_S3_ATTR : String from class com.hubspot.singularity.SingularityS3LogMetadata	From	To
Pull Up Attribute public LOG_START_S3_ATTR : String from class com.hubspot.singularity.SingularityS3Log to public LOG_START_S3_ATTR : String from class com.hubspot.singularity.SingularityS3LogMetadata	From	To
Pull Up Attribute private lastModified : long from class com.hubspot.singularity.SingularityS3Log to private lastModified : long from class com.hubspot.singularity.SingularityS3LogMetadata	From	To
Pull Up Attribute private size : long from class com.hubspot.singularity.SingularityS3Log to private size : long from class com.hubspot.singularity.SingularityS3LogMetadata	From	To
Pull Up Attribute private key : String from class com.hubspot.singularity.SingularityS3Log to private key : String from class com.hubspot.singularity.SingularityS3LogMetadata	From	To
Move Attribute	5
Move Attribute private serviceFinishedTailLog : String from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to private serviceFinishedTailLog : String from class com.hubspot.singularity.SingularityTaskExecutorData	From	To
Move Attribute private serviceLog : String from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to private serviceLog : String from class com.hubspot.singularity.SingularityTaskExecutorData	From	To
Move Attribute private applyS3StorageClassAfterBytes : Optional<Long> from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to private applyS3StorageClassAfterBytes : Optional<Long> from class com.hubspot.singularity.SingularityTaskExecutorData	From	To
Move Attribute private s3UploaderKeyPattern : String from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to private s3UploaderKeyPattern : String from class com.hubspot.singularity.SingularityTaskExecutorData	From	To
Move Attribute private s3StorageClass : Optional<String> from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration to private s3StorageClass : Optional<String> from class com.hubspot.singularity.SingularityTaskExecutorData	From	To
Extract Class	1
Extract Class com.hubspot.singularity.SingularityTaskExecutorData from class com.hubspot.singularity.executor.config.SingularityExecutorConfiguration	From	To
Move And Rename Class	1
Move And Rename Class com.hubspot.singularity.executor.config.SingularityExecutorS3UploaderAdditionalFile moved and renamed to com.hubspot.singularity.SingularityS3UploaderFile	From	To
Extract Variable	1
Extract Variable maybeGroup : Optional<String> in method public getS3LogsForDeploy(requestId String, deployId String, start Optional<Long>, end Optional<Long>, excludeMetadata Optional<Boolean>, listOnly Optional<Boolean>) : List<SingularityS3LogMetadata> from class com.hubspot.singularity.resources.S3LogResource	From	To
Change Variable Type	5
Change Variable Type executorData : ExecutorData to taskExecutorData : SingularityTaskExecutorData in method public buildTask(taskId String, driver ExecutorDriver, taskInfo TaskInfo, log Logger) : SingularityExecutorTask in class com.hubspot.singularity.executor.config.SingularityExecutorTaskBuilder	From	To
Change Variable Type additionalFile : SingularityExecutorS3UploaderAdditionalFile to additionalFile : SingularityS3UploaderFile in method private writeS3MetadataFileForRotatedFiles(finished boolean) : boolean in class com.hubspot.singularity.executor.task.SingularityExecutorTaskLogManager	From	To
Change Variable Type loggingS3Bucket : Optional<String> to defaultS3Bucket : String in method private prepareCustomExecutor(bldr TaskInfo.Builder, taskId SingularityTaskId, task SingularityTaskRequest, offer Protos.Offer, ports Optional<long[]>, desiredExecutorResources Resources) : void in class com.hubspot.singularity.mesos.SingularityMesosTaskBuilder	From	To
Change Variable Type logFutures : List<ListenableFuture<SingularityS3Log>> to logFutures : List<ListenableFuture<SingularityS3LogMetadata>> in method private getS3LogsWithExecutorService(s3Configuration S3Configuration, group Optional<String>, executorService ListeningExecutorService, prefixes Collection<String>, excludeMetadata boolean, listOnly boolean) : List<SingularityS3LogMetadata> in class com.hubspot.singularity.resources.S3LogResource	From	To
Change Variable Type logs : List<SingularityS3Log> to logs : List<SingularityS3LogMetadata> in method private getS3Logs(s3Configuration S3Configuration, group Optional<String>, prefixes Collection<String>, excldueMetadata boolean, listOnly boolean) : List<SingularityS3LogMetadata> in class com.hubspot.singularity.resources.S3LogResource	From	To
Push Down Method	2
Push Down Method public getLoggingS3Bucket() : Optional<String> from class com.hubspot.deploy.ExecutorData to public getS3StorageClass() : Optional<String> from class com.hubspot.singularity.SingularityTaskExecutorData	From	To
Push Down Method public getLoggingS3Bucket() : Optional<String> from class com.hubspot.deploy.ExecutorData to public getRequestGroup() : Optional<String> from class com.hubspot.singularity.SingularityTaskExecutorData	From	To
Pull Up Method	5
Pull Up Method public getKey() : String from class com.hubspot.singularity.SingularityS3Log to public getKey() : String from class com.hubspot.singularity.SingularityS3LogMetadata	From	To
Pull Up Method public getStartTime() : Optional<Long> from class com.hubspot.singularity.SingularityS3Log to public getStartTime() : Optional<Long> from class com.hubspot.singularity.SingularityS3LogMetadata	From	To
Pull Up Method public getLastModified() : long from class com.hubspot.singularity.SingularityS3Log to public getLastModified() : long from class com.hubspot.singularity.SingularityS3LogMetadata	From	To
Pull Up Method public getEndTime() : Optional<Long> from class com.hubspot.singularity.SingularityS3Log to public getEndTime() : Optional<Long> from class com.hubspot.singularity.SingularityS3LogMetadata	From	To
Pull Up Method public getSize() : long from class com.hubspot.singularity.SingularityS3Log to public getSize() : long from class com.hubspot.singularity.SingularityS3LogMetadata	From	To
Rename Variable	3
Rename Variable loggingS3Bucket : Optional<String> to defaultS3Bucket : String in method private prepareCustomExecutor(bldr TaskInfo.Builder, taskId SingularityTaskId, task SingularityTaskRequest, offer Protos.Offer, ports Optional<long[]>, desiredExecutorResources Resources) : void in class com.hubspot.singularity.mesos.SingularityMesosTaskBuilder	From	To
Rename Variable executorData : ExecutorData to taskExecutorData : SingularityTaskExecutorData in method public buildTask(taskId String, driver ExecutorDriver, taskInfo TaskInfo, log Logger) : SingularityExecutorTask in class com.hubspot.singularity.executor.config.SingularityExecutorTaskBuilder	From	To
Rename Variable other : S3UploadMetadata to that : S3UploadMetadata in method public equals(o Object) : boolean in class com.hubspot.singularity.runner.base.shared.S3UploadMetadata	From	To
Change Return Type	8
Change Return Type List<SingularityS3Log> to List<SingularityS3LogMetadata> in method private getS3LogsWithExecutorService(s3Configuration S3Configuration, group Optional<String>, executorService ListeningExecutorService, prefixes Collection<String>, excludeMetadata boolean, listOnly boolean) : List<SingularityS3LogMetadata> in class com.hubspot.singularity.resources.S3LogResource	From	To
Change Return Type ExecutorData to SingularityTaskExecutorData in method private readExecutorData(objectMapper ObjectMapper, taskInfo Protos.TaskInfo) : SingularityTaskExecutorData in class com.hubspot.singularity.executor.config.SingularityExecutorTaskBuilder	From	To
Change Return Type List<SingularityS3Log> to List<SingularityS3LogMetadata> in method public getS3LogsForDeploy(requestId String, deployId String, start Optional<Long>, end Optional<Long>, excludeMetadata Optional<Boolean>, listOnly Optional<Boolean>) : List<SingularityS3LogMetadata> in class com.hubspot.singularity.resources.S3LogResource	From	To
Change Return Type List<SingularityS3Log> to List<SingularityS3LogMetadata> in method private getS3Logs(s3Configuration S3Configuration, group Optional<String>, prefixes Collection<String>, excldueMetadata boolean, listOnly boolean) : List<SingularityS3LogMetadata> in class com.hubspot.singularity.resources.S3LogResource	From	To
Change Return Type SingularityExecutorS3UploaderAdditionalFile to SingularityS3UploaderFile in method public fromString(value String) : SingularityS3UploaderFile in class com.hubspot.singularity.SingularityS3UploaderFile	From	To
Change Return Type ExecutorData to SingularityTaskExecutorData in method public getExecutorData() : SingularityTaskExecutorData in class com.hubspot.singularity.executor.task.SingularityExecutorTaskDefinition	From	To
Change Return Type List<SingularityS3Log> to List<SingularityS3LogMetadata> in method public getS3LogsForRequest(requestId String, start Optional<Long>, end Optional<Long>, excludeMetadata Optional<Boolean>, listOnly Optional<Boolean>) : List<SingularityS3LogMetadata> in class com.hubspot.singularity.resources.S3LogResource	From	To
Change Return Type List<SingularityS3Log> to List<SingularityS3LogMetadata> in method public getS3LogsForTask(taskId String, start Optional<Long>, end Optional<Long>, excludeMetadata Optional<Boolean>, listOnly Optional<Boolean>) : List<SingularityS3LogMetadata> in class com.hubspot.singularity.resources.S3LogResource	From	To
Extract Superclass	1
Extract Superclass com.hubspot.singularity.SingularityS3LogMetadata from classes [com.hubspot.singularity.SingularityS3Log]	From	To
Rename Attribute	1
Rename Attribute s3ServiceDefault : Optional<S3Service> to s3Services : SingularityS3Services in class com.hubspot.singularity.resources.S3LogResource	From	To
Change Attribute Type	3
Change Attribute Type executorData : ExecutorData to executorData : SingularityTaskExecutorData in class com.hubspot.singularity.executor.task.SingularityExecutorTaskDefinition	From	To
Change Attribute Type LOG_COMPARATOR : Comparator<SingularityS3Log> to LOG_COMPARATOR : Comparator<SingularityS3LogMetadata> in class com.hubspot.singularity.resources.S3LogResource	From	To
Change Attribute Type s3ServiceDefault : Optional<S3Service> to s3Services : SingularityS3Services in class com.hubspot.singularity.resources.S3LogResource	From	To
Rename Parameter	1
Rename Parameter obj : Object to o : Object in method public equals(o Object) : boolean in class com.hubspot.singularity.runner.base.shared.S3UploadMetadata	From	To

13d2fe94ec83f4e11b43844e67aeb7674952e07e

Files Diff

Link to commit

Third party dependencies:

Refactorings reported: