Skip to content

Commit 63c4549

Browse files
committed
Initial cleanup for PR review
1 parent 0cd6b97 commit 63c4549

File tree

4 files changed

+1
-18
lines changed

4 files changed

+1
-18
lines changed

server/src/main/java/org/elasticsearch/index/mapper/DefaultRootObjectMapperNamespaceValidator.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,4 @@
1515
public class DefaultRootObjectMapperNamespaceValidator implements RootObjectMapperNamespaceValidator {
1616
@Override
1717
public void validateNamespace(ObjectMapper.Subobjects subobjects, String name) {}
18-
19-
// MP FIXME remove
20-
@Override
21-
public String toString() {
22-
return "I'm the DefaultRootObjectMapperNamespaceValidator{}";
23-
}
2418
}

server/src/main/java/org/elasticsearch/index/mapper/MapperRegistry.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,15 @@ public final class MapperRegistry {
3333
private final Function<String, FieldPredicate> fieldFilter;
3434
private final RootObjectMapperNamespaceValidator namespaceValidator;
3535

36-
// MP TODO: remove this? Or keep?
3736
public MapperRegistry(
3837
Map<String, Mapper.TypeParser> mapperParsers,
3938
Map<String, RuntimeField.Parser> runtimeFieldParsers,
4039
Map<String, MetadataFieldMapper.TypeParser> metadataMapperParsers,
4140
Function<String, FieldPredicate> fieldFilter
4241
) {
43-
// MP TODO: remove this no-op RootObjectMapperNamespaceValidator once we know how all this is going to work
44-
this(mapperParsers, runtimeFieldParsers, metadataMapperParsers, fieldFilter, new RootObjectMapperNamespaceValidator() {
45-
@Override
46-
public void validateNamespace(ObjectMapper.Subobjects subobjects, String name) {}
47-
});
42+
this(mapperParsers, runtimeFieldParsers, metadataMapperParsers, fieldFilter, null);
4843
}
4944

50-
// MP TODO: need to move/create tests to use this
5145
public MapperRegistry(
5246
Map<String, Mapper.TypeParser> mapperParsers,
5347
Map<String, RuntimeField.Parser> runtimeFieldParsers,

server/src/main/java/org/elasticsearch/indices/IndicesModule.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ public IndicesModule(List<MapperPlugin> mapperPlugins, RootObjectMapperNamespace
121121
);
122122
}
123123

124-
// MP TODO: remove this constructor once all tests have been updated
125124
public IndicesModule(List<MapperPlugin> mapperPlugins) {
126125
this(mapperPlugins, null);
127126
}

server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -625,10 +625,6 @@ private static SearchExecutionContext createSearchExecutionContext(
625625
);
626626
}
627627

628-
private static MapperService createMapperService(IndexSettings indexSettings, MappingLookup mappingLookup) {
629-
return createMapperServiceWithNamespaceValidator(indexSettings, mappingLookup, null);
630-
}
631-
632628
private static MapperService createMapperServiceWithNamespaceValidator(
633629
IndexSettings indexSettings,
634630
MappingLookup mappingLookup,

0 commit comments

Comments
 (0)