This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 5b660b5 Fixed CS 5b660b5 is described below commit 5b660b58c9f11a59e728b8683e56a7e39623cc57 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Sat Aug 18 19:35:58 2018 +0200 Fixed CS --- .../component/aws/iam/AmazonIAMClientMock.java | 250 ++++++++++++++++++++- .../elsql/ElSqlConsumerDynamicParameterTest.java | 2 +- .../camel/component/web3j/Web3jConstants.java | 4 +- .../component/web3j/Web3jQuorumProducerTest.java | 20 +- .../packaging/SpringBootAutoConfigurationMojo.java | 16 +- 5 files changed, 271 insertions(+), 21 deletions(-) diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java index 4393fc8..d501188 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java @@ -25,7 +25,254 @@ import com.amazonaws.AmazonWebServiceRequest; import com.amazonaws.ResponseMetadata; import com.amazonaws.regions.Region; import com.amazonaws.services.identitymanagement.AmazonIdentityManagementClient; -import com.amazonaws.services.identitymanagement.model.*; +import com.amazonaws.services.identitymanagement.model.AccessKey; +import com.amazonaws.services.identitymanagement.model.AccessKeyMetadata; +import com.amazonaws.services.identitymanagement.model.AddClientIDToOpenIDConnectProviderRequest; +import com.amazonaws.services.identitymanagement.model.AddClientIDToOpenIDConnectProviderResult; +import com.amazonaws.services.identitymanagement.model.AddRoleToInstanceProfileRequest; +import com.amazonaws.services.identitymanagement.model.AddRoleToInstanceProfileResult; +import com.amazonaws.services.identitymanagement.model.AddUserToGroupRequest; +import com.amazonaws.services.identitymanagement.model.AddUserToGroupResult; +import com.amazonaws.services.identitymanagement.model.AttachGroupPolicyRequest; +import com.amazonaws.services.identitymanagement.model.AttachGroupPolicyResult; +import com.amazonaws.services.identitymanagement.model.AttachRolePolicyRequest; +import com.amazonaws.services.identitymanagement.model.AttachRolePolicyResult; +import com.amazonaws.services.identitymanagement.model.AttachUserPolicyRequest; +import com.amazonaws.services.identitymanagement.model.AttachUserPolicyResult; +import com.amazonaws.services.identitymanagement.model.ChangePasswordRequest; +import com.amazonaws.services.identitymanagement.model.ChangePasswordResult; +import com.amazonaws.services.identitymanagement.model.CreateAccessKeyRequest; +import com.amazonaws.services.identitymanagement.model.CreateAccessKeyResult; +import com.amazonaws.services.identitymanagement.model.CreateAccountAliasRequest; +import com.amazonaws.services.identitymanagement.model.CreateAccountAliasResult; +import com.amazonaws.services.identitymanagement.model.CreateGroupRequest; +import com.amazonaws.services.identitymanagement.model.CreateGroupResult; +import com.amazonaws.services.identitymanagement.model.CreateInstanceProfileRequest; +import com.amazonaws.services.identitymanagement.model.CreateInstanceProfileResult; +import com.amazonaws.services.identitymanagement.model.CreateLoginProfileRequest; +import com.amazonaws.services.identitymanagement.model.CreateLoginProfileResult; +import com.amazonaws.services.identitymanagement.model.CreateOpenIDConnectProviderRequest; +import com.amazonaws.services.identitymanagement.model.CreateOpenIDConnectProviderResult; +import com.amazonaws.services.identitymanagement.model.CreatePolicyRequest; +import com.amazonaws.services.identitymanagement.model.CreatePolicyResult; +import com.amazonaws.services.identitymanagement.model.CreatePolicyVersionRequest; +import com.amazonaws.services.identitymanagement.model.CreatePolicyVersionResult; +import com.amazonaws.services.identitymanagement.model.CreateRoleRequest; +import com.amazonaws.services.identitymanagement.model.CreateRoleResult; +import com.amazonaws.services.identitymanagement.model.CreateSAMLProviderRequest; +import com.amazonaws.services.identitymanagement.model.CreateSAMLProviderResult; +import com.amazonaws.services.identitymanagement.model.CreateServiceLinkedRoleRequest; +import com.amazonaws.services.identitymanagement.model.CreateServiceLinkedRoleResult; +import com.amazonaws.services.identitymanagement.model.CreateServiceSpecificCredentialRequest; +import com.amazonaws.services.identitymanagement.model.CreateServiceSpecificCredentialResult; +import com.amazonaws.services.identitymanagement.model.CreateUserRequest; +import com.amazonaws.services.identitymanagement.model.CreateUserResult; +import com.amazonaws.services.identitymanagement.model.CreateVirtualMFADeviceRequest; +import com.amazonaws.services.identitymanagement.model.CreateVirtualMFADeviceResult; +import com.amazonaws.services.identitymanagement.model.DeactivateMFADeviceRequest; +import com.amazonaws.services.identitymanagement.model.DeactivateMFADeviceResult; +import com.amazonaws.services.identitymanagement.model.DeleteAccessKeyRequest; +import com.amazonaws.services.identitymanagement.model.DeleteAccessKeyResult; +import com.amazonaws.services.identitymanagement.model.DeleteAccountAliasRequest; +import com.amazonaws.services.identitymanagement.model.DeleteAccountAliasResult; +import com.amazonaws.services.identitymanagement.model.DeleteAccountPasswordPolicyRequest; +import com.amazonaws.services.identitymanagement.model.DeleteAccountPasswordPolicyResult; +import com.amazonaws.services.identitymanagement.model.DeleteGroupPolicyRequest; +import com.amazonaws.services.identitymanagement.model.DeleteGroupPolicyResult; +import com.amazonaws.services.identitymanagement.model.DeleteGroupRequest; +import com.amazonaws.services.identitymanagement.model.DeleteGroupResult; +import com.amazonaws.services.identitymanagement.model.DeleteInstanceProfileRequest; +import com.amazonaws.services.identitymanagement.model.DeleteInstanceProfileResult; +import com.amazonaws.services.identitymanagement.model.DeleteLoginProfileRequest; +import com.amazonaws.services.identitymanagement.model.DeleteLoginProfileResult; +import com.amazonaws.services.identitymanagement.model.DeleteOpenIDConnectProviderRequest; +import com.amazonaws.services.identitymanagement.model.DeleteOpenIDConnectProviderResult; +import com.amazonaws.services.identitymanagement.model.DeletePolicyRequest; +import com.amazonaws.services.identitymanagement.model.DeletePolicyResult; +import com.amazonaws.services.identitymanagement.model.DeletePolicyVersionRequest; +import com.amazonaws.services.identitymanagement.model.DeletePolicyVersionResult; +import com.amazonaws.services.identitymanagement.model.DeleteRolePolicyRequest; +import com.amazonaws.services.identitymanagement.model.DeleteRolePolicyResult; +import com.amazonaws.services.identitymanagement.model.DeleteRoleRequest; +import com.amazonaws.services.identitymanagement.model.DeleteRoleResult; +import com.amazonaws.services.identitymanagement.model.DeleteSAMLProviderRequest; +import com.amazonaws.services.identitymanagement.model.DeleteSAMLProviderResult; +import com.amazonaws.services.identitymanagement.model.DeleteSSHPublicKeyRequest; +import com.amazonaws.services.identitymanagement.model.DeleteSSHPublicKeyResult; +import com.amazonaws.services.identitymanagement.model.DeleteServerCertificateRequest; +import com.amazonaws.services.identitymanagement.model.DeleteServerCertificateResult; +import com.amazonaws.services.identitymanagement.model.DeleteServiceLinkedRoleRequest; +import com.amazonaws.services.identitymanagement.model.DeleteServiceLinkedRoleResult; +import com.amazonaws.services.identitymanagement.model.DeleteServiceSpecificCredentialRequest; +import com.amazonaws.services.identitymanagement.model.DeleteServiceSpecificCredentialResult; +import com.amazonaws.services.identitymanagement.model.DeleteSigningCertificateRequest; +import com.amazonaws.services.identitymanagement.model.DeleteSigningCertificateResult; +import com.amazonaws.services.identitymanagement.model.DeleteUserPolicyRequest; +import com.amazonaws.services.identitymanagement.model.DeleteUserPolicyResult; +import com.amazonaws.services.identitymanagement.model.DeleteUserRequest; +import com.amazonaws.services.identitymanagement.model.DeleteUserResult; +import com.amazonaws.services.identitymanagement.model.DeleteVirtualMFADeviceRequest; +import com.amazonaws.services.identitymanagement.model.DeleteVirtualMFADeviceResult; +import com.amazonaws.services.identitymanagement.model.DetachGroupPolicyRequest; +import com.amazonaws.services.identitymanagement.model.DetachGroupPolicyResult; +import com.amazonaws.services.identitymanagement.model.DetachRolePolicyRequest; +import com.amazonaws.services.identitymanagement.model.DetachRolePolicyResult; +import com.amazonaws.services.identitymanagement.model.DetachUserPolicyRequest; +import com.amazonaws.services.identitymanagement.model.DetachUserPolicyResult; +import com.amazonaws.services.identitymanagement.model.EnableMFADeviceRequest; +import com.amazonaws.services.identitymanagement.model.EnableMFADeviceResult; +import com.amazonaws.services.identitymanagement.model.GenerateCredentialReportRequest; +import com.amazonaws.services.identitymanagement.model.GenerateCredentialReportResult; +import com.amazonaws.services.identitymanagement.model.GetAccessKeyLastUsedRequest; +import com.amazonaws.services.identitymanagement.model.GetAccessKeyLastUsedResult; +import com.amazonaws.services.identitymanagement.model.GetAccountAuthorizationDetailsRequest; +import com.amazonaws.services.identitymanagement.model.GetAccountAuthorizationDetailsResult; +import com.amazonaws.services.identitymanagement.model.GetAccountPasswordPolicyRequest; +import com.amazonaws.services.identitymanagement.model.GetAccountPasswordPolicyResult; +import com.amazonaws.services.identitymanagement.model.GetAccountSummaryRequest; +import com.amazonaws.services.identitymanagement.model.GetAccountSummaryResult; +import com.amazonaws.services.identitymanagement.model.GetContextKeysForCustomPolicyRequest; +import com.amazonaws.services.identitymanagement.model.GetContextKeysForCustomPolicyResult; +import com.amazonaws.services.identitymanagement.model.GetContextKeysForPrincipalPolicyRequest; +import com.amazonaws.services.identitymanagement.model.GetContextKeysForPrincipalPolicyResult; +import com.amazonaws.services.identitymanagement.model.GetCredentialReportRequest; +import com.amazonaws.services.identitymanagement.model.GetCredentialReportResult; +import com.amazonaws.services.identitymanagement.model.GetGroupPolicyRequest; +import com.amazonaws.services.identitymanagement.model.GetGroupPolicyResult; +import com.amazonaws.services.identitymanagement.model.GetGroupRequest; +import com.amazonaws.services.identitymanagement.model.GetGroupResult; +import com.amazonaws.services.identitymanagement.model.GetInstanceProfileRequest; +import com.amazonaws.services.identitymanagement.model.GetInstanceProfileResult; +import com.amazonaws.services.identitymanagement.model.GetLoginProfileRequest; +import com.amazonaws.services.identitymanagement.model.GetLoginProfileResult; +import com.amazonaws.services.identitymanagement.model.GetOpenIDConnectProviderRequest; +import com.amazonaws.services.identitymanagement.model.GetOpenIDConnectProviderResult; +import com.amazonaws.services.identitymanagement.model.GetPolicyRequest; +import com.amazonaws.services.identitymanagement.model.GetPolicyResult; +import com.amazonaws.services.identitymanagement.model.GetPolicyVersionRequest; +import com.amazonaws.services.identitymanagement.model.GetPolicyVersionResult; +import com.amazonaws.services.identitymanagement.model.GetRolePolicyRequest; +import com.amazonaws.services.identitymanagement.model.GetRolePolicyResult; +import com.amazonaws.services.identitymanagement.model.GetRoleRequest; +import com.amazonaws.services.identitymanagement.model.GetRoleResult; +import com.amazonaws.services.identitymanagement.model.GetSAMLProviderRequest; +import com.amazonaws.services.identitymanagement.model.GetSAMLProviderResult; +import com.amazonaws.services.identitymanagement.model.GetSSHPublicKeyRequest; +import com.amazonaws.services.identitymanagement.model.GetSSHPublicKeyResult; +import com.amazonaws.services.identitymanagement.model.GetServerCertificateRequest; +import com.amazonaws.services.identitymanagement.model.GetServerCertificateResult; +import com.amazonaws.services.identitymanagement.model.GetServiceLinkedRoleDeletionStatusRequest; +import com.amazonaws.services.identitymanagement.model.GetServiceLinkedRoleDeletionStatusResult; +import com.amazonaws.services.identitymanagement.model.GetUserPolicyRequest; +import com.amazonaws.services.identitymanagement.model.GetUserPolicyResult; +import com.amazonaws.services.identitymanagement.model.GetUserRequest; +import com.amazonaws.services.identitymanagement.model.GetUserResult; +import com.amazonaws.services.identitymanagement.model.ListAccessKeysRequest; +import com.amazonaws.services.identitymanagement.model.ListAccessKeysResult; +import com.amazonaws.services.identitymanagement.model.ListAccountAliasesRequest; +import com.amazonaws.services.identitymanagement.model.ListAccountAliasesResult; +import com.amazonaws.services.identitymanagement.model.ListAttachedGroupPoliciesRequest; +import com.amazonaws.services.identitymanagement.model.ListAttachedGroupPoliciesResult; +import com.amazonaws.services.identitymanagement.model.ListAttachedRolePoliciesRequest; +import com.amazonaws.services.identitymanagement.model.ListAttachedRolePoliciesResult; +import com.amazonaws.services.identitymanagement.model.ListAttachedUserPoliciesRequest; +import com.amazonaws.services.identitymanagement.model.ListAttachedUserPoliciesResult; +import com.amazonaws.services.identitymanagement.model.ListEntitiesForPolicyRequest; +import com.amazonaws.services.identitymanagement.model.ListEntitiesForPolicyResult; +import com.amazonaws.services.identitymanagement.model.ListGroupPoliciesRequest; +import com.amazonaws.services.identitymanagement.model.ListGroupPoliciesResult; +import com.amazonaws.services.identitymanagement.model.ListGroupsForUserRequest; +import com.amazonaws.services.identitymanagement.model.ListGroupsForUserResult; +import com.amazonaws.services.identitymanagement.model.ListGroupsRequest; +import com.amazonaws.services.identitymanagement.model.ListGroupsResult; +import com.amazonaws.services.identitymanagement.model.ListInstanceProfilesForRoleRequest; +import com.amazonaws.services.identitymanagement.model.ListInstanceProfilesForRoleResult; +import com.amazonaws.services.identitymanagement.model.ListInstanceProfilesRequest; +import com.amazonaws.services.identitymanagement.model.ListInstanceProfilesResult; +import com.amazonaws.services.identitymanagement.model.ListMFADevicesRequest; +import com.amazonaws.services.identitymanagement.model.ListMFADevicesResult; +import com.amazonaws.services.identitymanagement.model.ListOpenIDConnectProvidersRequest; +import com.amazonaws.services.identitymanagement.model.ListOpenIDConnectProvidersResult; +import com.amazonaws.services.identitymanagement.model.ListPoliciesRequest; +import com.amazonaws.services.identitymanagement.model.ListPoliciesResult; +import com.amazonaws.services.identitymanagement.model.ListPolicyVersionsRequest; +import com.amazonaws.services.identitymanagement.model.ListPolicyVersionsResult; +import com.amazonaws.services.identitymanagement.model.ListRolePoliciesRequest; +import com.amazonaws.services.identitymanagement.model.ListRolePoliciesResult; +import com.amazonaws.services.identitymanagement.model.ListRolesRequest; +import com.amazonaws.services.identitymanagement.model.ListRolesResult; +import com.amazonaws.services.identitymanagement.model.ListSAMLProvidersRequest; +import com.amazonaws.services.identitymanagement.model.ListSAMLProvidersResult; +import com.amazonaws.services.identitymanagement.model.ListSSHPublicKeysRequest; +import com.amazonaws.services.identitymanagement.model.ListSSHPublicKeysResult; +import com.amazonaws.services.identitymanagement.model.ListServerCertificatesRequest; +import com.amazonaws.services.identitymanagement.model.ListServerCertificatesResult; +import com.amazonaws.services.identitymanagement.model.ListServiceSpecificCredentialsRequest; +import com.amazonaws.services.identitymanagement.model.ListServiceSpecificCredentialsResult; +import com.amazonaws.services.identitymanagement.model.ListSigningCertificatesRequest; +import com.amazonaws.services.identitymanagement.model.ListSigningCertificatesResult; +import com.amazonaws.services.identitymanagement.model.ListUserPoliciesRequest; +import com.amazonaws.services.identitymanagement.model.ListUserPoliciesResult; +import com.amazonaws.services.identitymanagement.model.ListUsersRequest; +import com.amazonaws.services.identitymanagement.model.ListUsersResult; +import com.amazonaws.services.identitymanagement.model.ListVirtualMFADevicesRequest; +import com.amazonaws.services.identitymanagement.model.ListVirtualMFADevicesResult; +import com.amazonaws.services.identitymanagement.model.PutGroupPolicyRequest; +import com.amazonaws.services.identitymanagement.model.PutGroupPolicyResult; +import com.amazonaws.services.identitymanagement.model.PutRolePolicyRequest; +import com.amazonaws.services.identitymanagement.model.PutRolePolicyResult; +import com.amazonaws.services.identitymanagement.model.PutUserPolicyRequest; +import com.amazonaws.services.identitymanagement.model.PutUserPolicyResult; +import com.amazonaws.services.identitymanagement.model.RemoveClientIDFromOpenIDConnectProviderRequest; +import com.amazonaws.services.identitymanagement.model.RemoveClientIDFromOpenIDConnectProviderResult; +import com.amazonaws.services.identitymanagement.model.RemoveRoleFromInstanceProfileRequest; +import com.amazonaws.services.identitymanagement.model.RemoveRoleFromInstanceProfileResult; +import com.amazonaws.services.identitymanagement.model.RemoveUserFromGroupRequest; +import com.amazonaws.services.identitymanagement.model.RemoveUserFromGroupResult; +import com.amazonaws.services.identitymanagement.model.ResetServiceSpecificCredentialRequest; +import com.amazonaws.services.identitymanagement.model.ResetServiceSpecificCredentialResult; +import com.amazonaws.services.identitymanagement.model.ResyncMFADeviceRequest; +import com.amazonaws.services.identitymanagement.model.ResyncMFADeviceResult; +import com.amazonaws.services.identitymanagement.model.SetDefaultPolicyVersionRequest; +import com.amazonaws.services.identitymanagement.model.SetDefaultPolicyVersionResult; +import com.amazonaws.services.identitymanagement.model.SimulateCustomPolicyRequest; +import com.amazonaws.services.identitymanagement.model.SimulateCustomPolicyResult; +import com.amazonaws.services.identitymanagement.model.SimulatePrincipalPolicyRequest; +import com.amazonaws.services.identitymanagement.model.SimulatePrincipalPolicyResult; +import com.amazonaws.services.identitymanagement.model.StatusType; +import com.amazonaws.services.identitymanagement.model.UpdateAccessKeyRequest; +import com.amazonaws.services.identitymanagement.model.UpdateAccessKeyResult; +import com.amazonaws.services.identitymanagement.model.UpdateAccountPasswordPolicyRequest; +import com.amazonaws.services.identitymanagement.model.UpdateAccountPasswordPolicyResult; +import com.amazonaws.services.identitymanagement.model.UpdateAssumeRolePolicyRequest; +import com.amazonaws.services.identitymanagement.model.UpdateAssumeRolePolicyResult; +import com.amazonaws.services.identitymanagement.model.UpdateGroupRequest; +import com.amazonaws.services.identitymanagement.model.UpdateGroupResult; +import com.amazonaws.services.identitymanagement.model.UpdateLoginProfileRequest; +import com.amazonaws.services.identitymanagement.model.UpdateLoginProfileResult; +import com.amazonaws.services.identitymanagement.model.UpdateOpenIDConnectProviderThumbprintRequest; +import com.amazonaws.services.identitymanagement.model.UpdateOpenIDConnectProviderThumbprintResult; +import com.amazonaws.services.identitymanagement.model.UpdateRoleDescriptionRequest; +import com.amazonaws.services.identitymanagement.model.UpdateRoleDescriptionResult; +import com.amazonaws.services.identitymanagement.model.UpdateSAMLProviderRequest; +import com.amazonaws.services.identitymanagement.model.UpdateSAMLProviderResult; +import com.amazonaws.services.identitymanagement.model.UpdateSSHPublicKeyRequest; +import com.amazonaws.services.identitymanagement.model.UpdateSSHPublicKeyResult; +import com.amazonaws.services.identitymanagement.model.UpdateServerCertificateRequest; +import com.amazonaws.services.identitymanagement.model.UpdateServerCertificateResult; +import com.amazonaws.services.identitymanagement.model.UpdateServiceSpecificCredentialRequest; +import com.amazonaws.services.identitymanagement.model.UpdateServiceSpecificCredentialResult; +import com.amazonaws.services.identitymanagement.model.UpdateSigningCertificateRequest; +import com.amazonaws.services.identitymanagement.model.UpdateSigningCertificateResult; +import com.amazonaws.services.identitymanagement.model.UpdateUserRequest; +import com.amazonaws.services.identitymanagement.model.UpdateUserResult; +import com.amazonaws.services.identitymanagement.model.UploadSSHPublicKeyRequest; +import com.amazonaws.services.identitymanagement.model.UploadSSHPublicKeyResult; +import com.amazonaws.services.identitymanagement.model.UploadServerCertificateRequest; +import com.amazonaws.services.identitymanagement.model.UploadServerCertificateResult; +import com.amazonaws.services.identitymanagement.model.UploadSigningCertificateRequest; +import com.amazonaws.services.identitymanagement.model.UploadSigningCertificateResult; +import com.amazonaws.services.identitymanagement.model.User; import com.amazonaws.services.identitymanagement.waiters.AmazonIdentityManagementWaiters; public class AmazonIAMClientMock extends AmazonIdentityManagementClient { @@ -787,7 +1034,6 @@ public class AmazonIAMClientMock extends AmazonIdentityManagementClient { @Override public void shutdown() { throw new UnsupportedOperationException(); - } @Override diff --git a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerDynamicParameterTest.java b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerDynamicParameterTest.java index 12fcd6d..06be0b5 100644 --- a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerDynamicParameterTest.java +++ b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerDynamicParameterTest.java @@ -36,7 +36,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; public class ElSqlConsumerDynamicParameterTest extends CamelTestSupport { private EmbeddedDatabase db; - MyIdGenerator idGenerator = new MyIdGenerator(); + private MyIdGenerator idGenerator = new MyIdGenerator(); @Override protected JndiRegistry createRegistry() throws Exception { diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConstants.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConstants.java index 409afd7..093e718 100644 --- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConstants.java +++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConstants.java @@ -85,8 +85,8 @@ public interface Web3jConstants { String QUORUM_CANONICAL_HASH = "QUORUM_CANONICAL_HASH"; String QUORUM_VOTE = "QUORUM_VOTE"; String QUORUM_MAKE_BLOCK = "QUORUM_MAKE_BLOCK"; - String QUORUM_PAUSE_BLOCK_MAKER= "QUORUM_PAUSE_BLOCK_MAKER"; - String QUORUM_RESUME_BLOCK_MAKER= "QUORUM_RESUME_BLOCK_MAKER"; + String QUORUM_PAUSE_BLOCK_MAKER = "QUORUM_PAUSE_BLOCK_MAKER"; + String QUORUM_RESUME_BLOCK_MAKER = "QUORUM_RESUME_BLOCK_MAKER"; String QUORUM_IS_BLOCK_MAKER = "QUORUM_IS_BLOCK_MAKER"; String QUORUM_IS_VOTER = "QUORUM_IS_VOTER"; String QUORUM_GET_PRIVATE_PAYLOAD = "QUORUM_GET_PRIVATE_PAYLOAD"; diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java index ad0cde2..aa68394 100644 --- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java +++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java @@ -44,6 +44,16 @@ public class Web3jQuorumProducerTest extends Web3jMockTestSupport { @Mock protected Quorum mockQuorum; + @Produce(uri = "direct:start") + protected ProducerTemplate template; + + @Mock + protected Request request; + + protected String getUrl() { + return "web3j://http://127.0.0.1:8545?web3j=#mockQuorum&quorumAPI=true&"; + } + @Override protected JndiRegistry createRegistry() throws Exception { JndiRegistry registry = super.createRegistry(); @@ -51,16 +61,6 @@ public class Web3jQuorumProducerTest extends Web3jMockTestSupport { return registry; } - protected String getUrl() { - return "web3j://http://127.0.0.1:8545?web3j=#mockQuorum&quorumAPI=true&"; - } - - @Produce(uri = "direct:start") - protected ProducerTemplate template; - - @Mock - private Request request; - @Override public boolean isUseAdviceWith() { return false; diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java index f49ea23..4e3a7d4 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java @@ -799,6 +799,16 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { } } + createComponentConfigurationSourceInnerClass(javaClass, nestedTypes, model); + + sortImports(javaClass); + + String fileName = packageName.replaceAll("\\.", "\\/") + "/" + name + ".java"; + + writeSourceIfChanged(javaClass, fileName); + } + + private void createComponentConfigurationSourceInnerClass(JavaClassSource javaClass, Set<JavaClassSource> nestedTypes, ComponentModel model) throws MojoFailureException { // add inner classes for nested AutoConfiguration options ClassLoader projectClassLoader = getProjectClassLoader(); for (JavaClassSource nestedType : nestedTypes) { @@ -950,12 +960,6 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { } } } - - sortImports(javaClass); - - String fileName = packageName.replaceAll("\\.", "\\/") + "/" + name + ".java"; - - writeSourceIfChanged(javaClass, fileName); } private boolean isComplexType(ComponentOptionModel option) {