Skip to content

Revert "[Backport master] Implement URI parts ingest processor" #5332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/Nest/Ingest/ProcessorFormatter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ internal class ProcessorFormatter : IJsonFormatter<IProcessor>
{ "circle", 30 },
{ "enrich", 31 },
{ "csv", 32 },
{ "uri_parts", 33 }
};

public IProcessor Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
Expand Down Expand Up @@ -162,9 +161,6 @@ public IProcessor Deserialize(ref JsonReader reader, IJsonFormatterResolver form
case 32:
processor = Deserialize<CsvProcessor>(ref reader, formatterResolver);
break;
case 33:
processor = Deserialize<UriPartsProcessor>(ref reader, formatterResolver);
break;
}
}
else
Expand Down Expand Up @@ -285,9 +281,6 @@ public void Serialize(ref JsonWriter writer, IProcessor value, IJsonFormatterRes
case "circle":
Serialize<ICircleProcessor>(ref writer, value, formatterResolver);
break;
case "uri_parts":
Serialize<IUriPartsProcessor>(ref writer, value, formatterResolver);
break;
default:
var formatter = DynamicObjectResolver.ExcludeNullCamelCase.GetFormatter<IProcessor>();
formatter.Serialize(ref writer, value, formatterResolver);
Expand Down
97 changes: 0 additions & 97 deletions src/Nest/Ingest/Processors/UriPartsProcessor.cs

This file was deleted.

4 changes: 0 additions & 4 deletions src/Nest/Ingest/ProcessorsDescriptor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,5 @@ public ProcessorsDescriptor Pipeline(Func<PipelineProcessorDescriptor, IPipeline
/// <inheritdoc cref="IPipelineProcessor" />
public ProcessorsDescriptor Circle<T>(Func<CircleProcessorDescriptor<T>, ICircleProcessor> selector) where T : class =>
Assign(selector, (a, v) => a.AddIfNotNull(v?.Invoke(new CircleProcessorDescriptor<T>())));

/// <inheritdoc cref="IUriPartsProcessor"/>
public ProcessorsDescriptor UriParts<T>(Func<UriPartsProcessorDescriptor<T>, IUriPartsProcessor> selector) where T : class =>
Assign(selector, (a, v) => a.AddIfNotNull(v?.Invoke(new UriPartsProcessorDescriptor<T>())));
}
}
14 changes: 0 additions & 14 deletions tests/Tests/Ingest/ProcessorAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -702,19 +702,5 @@ public class Pipeline : ProcessorAssertion

public override string Key => "pipeline";
}

[SkipVersion("<7.11.0", "Uses URI parts which was introduced in 7.11.0")]
public class UriParts : ProcessorAssertion
{
public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
.UriParts<Project>(ud => ud
.Field(p => p.Description)
.KeepOriginal()
.RemoveIfSuccessful());

public override IProcessor Initializer => new UriPartsProcessor { Field = "description", KeepOriginal = true, RemoveIfSuccessful = true };
public override object Json => new { field = "description", keep_original = true, remove_if_successful = true };
public override string Key => "uri_parts";
}
}
}