Skip to content

Commit 79347de

Browse files
heemin32heemin32
authored
Changed class name and package (#341)
Signed-off-by: Heemin Kim <heemin@amazon.com>
1 parent 4a6433a commit 79347de

27 files changed

+269
-277
lines changed

‎src/main/java/org/opensearch/geospatial/ip2geo/action/DeleteDatasourceTransportAction.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import org.opensearch.geospatial.annotation.VisibleForTesting;
1919
import org.opensearch.geospatial.exceptions.ConcurrentModificationException;
2020
import org.opensearch.geospatial.exceptions.ResourceInUseException;
21-
import org.opensearch.geospatial.ip2geo.common.DatasourceFacade;
2221
import org.opensearch.geospatial.ip2geo.common.DatasourceState;
23-
import org.opensearch.geospatial.ip2geo.common.GeoIpDataFacade;
2422
import org.opensearch.geospatial.ip2geo.common.Ip2GeoLockService;
25-
import org.opensearch.geospatial.ip2geo.common.Ip2GeoProcessorFacade;
23+
import org.opensearch.geospatial.ip2geo.dao.DatasourceDao;
24+
import org.opensearch.geospatial.ip2geo.dao.GeoIpDataDao;
25+
import org.opensearch.geospatial.ip2geo.dao.Ip2GeoProcessorDao;
2626
import org.opensearch.geospatial.ip2geo.jobscheduler.Datasource;
2727
import org.opensearch.ingest.IngestService;
2828
import org.opensearch.tasks.Task;
@@ -37,9 +37,9 @@ public class DeleteDatasourceTransportAction extends HandledTransportAction<Dele
3737
private static final long LOCK_DURATION_IN_SECONDS = 300l;
3838
private final Ip2GeoLockService lockService;
3939
private final IngestService ingestService;
40-
private final DatasourceFacade datasourceFacade;
41-
private final GeoIpDataFacade geoIpDataFacade;
42-
private final Ip2GeoProcessorFacade ip2GeoProcessorFacade;
40+
private final DatasourceDao datasourceDao;
41+
private final GeoIpDataDao geoIpDataDao;
42+
private final Ip2GeoProcessorDao ip2GeoProcessorDao;
4343
private final ThreadPool threadPool;
4444

4545
/**
@@ -48,25 +48,25 @@ public class DeleteDatasourceTransportAction extends HandledTransportAction<Dele
4848
* @param actionFilters the action filters
4949
* @param lockService the lock service
5050
* @param ingestService the ingest service
51-
* @param datasourceFacade the datasource facade
51+
* @param datasourceDao the datasource facade
5252
*/
5353
@Inject
5454
public DeleteDatasourceTransportAction(
5555
final TransportService transportService,
5656
final ActionFilters actionFilters,
5757
final Ip2GeoLockService lockService,
5858
final IngestService ingestService,
59-
final DatasourceFacade datasourceFacade,
60-
final GeoIpDataFacade geoIpDataFacade,
61-
final Ip2GeoProcessorFacade ip2GeoProcessorFacade,
59+
final DatasourceDao datasourceDao,
60+
final GeoIpDataDao geoIpDataDao,
61+
final Ip2GeoProcessorDao ip2GeoProcessorDao,
6262
final ThreadPool threadPool
6363
) {
6464
super(DeleteDatasourceAction.NAME, transportService, actionFilters, DeleteDatasourceRequest::new);
6565
this.lockService = lockService;
6666
this.ingestService = ingestService;
67-
this.datasourceFacade = datasourceFacade;
68-
this.geoIpDataFacade = geoIpDataFacade;
69-
this.ip2GeoProcessorFacade = ip2GeoProcessorFacade;
67+
this.datasourceDao = datasourceDao;
68+
this.geoIpDataDao = geoIpDataDao;
69+
this.ip2GeoProcessorDao = ip2GeoProcessorDao;
7070
this.threadPool = threadPool;
7171
}
7272

@@ -107,32 +107,32 @@ protected void doExecute(final Task task, final DeleteDatasourceRequest request,
107107

108108
@VisibleForTesting
109109
protected void deleteDatasource(final String datasourceName) throws IOException {
110-
Datasource datasource = datasourceFacade.getDatasource(datasourceName);
110+
Datasource datasource = datasourceDao.getDatasource(datasourceName);
111111
if (datasource == null) {
112112
throw new ResourceNotFoundException("no such datasource exist");
113113
}
114114

115115
setDatasourceStateAsDeleting(datasource);
116-
geoIpDataFacade.deleteIp2GeoDataIndex(datasource.getIndices());
117-
datasourceFacade.deleteDatasource(datasource);
116+
geoIpDataDao.deleteIp2GeoDataIndex(datasource.getIndices());
117+
datasourceDao.deleteDatasource(datasource);
118118
}
119119

120120
private void setDatasourceStateAsDeleting(final Datasource datasource) {
121-
if (ip2GeoProcessorFacade.getProcessors(datasource.getName()).isEmpty() == false) {
121+
if (ip2GeoProcessorDao.getProcessors(datasource.getName()).isEmpty() == false) {
122122
throw new ResourceInUseException("datasource is being used by one of processors");
123123
}
124124

125125
DatasourceState previousState = datasource.getState();
126126
datasource.setState(DatasourceState.DELETING);
127-
datasourceFacade.updateDatasource(datasource);
127+
datasourceDao.updateDatasource(datasource);
128128

129129
// Check again as processor might just have been created.
130130
// If it fails to update the state back to the previous state, the new processor
131131
// will fail to convert an ip to a geo data.
132132
// In such case, user have to delete the processor and delete this datasource again.
133-
if (ip2GeoProcessorFacade.getProcessors(datasource.getName()).isEmpty() == false) {
133+
if (ip2GeoProcessorDao.getProcessors(datasource.getName()).isEmpty() == false) {
134134
datasource.setState(previousState);
135-
datasourceFacade.updateDatasource(datasource);
135+
datasourceDao.updateDatasource(datasource);
136136
throw new ResourceInUseException("datasource is being used by one of processors");
137137
}
138138
}

‎src/main/java/org/opensearch/geospatial/ip2geo/action/GetDatasourceTransportAction.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.opensearch.action.support.HandledTransportAction;
1515
import org.opensearch.common.inject.Inject;
1616
import org.opensearch.geospatial.annotation.VisibleForTesting;
17-
import org.opensearch.geospatial.ip2geo.common.DatasourceFacade;
17+
import org.opensearch.geospatial.ip2geo.dao.DatasourceDao;
1818
import org.opensearch.geospatial.ip2geo.jobscheduler.Datasource;
1919
import org.opensearch.index.IndexNotFoundException;
2020
import org.opensearch.tasks.Task;
@@ -24,31 +24,31 @@
2424
* Transport action to get datasource
2525
*/
2626
public class GetDatasourceTransportAction extends HandledTransportAction<GetDatasourceRequest, GetDatasourceResponse> {
27-
private final DatasourceFacade datasourceFacade;
27+
private final DatasourceDao datasourceDao;
2828

2929
/**
3030
* Default constructor
3131
* @param transportService the transport service
3232
* @param actionFilters the action filters
33-
* @param datasourceFacade the datasource facade
33+
* @param datasourceDao the datasource facade
3434
*/
3535
@Inject
3636
public GetDatasourceTransportAction(
3737
final TransportService transportService,
3838
final ActionFilters actionFilters,
39-
final DatasourceFacade datasourceFacade
39+
final DatasourceDao datasourceDao
4040
) {
4141
super(GetDatasourceAction.NAME, transportService, actionFilters, GetDatasourceRequest::new);
42-
this.datasourceFacade = datasourceFacade;
42+
this.datasourceDao = datasourceDao;
4343
}
4444

4545
@Override
4646
protected void doExecute(final Task task, final GetDatasourceRequest request, final ActionListener<GetDatasourceResponse> listener) {
4747
if (shouldGetAllDatasource(request)) {
4848
// We don't expect too many data sources. Therefore, querying all data sources without pagination should be fine.
49-
datasourceFacade.getAllDatasources(newActionListener(listener));
49+
datasourceDao.getAllDatasources(newActionListener(listener));
5050
} else {
51-
datasourceFacade.getDatasources(request.getNames(), newActionListener(listener));
51+
datasourceDao.getDatasources(request.getNames(), newActionListener(listener));
5252
}
5353
}
5454

‎src/main/java/org/opensearch/geospatial/ip2geo/action/PutDatasourceTransportAction.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.opensearch.common.inject.Inject;
2323
import org.opensearch.geospatial.annotation.VisibleForTesting;
2424
import org.opensearch.geospatial.exceptions.ConcurrentModificationException;
25-
import org.opensearch.geospatial.ip2geo.common.DatasourceFacade;
2625
import org.opensearch.geospatial.ip2geo.common.DatasourceState;
2726
import org.opensearch.geospatial.ip2geo.common.Ip2GeoLockService;
27+
import org.opensearch.geospatial.ip2geo.dao.DatasourceDao;
2828
import org.opensearch.geospatial.ip2geo.jobscheduler.Datasource;
2929
import org.opensearch.geospatial.ip2geo.jobscheduler.DatasourceUpdateService;
3030
import org.opensearch.index.engine.VersionConflictEngineException;
@@ -39,7 +39,7 @@
3939
@Log4j2
4040
public class PutDatasourceTransportAction extends HandledTransportAction<PutDatasourceRequest, AcknowledgedResponse> {
4141
private final ThreadPool threadPool;
42-
private final DatasourceFacade datasourceFacade;
42+
private final DatasourceDao datasourceDao;
4343
private final DatasourceUpdateService datasourceUpdateService;
4444
private final Ip2GeoLockService lockService;
4545

@@ -48,7 +48,7 @@ public class PutDatasourceTransportAction extends HandledTransportAction<PutData
4848
* @param transportService the transport service
4949
* @param actionFilters the action filters
5050
* @param threadPool the thread pool
51-
* @param datasourceFacade the datasource facade
51+
* @param datasourceDao the datasource facade
5252
* @param datasourceUpdateService the datasource update service
5353
* @param lockService the lock service
5454
*/
@@ -57,13 +57,13 @@ public PutDatasourceTransportAction(
5757
final TransportService transportService,
5858
final ActionFilters actionFilters,
5959
final ThreadPool threadPool,
60-
final DatasourceFacade datasourceFacade,
60+
final DatasourceDao datasourceDao,
6161
final DatasourceUpdateService datasourceUpdateService,
6262
final Ip2GeoLockService lockService
6363
) {
6464
super(PutDatasourceAction.NAME, transportService, actionFilters, PutDatasourceRequest::new);
6565
this.threadPool = threadPool;
66-
this.datasourceFacade = datasourceFacade;
66+
this.datasourceDao = datasourceDao;
6767
this.datasourceUpdateService = datasourceUpdateService;
6868
this.lockService = lockService;
6969
}
@@ -97,10 +97,10 @@ protected void internalDoExecute(
9797
final ActionListener<AcknowledgedResponse> listener
9898
) {
9999
StepListener<Void> createIndexStep = new StepListener<>();
100-
datasourceFacade.createIndexIfNotExists(createIndexStep);
100+
datasourceDao.createIndexIfNotExists(createIndexStep);
101101
createIndexStep.whenComplete(v -> {
102102
Datasource datasource = Datasource.Builder.build(request);
103-
datasourceFacade.putDatasource(datasource, getIndexResponseListener(datasource, lock, listener));
103+
datasourceDao.putDatasource(datasource, getIndexResponseListener(datasource, lock, listener));
104104
}, exception -> {
105105
lockService.releaseLock(lock);
106106
listener.onFailure(exception);
@@ -165,7 +165,7 @@ private void markDatasourceAsCreateFailed(final Datasource datasource) {
165165
datasource.getUpdateStats().setLastFailedAt(Instant.now());
166166
datasource.setState(DatasourceState.CREATE_FAILED);
167167
try {
168-
datasourceFacade.updateDatasource(datasource);
168+
datasourceDao.updateDatasource(datasource);
169169
} catch (Exception e) {
170170
log.error("Failed to mark datasource state as CREATE_FAILED for {}", datasource.getName(), e);
171171
}

‎src/main/java/org/opensearch/geospatial/ip2geo/action/UpdateDatasourceTransportAction.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import org.opensearch.common.inject.Inject;
2424
import org.opensearch.geospatial.exceptions.ConcurrentModificationException;
2525
import org.opensearch.geospatial.exceptions.IncompatibleDatasourceException;
26-
import org.opensearch.geospatial.ip2geo.common.DatasourceFacade;
2726
import org.opensearch.geospatial.ip2geo.common.DatasourceManifest;
2827
import org.opensearch.geospatial.ip2geo.common.Ip2GeoLockService;
28+
import org.opensearch.geospatial.ip2geo.dao.DatasourceDao;
2929
import org.opensearch.geospatial.ip2geo.jobscheduler.Datasource;
3030
import org.opensearch.geospatial.ip2geo.jobscheduler.DatasourceTask;
3131
import org.opensearch.geospatial.ip2geo.jobscheduler.DatasourceUpdateService;
@@ -41,7 +41,7 @@
4141
public class UpdateDatasourceTransportAction extends HandledTransportAction<UpdateDatasourceRequest, AcknowledgedResponse> {
4242
private static final long LOCK_DURATION_IN_SECONDS = 300l;
4343
private final Ip2GeoLockService lockService;
44-
private final DatasourceFacade datasourceFacade;
44+
private final DatasourceDao datasourceDao;
4545
private final DatasourceUpdateService datasourceUpdateService;
4646
private final ThreadPool threadPool;
4747

@@ -51,22 +51,22 @@ public class UpdateDatasourceTransportAction extends HandledTransportAction<Upda
5151
* @param transportService the transport service
5252
* @param actionFilters the action filters
5353
* @param lockService the lock service
54-
* @param datasourceFacade the datasource facade
54+
* @param datasourceDao the datasource facade
5555
* @param datasourceUpdateService the datasource update service
5656
*/
5757
@Inject
5858
public UpdateDatasourceTransportAction(
5959
final TransportService transportService,
6060
final ActionFilters actionFilters,
6161
final Ip2GeoLockService lockService,
62-
final DatasourceFacade datasourceFacade,
62+
final DatasourceDao datasourceDao,
6363
final DatasourceUpdateService datasourceUpdateService,
6464
final ThreadPool threadPool
6565
) {
6666
super(UpdateDatasourceAction.NAME, transportService, actionFilters, UpdateDatasourceRequest::new);
6767
this.lockService = lockService;
6868
this.datasourceUpdateService = datasourceUpdateService;
69-
this.datasourceFacade = datasourceFacade;
69+
this.datasourceDao = datasourceDao;
7070
this.threadPool = threadPool;
7171
}
7272

@@ -90,7 +90,7 @@ protected void doExecute(final Task task, final UpdateDatasourceRequest request,
9090
// TODO: makes every sub-methods as async call to avoid using a thread in generic pool
9191
threadPool.generic().submit(() -> {
9292
try {
93-
Datasource datasource = datasourceFacade.getDatasource(request.getName());
93+
Datasource datasource = datasourceDao.getDatasource(request.getName());
9494
if (datasource == null) {
9595
throw new ResourceNotFoundException("no such datasource exist");
9696
}
@@ -124,7 +124,7 @@ private void updateIfChanged(final UpdateDatasourceRequest request, final Dataso
124124
}
125125

126126
if (isChanged) {
127-
datasourceFacade.updateDatasource(datasource);
127+
datasourceDao.updateDatasource(datasource);
128128
}
129129
}
130130

‎src/main/java/org/opensearch/geospatial/ip2geo/cache/Ip2GeoCache.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
import org.opensearch.common.xcontent.XContentType;
1818
import org.opensearch.core.xcontent.NamedXContentRegistry;
1919
import org.opensearch.core.xcontent.XContentParser;
20-
import org.opensearch.geospatial.ip2geo.common.DatasourceFacade;
2120
import org.opensearch.geospatial.ip2geo.common.DatasourceState;
21+
import org.opensearch.geospatial.ip2geo.dao.DatasourceDao;
2222
import org.opensearch.geospatial.ip2geo.jobscheduler.Datasource;
2323
import org.opensearch.index.engine.Engine;
2424
import org.opensearch.index.shard.IndexingOperationListener;
2525
import org.opensearch.index.shard.ShardId;
2626

2727
@Log4j2
2828
public class Ip2GeoCache implements IndexingOperationListener {
29-
private final DatasourceFacade datasourceFacade;
29+
private final DatasourceDao datasourceDao;
3030
private Map<String, DatasourceMetadata> data;
3131

32-
public Ip2GeoCache(final DatasourceFacade datasourceFacade) {
33-
this.datasourceFacade = datasourceFacade;
32+
public Ip2GeoCache(final DatasourceDao datasourceDao) {
33+
this.datasourceDao = datasourceDao;
3434
}
3535

3636
public String getIndexName(final String datasourceName) {
@@ -58,7 +58,7 @@ private Map<String, DatasourceMetadata> getData() {
5858
return data;
5959
}
6060
Map<String, DatasourceMetadata> tempData = new ConcurrentHashMap<>();
61-
datasourceFacade.getAllDatasources()
61+
datasourceDao.getAllDatasources()
6262
.stream()
6363
.forEach(datasource -> tempData.put(datasource.getName(), new DatasourceMetadata(datasource)));
6464
data = tempData;

‎src/main/java/org/opensearch/geospatial/ip2geo/common/DatasourceFacade.java renamed to ‎src/main/java/org/opensearch/geospatial/ip2geo/dao/DatasourceDao.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package org.opensearch.geospatial.ip2geo.common;
6+
package org.opensearch.geospatial.ip2geo.dao;
77

88
import java.io.BufferedReader;
99
import java.io.IOException;
@@ -47,6 +47,7 @@
4747
import org.opensearch.core.xcontent.NamedXContentRegistry;
4848
import org.opensearch.core.xcontent.ToXContent;
4949
import org.opensearch.core.xcontent.XContentParser;
50+
import org.opensearch.geospatial.ip2geo.common.Ip2GeoSettings;
5051
import org.opensearch.geospatial.ip2geo.jobscheduler.Datasource;
5152
import org.opensearch.geospatial.ip2geo.jobscheduler.DatasourceExtension;
5253
import org.opensearch.geospatial.shared.StashedThreadContext;
@@ -56,16 +57,16 @@
5657
import org.opensearch.search.SearchHit;
5758

5859
/**
59-
* Facade class for datasource
60+
* Data access object for datasource
6061
*/
6162
@Log4j2
62-
public class DatasourceFacade {
63+
public class DatasourceDao {
6364
private static final Integer MAX_SIZE = 1000;
6465
private final Client client;
6566
private final ClusterService clusterService;
6667
private final ClusterSettings clusterSettings;
6768

68-
public DatasourceFacade(final Client client, final ClusterService clusterService) {
69+
public DatasourceDao(final Client client, final ClusterService clusterService) {
6970
this.client = client;
7071
this.clusterService = clusterService;
7172
this.clusterSettings = clusterService.getClusterSettings();
@@ -103,7 +104,7 @@ public void onFailure(final Exception e) {
103104

104105
private String getIndexMapping() {
105106
try {
106-
try (InputStream is = DatasourceFacade.class.getResourceAsStream("/mappings/ip2geo_datasource.json")) {
107+
try (InputStream is = DatasourceDao.class.getResourceAsStream("/mappings/ip2geo_datasource.json")) {
107108
try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
108109
return reader.lines().map(String::trim).collect(Collectors.joining());
109110
}

0 commit comments

Comments
 (0)