Skip to content

Commit

Permalink
Updates many plugins to the org.opensearch package: csv, date, log-ge…
Browse files Browse the repository at this point in the history
…nerator, mutate, aggregate, drop, grok, http, key-value. #344

Signed-off-by: David Venable <[email protected]>
  • Loading branch information
dlvenable committed Sep 19, 2022
1 parent 7693ba9 commit e3d5543
Show file tree
Hide file tree
Showing 89 changed files with 184 additions and 181 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

package org.opensearch.dataprepper.logstash.mapping;

import com.amazon.dataprepper.plugins.processor.date.DateProcessorConfig;
import org.opensearch.dataprepper.logstash.exception.LogstashConfigurationException;
import org.opensearch.dataprepper.logstash.model.LogstashAttribute;
import org.opensearch.dataprepper.logstash.model.LogstashValueType;
import org.opensearch.dataprepper.plugins.processor.date.DateProcessorConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package org.opensearch.dataprepper.logstash.mapping;

import com.amazon.dataprepper.model.configuration.PluginModel;
import com.amazon.dataprepper.plugins.processor.date.DateProcessorConfig;
import org.opensearch.dataprepper.plugins.processor.date.DateProcessorConfig;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.opensearch.dataprepper.logstash.exception.LogstashConfigurationException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import com.amazon.dataprepper.model.event.Event;

import java.util.Optional;

/**
* Interface for creating custom actions to be used with the {@link com.amazon.dataprepper.plugins.processor.aggregate.AggregateProcessor}.
* Interface for creating custom actions to be used with the {@link AggregateProcessor}.
* @since 1.3
*/
public interface AggregateAction {
/**
* Handles an event as part of aggregation.
*
* @param event The current event
* @param aggregateActionInput An implementation of {@link com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionInput}.
* This AggregateActionInput exposes the {@link com.amazon.dataprepper.plugins.processor.aggregate.GroupState}
* @param aggregateActionInput An implementation of {@link AggregateActionInput}.
* This AggregateActionInput exposes the {@link GroupState}
* that is shared between all events in a single group. This GroupState is non-null.
* @return An {@link com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionResponse} with an Event that will either
* @return An {@link AggregateActionResponse} with an Event that will either
* be processed immediately, or is empty if the Event should be removed from processing
* @since 1.3
*/
Expand All @@ -32,7 +32,7 @@ default AggregateActionResponse handleEvent(final Event event, final AggregateAc
/**
* Concludes a group of Events
*
* @param aggregateActionInput The {@link com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionInput} from previous calls to handleEvent
* @param aggregateActionInput The {@link AggregateActionInput} from previous calls to handleEvent
* @return The final Event to return. Return empty if the aggregate processor
* should not pass an event
* @since 1.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

/**
* Implementing classes are able to be passed to the functions of {@link com.amazon.dataprepper.plugins.processor.aggregate.AggregateAction}
* Implementing classes are able to be passed to the functions of {@link AggregateAction}
* @since 1.3
*/
public interface AggregateActionInput {

/**
* @return An implementation of {@link com.amazon.dataprepper.plugins.processor.aggregate.GroupState}
* @return An implementation of {@link GroupState}
* @since 1.3
*/
GroupState getGroupState();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import com.amazon.dataprepper.model.event.Event;

/**
* Model class to be returned in {@link com.amazon.dataprepper.plugins.processor.aggregate.AggregateAction}. Contains the Event to be processed, which is null if no Event should be processed.
* Model class to be returned in {@link AggregateAction}. Contains the Event to be processed, which is null if no Event should be processed.
* @since 1.3
*/
public class AggregateActionResponse {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import com.amazon.dataprepper.metrics.PluginMetrics;
import com.amazon.dataprepper.model.event.Event;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import java.time.Duration;
import java.time.Instant;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import com.google.common.collect.Maps;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import com.amazon.dataprepper.model.event.Event;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import com.amazon.dataprepper.metrics.PluginMetrics;
import com.amazon.dataprepper.model.annotations.DataPrepperPlugin;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import com.amazon.dataprepper.model.configuration.PluginModel;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import java.util.HashMap;

/**
* The primary implementation of {@link com.amazon.dataprepper.plugins.processor.aggregate.GroupState}
* The primary implementation of {@link GroupState}
* @since 1.3
*/
class DefaultGroupState extends HashMap<Object, Object> implements GroupState {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import java.util.Map;

/**
* Implementing classes will be shared between all Events that belong to this GroupState.
* @see com.amazon.dataprepper.plugins.processor.aggregate.DefaultGroupState
* @see DefaultGroupState
* @since 1.3
*/
public interface GroupState extends Map<Object, Object> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate.actions;
package org.opensearch.dataprepper.plugins.processor.aggregate.actions;

import com.amazon.dataprepper.model.annotations.DataPrepperPlugin;
import com.amazon.dataprepper.model.event.Event;
import com.amazon.dataprepper.model.event.JacksonEvent;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateAction;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionInput;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionResponse;
import com.amazon.dataprepper.plugins.processor.aggregate.GroupState;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateAction;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionInput;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionResponse;
import org.opensearch.dataprepper.plugins.processor.aggregate.GroupState;

import java.util.Optional;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate.actions;
package org.opensearch.dataprepper.plugins.processor.aggregate.actions;

import com.amazon.dataprepper.model.annotations.DataPrepperPlugin;
import com.amazon.dataprepper.model.event.Event;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateAction;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionInput;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionResponse;
import com.amazon.dataprepper.plugins.processor.aggregate.GroupState;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateAction;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionInput;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionResponse;
import org.opensearch.dataprepper.plugins.processor.aggregate.GroupState;

/**
* An AggregateAction that will pass down the first Event of a groupState immediately for processing, and then ignore Events
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import com.amazon.dataprepper.model.event.Event;
import com.amazon.dataprepper.model.event.JacksonEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import com.amazon.dataprepper.metrics.PluginMetrics;
import com.amazon.dataprepper.model.event.Event;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import java.util.HashMap;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import org.junit.jupiter.api.Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import com.amazon.dataprepper.model.event.Event;
import com.amazon.dataprepper.model.event.JacksonEvent;
Expand All @@ -17,8 +17,8 @@
import java.util.UUID;

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;

public class AggregateIdentificationKeysHasherTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import org.junit.jupiter.api.Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import com.amazon.dataprepper.metrics.PluginMetrics;
import com.amazon.dataprepper.model.configuration.PluginModel;
Expand All @@ -12,12 +12,12 @@
import com.amazon.dataprepper.model.event.JacksonEvent;
import com.amazon.dataprepper.model.plugin.PluginFactory;
import com.amazon.dataprepper.model.record.Record;
import com.amazon.dataprepper.plugins.processor.aggregate.actions.RemoveDuplicatesAggregateAction;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.RepeatedTest;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.opensearch.dataprepper.plugins.processor.aggregate.actions.RemoveDuplicatesAggregateAction;

import java.time.Duration;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate;
package org.opensearch.dataprepper.plugins.processor.aggregate;

import com.amazon.dataprepper.metrics.MetricNames;
import com.amazon.dataprepper.metrics.PluginMetrics;
Expand All @@ -22,8 +22,8 @@
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;

import java.util.Collection;
import java.util.AbstractMap;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate.actions;
package org.opensearch.dataprepper.plugins.processor.aggregate.actions;

import com.amazon.dataprepper.model.event.Event;
import com.amazon.dataprepper.model.event.JacksonEvent;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateAction;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionInput;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionResponse;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionTestUtils;
import com.amazon.dataprepper.plugins.processor.aggregate.GroupState;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateAction;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionInput;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionResponse;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionTestUtils;
import org.opensearch.dataprepper.plugins.processor.aggregate.GroupState;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
* SPDX-License-Identifier: Apache-2.0
*/

package com.amazon.dataprepper.plugins.processor.aggregate.actions;
package org.opensearch.dataprepper.plugins.processor.aggregate.actions;

import com.amazon.dataprepper.model.event.Event;
import com.amazon.dataprepper.model.event.JacksonEvent;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateAction;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionInput;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionResponse;
import com.amazon.dataprepper.plugins.processor.aggregate.AggregateActionTestUtils;
import com.amazon.dataprepper.plugins.processor.aggregate.GroupState;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateAction;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionInput;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionResponse;
import org.opensearch.dataprepper.plugins.processor.aggregate.AggregateActionTestUtils;
import org.opensearch.dataprepper.plugins.processor.aggregate.GroupState;

import java.util.Collections;
import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.amazon.dataprepper.metrics.PluginMetrics;
import com.amazon.dataprepper.model.event.Event;
import com.amazon.dataprepper.model.record.Record;
import com.amazon.dataprepper.plugins.source.loggenerator.logtypes.VpcFlowLogTypeGenerator;
import org.opensearch.dataprepper.plugins.source.loggenerator.logtypes.VpcFlowLogTypeGenerator;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
Expand Down
Loading

0 comments on commit e3d5543

Please sign in to comment.