Skip to content

Commit

Permalink
remove lombok
Browse files Browse the repository at this point in the history
Signed-off-by: Joanne Wang <jowg@amazon.com>
  • Loading branch information
jowg-amazon committed Oct 4, 2023
1 parent 0419c56 commit 738b660
Show file tree
Hide file tree
Showing 33 changed files with 313 additions and 180 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.action.ActionType;
import org.opensearch.action.support.master.AcknowledgedResponse;
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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.action.ActionRequest;
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.securityanalytics.threatintel.common.ParameterValidator;
import org.opensearch.securityanalytics.threatIntel.common.ParameterValidator;

import java.io.IOException;

Expand All @@ -36,6 +36,10 @@ public DeleteDatasourceRequest(final StreamInput in) throws IOException {
this.name = in.readString();
}

public DeleteDatasourceRequest(final String name) {
this.name = name;
}

@Override
public ActionRequestValidationException validate() {
ActionRequestValidationException errors = null;
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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand All @@ -18,11 +18,11 @@

import org.opensearch.ingest.IngestService;
import org.opensearch.securityanalytics.model.DetectorTrigger;
import org.opensearch.securityanalytics.threatintel.common.DatasourceState;
import org.opensearch.securityanalytics.threatintel.common.ThreatIntelLockService;
import org.opensearch.securityanalytics.threatintel.dao.DatasourceDao;
import org.opensearch.securityanalytics.threatintel.dao.ThreatIntelFeedDao;
import org.opensearch.securityanalytics.threatintel.jobscheduler.Datasource;
import org.opensearch.securityanalytics.threatIntel.common.DatasourceState;
import org.opensearch.securityanalytics.threatIntel.common.ThreatIntelLockService;
import org.opensearch.securityanalytics.threatIntel.dao.DatasourceDao;
import org.opensearch.securityanalytics.threatIntel.dao.ThreatIntelFeedDao;
import org.opensearch.securityanalytics.threatIntel.jobscheduler.Datasource;
import org.opensearch.tasks.Task;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.TransportService;
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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.action.ActionType;

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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.action.ActionRequest;
import org.opensearch.action.ActionRequestValidationException;
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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.core.ParseField;
import org.opensearch.core.action.ActionResponse;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.xcontent.ToXContentObject;
import org.opensearch.core.xcontent.XContentBuilder;
import org.opensearch.securityanalytics.threatintel.jobscheduler.Datasource;
import org.opensearch.securityanalytics.threatIntel.jobscheduler.Datasource;

import java.io.IOException;
import java.time.Instant;
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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.OpenSearchException;
import org.opensearch.action.support.ActionFilters;
import org.opensearch.action.support.HandledTransportAction;
import org.opensearch.common.inject.Inject;
import org.opensearch.core.action.ActionListener;
import org.opensearch.index.IndexNotFoundException;
import org.opensearch.securityanalytics.threatintel.dao.DatasourceDao;
import org.opensearch.securityanalytics.threatintel.jobscheduler.Datasource;
import org.opensearch.securityanalytics.threatIntel.dao.DatasourceDao;
import org.opensearch.securityanalytics.threatIntel.jobscheduler.Datasource;
import org.opensearch.tasks.Task;
import org.opensearch.transport.TransportService;

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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.action.ActionType;
import org.opensearch.action.support.master.AcknowledgedResponse;
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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import java.io.IOException;
import java.net.MalformedURLException;
Expand All @@ -22,8 +22,8 @@
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.xcontent.ObjectParser;
import org.opensearch.securityanalytics.model.DetectorTrigger;
import org.opensearch.securityanalytics.threatintel.common.DatasourceManifest;
import org.opensearch.securityanalytics.threatintel.common.ParameterValidator;
import org.opensearch.securityanalytics.threatIntel.common.DatasourceManifest;
import org.opensearch.securityanalytics.threatIntel.common.ParameterValidator;

/**
* Threat intel datasource creation request
Expand Down Expand Up @@ -62,6 +62,50 @@ public class PutDatasourceRequest extends ActionRequest {

private List<String> contained_iocs_field;

public void setFeedFormat(String feedFormat) {
this.feedFormat = feedFormat;
}

public void setThisEndpoint(String endpoint) {
this.endpoint = endpoint;
}

public void setFeedName(String feedName) {
this.feedName = feedName;
}

public void setDescription(String description) {
this.description = description;
}

public void setOrganization(String organization) {
this.organization = organization;
}

public void setContained_iocs_field(List<String> contained_iocs_field) {
this.contained_iocs_field = contained_iocs_field;
}

public List<String> getContained_iocs_field() {
return contained_iocs_field;
}

public String getFeedFormat() {
return feedFormat;
}

public String getFeedName() {
return feedName;
}

@Override
public String getDescription() {
return description;
}

public String getOrganization() {
return organization;
}
/**
* @param updateInterval update interval of a datasource
* @return update interval of a datasource
Expand All @@ -75,7 +119,7 @@ public class PutDatasourceRequest extends ActionRequest {
static {
PARSER = new ObjectParser<>("put_datasource");
PARSER.declareString((request, val) -> request.setFeedFormat(val), FEED_FORMAT_FIELD);
PARSER.declareString((request, val) -> request.setEndpoint(val), ENDPOINT_FIELD);
PARSER.declareString((request, val) -> request.setThisEndpoint(val), ENDPOINT_FIELD);
PARSER.declareString((request, val) -> request.setFeedName(val), FEED_NAME_FIELD);
PARSER.declareString((request, val) -> request.setDescription(val), DESCRIPTION_FIELD);
PARSER.declareString((request, val) -> request.setOrganization(val), ORGANIZATION_FIELD);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

package org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import static org.opensearch.securityanalytics.threatintel.common.ThreatIntelLockService.LOCK_DURATION_IN_SECONDS;
import static org.opensearch.securityanalytics.threatIntel.common.ThreatIntelLockService.LOCK_DURATION_IN_SECONDS;

import java.time.Instant;
import java.util.ConcurrentModificationException;
Expand All @@ -26,11 +26,11 @@
import org.opensearch.index.engine.VersionConflictEngineException;
import org.opensearch.jobscheduler.spi.LockModel;
import org.opensearch.securityanalytics.model.DetectorTrigger;
import org.opensearch.securityanalytics.threatintel.common.DatasourceState;
import org.opensearch.securityanalytics.threatintel.common.ThreatIntelLockService;
import org.opensearch.securityanalytics.threatintel.dao.DatasourceDao;
import org.opensearch.securityanalytics.threatintel.jobscheduler.Datasource;
import org.opensearch.securityanalytics.threatintel.jobscheduler.DatasourceUpdateService;
import org.opensearch.securityanalytics.threatIntel.common.DatasourceState;
import org.opensearch.securityanalytics.threatIntel.common.ThreatIntelLockService;
import org.opensearch.securityanalytics.threatIntel.dao.DatasourceDao;
import org.opensearch.securityanalytics.threatIntel.jobscheduler.Datasource;
import org.opensearch.securityanalytics.threatIntel.jobscheduler.DatasourceUpdateService;
import org.opensearch.tasks.Task;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.TransportService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
* SPDX-License-Identifier: Apache-2.0
*/

package org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.client.node.NodeClient;
import org.opensearch.rest.BaseRestHandler;
import org.opensearch.rest.RestRequest;
import org.opensearch.rest.action.RestToXContentListener;

import java.io.IOException;
import java.util.List;
import java.util.Locale;

Expand All @@ -28,7 +29,7 @@ public String getName() {
}

@Override
protected RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) {
protected RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
final String name = request.param(PARAMS_NAME);
final DeleteDatasourceRequest deleteDatasourceRequest = new DeleteDatasourceRequest(name);

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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.client.node.NodeClient;
import org.opensearch.core.common.Strings;
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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.client.node.NodeClient;
import org.opensearch.common.settings.ClusterSettings;
Expand All @@ -12,7 +12,7 @@
import org.opensearch.rest.BaseRestHandler;
import org.opensearch.rest.RestRequest;
import org.opensearch.rest.action.RestToXContentListener;
import org.opensearch.securityanalytics.threatintel.common.ThreatIntelSettings;
import org.opensearch.securityanalytics.threatIntel.common.ThreatIntelSettings;

import java.io.IOException;
import java.util.List;
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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.client.node.NodeClient;
import org.opensearch.core.xcontent.XContentParser;
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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.action.ActionType;
import org.opensearch.action.support.master.AcknowledgedResponse;
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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand All @@ -15,8 +15,8 @@
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.xcontent.ObjectParser;
import org.opensearch.securityanalytics.model.DetectorTrigger;
import org.opensearch.securityanalytics.threatintel.common.DatasourceManifest;
import org.opensearch.securityanalytics.threatintel.common.ParameterValidator;
import org.opensearch.securityanalytics.threatIntel.common.DatasourceManifest;
import org.opensearch.securityanalytics.threatIntel.common.ParameterValidator;

import java.io.IOException;
import java.net.MalformedURLException;
Expand All @@ -40,11 +40,13 @@ public class UpdateDatasourceRequest extends ActionRequest {
* @return the datasource name
*/
private String name;

/**
* @param endpoint url to a manifest file for a datasource
* @return url to a manifest file for a datasource
*/
private String endpoint;

/**
* @param updateInterval update interval of a datasource
* @return update interval of a datasource
Expand All @@ -61,8 +63,22 @@ public class UpdateDatasourceRequest extends ActionRequest {
PARSER.declareLong((request, val) -> request.setUpdateInterval(TimeValue.timeValueDays(val)), UPDATE_INTERVAL_IN_DAYS_FIELD);
}

private void setEndpoint(String val) {
public String getName() {
return name;
}
public String getEndpoint() {
return endpoint;
}
private void setEndpoint(String endpoint) {
this.endpoint = endpoint;
}

public TimeValue getUpdateInterval() {
return updateInterval;
}

private void setUpdateInterval(TimeValue updateInterval){
this.updateInterval = updateInterval;
}

/**
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 org.opensearch.securityanalytics.threatintel.action;
package org.opensearch.securityanalytics.threatIntel.action;

import org.opensearch.OpenSearchStatusException;
import org.opensearch.ResourceNotFoundException;
Expand All @@ -14,12 +14,12 @@
import org.opensearch.core.action.ActionListener;
import org.opensearch.core.rest.RestStatus;
import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule;
import org.opensearch.securityanalytics.threatintel.common.DatasourceState;
import org.opensearch.securityanalytics.threatintel.common.ThreatIntelLockService;
import org.opensearch.securityanalytics.threatintel.dao.DatasourceDao;
import org.opensearch.securityanalytics.threatintel.jobscheduler.Datasource;
import org.opensearch.securityanalytics.threatintel.jobscheduler.DatasourceTask;
import org.opensearch.securityanalytics.threatintel.jobscheduler.DatasourceUpdateService;
import org.opensearch.securityanalytics.threatIntel.common.DatasourceState;
import org.opensearch.securityanalytics.threatIntel.common.ThreatIntelLockService;
import org.opensearch.securityanalytics.threatIntel.dao.DatasourceDao;
import org.opensearch.securityanalytics.threatIntel.jobscheduler.Datasource;
import org.opensearch.securityanalytics.threatIntel.jobscheduler.DatasourceTask;
import org.opensearch.securityanalytics.threatIntel.jobscheduler.DatasourceUpdateService;
import org.opensearch.tasks.Task;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.TransportService;
Expand Down
Loading

0 comments on commit 738b660

Please sign in to comment.