@@ -693,42 +693,28 @@ private DiscoveryNode newNode(String nodeId) {
693693 return DiscoveryNodeUtils .builder (nodeId ).roles (Set .of (DiscoveryNodeRole .MASTER_ROLE , DiscoveryNodeRole .DATA_ROLE )).build ();
694694 }
695695
696- public void testValidateIndexName () throws Exception {
696+ public void testValidateIndexName () {
697697 withTemporaryClusterService (((clusterService , threadPool ) -> {
698- MetadataCreateIndexService checkerService = new MetadataCreateIndexService (
699- Settings .EMPTY ,
700- clusterService ,
701- null ,
702- null ,
703- createTestShardLimitService (randomIntBetween (1 , 1000 ), clusterService ),
704- null ,
705- null ,
706- threadPool ,
707- null ,
708- EmptySystemIndices .INSTANCE ,
709- false ,
710- new IndexSettingProviders (Set .of ())
711- );
712- validateIndexName (checkerService , "index?name" , "must not contain the following characters " + Strings .INVALID_FILENAME_CHARS );
698+ validateIndexName ("index?name" , "must not contain the following characters " + Strings .INVALID_FILENAME_CHARS );
713699
714- validateIndexName (checkerService , "index#name" , "must not contain '#'" );
700+ validateIndexName ("index#name" , "must not contain '#'" );
715701
716- validateIndexName (checkerService , "_indexname" , "must not start with '_', '-', or '+'" );
717- validateIndexName (checkerService , "-indexname" , "must not start with '_', '-', or '+'" );
718- validateIndexName (checkerService , "+indexname" , "must not start with '_', '-', or '+'" );
702+ validateIndexName ("_indexname" , "must not start with '_', '-', or '+'" );
703+ validateIndexName ("-indexname" , "must not start with '_', '-', or '+'" );
704+ validateIndexName ("+indexname" , "must not start with '_', '-', or '+'" );
719705
720- validateIndexName (checkerService , "INDEXNAME" , "must be lowercase" );
706+ validateIndexName ("INDEXNAME" , "must be lowercase" );
721707
722- validateIndexName (checkerService , ".." , "must not be '.' or '..'" );
708+ validateIndexName (".." , "must not be '.' or '..'" );
723709
724- validateIndexName (checkerService , "foo:bar" , "must not contain ':'" );
710+ validateIndexName ("foo:bar" , "must not contain ':'" );
725711
726- validateIndexName (checkerService , "" , "must not be empty" );
727- validateIndexName (checkerService , null , "must not be empty" );
712+ validateIndexName ("" , "must not be empty" );
713+ validateIndexName (null , "must not be empty" );
728714 }));
729715 }
730716
731- private static void validateIndexName (MetadataCreateIndexService metadataCreateIndexService , String indexName , String errorMessage ) {
717+ private static void validateIndexName (String indexName , String errorMessage ) {
732718 ClusterState state = ClusterState .builder (ClusterName .DEFAULT ).build ();
733719 InvalidIndexNameException e = expectThrows (
734720 InvalidIndexNameException .class ,
@@ -1817,7 +1803,6 @@ public void testClusterStateCreateIndexWithClusterBlockTransformer() {
18171803 public void testCreateClusterBlocksTransformerForIndexCreation () {
18181804 boolean isStateless = randomBoolean ();
18191805 boolean useRefreshBlock = randomBoolean ();
1820- var minTransportVersion = TransportVersionUtils .randomCompatibleVersion ();
18211806
18221807 var applier = MetadataCreateIndexService .createClusterBlocksTransformerForIndexCreation (
18231808 Settings .builder ()
0 commit comments