Intellij formatter changes to master #1615
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
s-yonkov-yonkov
force-pushed
the
intellij-formatting
branch
from
00cb809 to
2c80b33
Compare
ikasarov
reviewed
Mar 28, 2025
| @@ -21,11 +21,12 @@ | |||
| class CustomControllerClientErrorHandlerTest { | |||
|
|
|||
| private static final ResilientCloudOperationExecutor NULL_RETRIER = new ResilientCloudOperationExecutor().withRetryCount(0) | |||
| .withWaitTimeBetweenRetriesInMillis(0); | |||
| .withWaitTimeBetweenRetriesInMillis( | |||
| 0); | |||
| .prettyPrinting(prettyPrinting) | ||
| .deployedMta(deployedMta) | ||
| .deployId(DEPLOY_ID) | ||
| .namespace(namespace) | ||
| .userMessageLogger(Mockito.mock(UserMessageLogger.class)) | ||
| .appSuffixDeterminer(appSuffixDeterminer) | ||
| .userMessageLogger(Mockito.mock( |
There was a problem hiding this comment.
maybe just increase the line length a bit so we don't get this as often
# Conflicts: # multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/OAuthClientExtended.java # multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/util/DeployedAfterModulesContentValidator.java # multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/v2/ServiceKeysCloudModelBuilder.java # multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/resolvers/v3/DynamicParametersResolver.java # multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/helpers/SystemParametersTest.java # multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/helpers/v2/ConfigurationReferencesResolverTest.java # multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/parser/RouteParametersParserTest.java # multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/dto/AsyncUploadJobDto.java # multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/dto/OperationDto.java # multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/ProcessLogger.java # multiapps-controller-persistence/src/test/java/org/cloudfoundry/multiapps/controller/persistence/services/FileServiceTest.java # multiapps-controller-persistence/src/test/java/org/cloudfoundry/multiapps/controller/persistence/services/ProcessLoggerPersisterTest.java # multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java # multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/DetermineApplicationServiceBindingActionsStep.java # multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/PollServiceBindingUnbindingOperationBaseExecution.java # multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/flowable/FlowableActionFactoryTest.java # multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/CheckServicesToDeleteStepTest.java # multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/DeleteIdleRoutesStepTest.java # multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/DetermineServiceCreateUpdateServiceActionsStepTest.java # multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/PublishConfigurationEntriesStepTest.java # multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/UndeployAppStepTest.java # multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/UpdateServicePlanStepTest.java # multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/UpdateServiceTagsStepTest.java # multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/steps/ValidateDeployParametersStepTest.java # multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/util/ProcessConflictPreventerTest.java # multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/util/ServiceBindingParametersGetterTest.java # multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBean.java # multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/service/ObjectStoreServiceInfoCreator.java # multiapps-controller-web/src/test/java/org/cloudfoundry/multiapps/controller/web/security/AuthorizationCheckerTest.java
|
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.