Skip to content

Commit 161fd8d

Browse files
mevdscheemevdschee
committed
Big renaming of classes and namespaces
1 parent d21ad86 commit 161fd8d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+100
-100
lines changed

‎full/src/main/java/com/tqdev/crudapi/CrudApiApp.java renamed to ‎full/src/main/java/com/tqdev/crudapi/ApiApp.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.tqdev.crudapi;
22

3-
import com.tqdev.crudapi.api.CrudApiService;
4-
import com.tqdev.crudapi.api.JooqCrudApiService;
5-
import com.tqdev.crudapi.api.record.DatabaseRecordsException;
6-
import com.tqdev.crudapi.api.spatial.SpatialDSL;
7-
import com.tqdev.crudapi.meta.CrudMetaService;
8-
import com.tqdev.crudapi.meta.JooqCrudMetaService;
3+
import com.tqdev.crudapi.data.DataService;
4+
import com.tqdev.crudapi.data.JooqDataService;
5+
import com.tqdev.crudapi.data.record.DatabaseRecordsException;
6+
import com.tqdev.crudapi.data.spatial.SpatialDSL;
7+
import com.tqdev.crudapi.meta.MetaService;
8+
import com.tqdev.crudapi.meta.JooqMetaService;
99
import com.tqdev.crudapi.meta.definition.DatabaseDefinitionException;
1010

1111
import org.jooq.DSLContext;
@@ -19,29 +19,29 @@
1919

2020
@SpringBootApplication(scanBasePackages = { "com.tqdev.crudapi" })
2121
@PropertySource("classpath:application.yml")
22-
public class CrudApiApp {
22+
public class ApiApp {
2323

2424
public static void main(String[] args) {
25-
SpringApplication.run(CrudApiApp.class, args);
25+
SpringApplication.run(ApiApp.class, args);
2626
}
2727

2828
@Bean
2929
@Autowired
30-
public CrudMetaService crudMetaService(DSLContext dsl) throws IOException,
30+
public MetaService crudMetaService(DSLContext dsl) throws IOException,
3131
DatabaseDefinitionException, DatabaseRecordsException {
32-
CrudMetaService result;
32+
MetaService result;
3333
SpatialDSL.registerDataTypes(dsl);
34-
result = new JooqCrudMetaService(dsl);
34+
result = new JooqMetaService(dsl);
3535
result.initialize("columns.json", "openapi.json");
3636
return result;
3737
}
3838

3939
@Bean
4040
@Autowired
41-
public CrudApiService crudApiService(DSLContext dsl, CrudMetaService meta) throws
41+
public DataService crudApiService(DSLContext dsl, MetaService meta) throws
4242
IOException, DatabaseDefinitionException, DatabaseRecordsException {
43-
CrudApiService result;
44-
result = new JooqCrudApiService(dsl, meta);
43+
DataService result;
44+
result = new JooqDataService(dsl, meta);
4545
result.initialize("records.json");
4646
return result;
4747
}

‎full/src/main/java/com/tqdev/crudapi/controller/BaseController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import org.springframework.http.HttpStatus;
44
import org.springframework.http.ResponseEntity;
55

6-
import com.tqdev.crudapi.api.ErrorCode;
7-
import com.tqdev.crudapi.api.record.ErrorDocument;
6+
import com.tqdev.crudapi.data.ErrorCode;
7+
import com.tqdev.crudapi.data.record.ErrorDocument;
88

99
public class BaseController {
1010

‎full/src/main/java/com/tqdev/crudapi/controller/CrudApiController.java renamed to ‎full/src/main/java/com/tqdev/crudapi/controller/DataController.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
import org.springframework.web.bind.annotation.RestController;
1717

1818
import com.fasterxml.jackson.databind.ObjectMapper;
19-
import com.tqdev.crudapi.api.CrudApiService;
20-
import com.tqdev.crudapi.api.ErrorCode;
21-
import com.tqdev.crudapi.api.Params;
22-
import com.tqdev.crudapi.api.record.Record;
19+
import com.tqdev.crudapi.data.DataService;
20+
import com.tqdev.crudapi.data.ErrorCode;
21+
import com.tqdev.crudapi.data.Params;
22+
import com.tqdev.crudapi.data.record.Record;
2323

2424
@RestController
2525
@RequestMapping("/data")
26-
public class CrudApiController extends BaseController {
26+
public class DataController extends BaseController {
2727

28-
public static final Logger logger = LoggerFactory.getLogger(CrudApiController.class);
28+
public static final Logger logger = LoggerFactory.getLogger(DataController.class);
2929

3030
@Autowired
31-
CrudApiService service;
31+
DataService service;
3232

3333
@RequestMapping(value = "/{table}", method = RequestMethod.GET)
3434
public ResponseEntity<?> list(@PathVariable("table") String table,

‎full/src/main/java/com/tqdev/crudapi/controller/ExceptionHandlerController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.springframework.web.bind.annotation.RestControllerAdvice;
1010
import org.springframework.web.servlet.HandlerMapping;
1111

12-
import com.tqdev.crudapi.api.ErrorCode;
12+
import com.tqdev.crudapi.data.ErrorCode;
1313

1414
@RestController
1515
@RestControllerAdvice

‎full/src/main/java/com/tqdev/crudapi/controller/CrudMetaController.java renamed to ‎full/src/main/java/com/tqdev/crudapi/controller/MetaController.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
import org.springframework.web.bind.annotation.RequestMethod;
99
import org.springframework.web.bind.annotation.RestController;
1010

11-
import com.tqdev.crudapi.api.CrudApiService;
12-
import com.tqdev.crudapi.meta.CrudMetaService;
11+
import com.tqdev.crudapi.data.DataService;
12+
import com.tqdev.crudapi.meta.MetaService;
1313

1414
@RestController
1515
@RequestMapping("/meta")
16-
public class CrudMetaController extends BaseController {
16+
public class MetaController extends BaseController {
1717

18-
public static final Logger logger = LoggerFactory.getLogger(CrudMetaController.class);
18+
public static final Logger logger = LoggerFactory.getLogger(MetaController.class);
1919

2020
@Autowired
21-
CrudMetaService metaService;
21+
MetaService metaService;
2222

2323
@Autowired
24-
CrudApiService apiService;
24+
DataService apiService;
2525

2626
@RequestMapping(value = "/columns", method = RequestMethod.GET)
2727
public ResponseEntity<?> columns() {

‎full/src/main/java/com/tqdev/crudapi/api/BaseCrudApiService.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/BaseDataService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

33
import java.util.ArrayList;
44

55
import org.jooq.Field;
66

7-
import com.tqdev.crudapi.api.record.DatabaseRecords;
8-
import com.tqdev.crudapi.api.record.Record;
7+
import com.tqdev.crudapi.data.record.DatabaseRecords;
8+
import com.tqdev.crudapi.data.record.Record;
99
import com.tqdev.crudapi.meta.reflection.DatabaseReflection;
1010

11-
abstract class BaseCrudApiService implements CrudApiService {
11+
abstract class BaseDataService implements DataService {
1212

1313
protected DatabaseReflection tables;
1414

‎full/src/main/java/com/tqdev/crudapi/api/ColumnSelector.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/ColumnSelector.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

33
import java.util.ArrayList;
44
import java.util.Base64;
@@ -10,8 +10,8 @@
1010
import org.jooq.Field;
1111
import org.jooq.impl.DSL;
1212

13-
import com.tqdev.crudapi.api.record.Record;
14-
import com.tqdev.crudapi.api.spatial.SpatialDSL;
13+
import com.tqdev.crudapi.data.record.Record;
14+
import com.tqdev.crudapi.data.spatial.SpatialDSL;
1515
import com.tqdev.crudapi.meta.reflection.ReflectedTable;
1616

1717
public class ColumnSelector {

‎full/src/main/java/com/tqdev/crudapi/api/CrudApiHandlers.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/CrudApiHandlers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

33
public interface CrudApiHandlers {
44

‎full/src/main/java/com/tqdev/crudapi/api/CrudApiService.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/DataService.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

3-
import com.tqdev.crudapi.api.record.DatabaseRecords;
4-
import com.tqdev.crudapi.api.record.DatabaseRecordsException;
5-
import com.tqdev.crudapi.api.record.ListResponse;
6-
import com.tqdev.crudapi.api.record.Record;
3+
import com.tqdev.crudapi.data.record.DatabaseRecords;
4+
import com.tqdev.crudapi.data.record.DatabaseRecordsException;
5+
import com.tqdev.crudapi.data.record.ListResponse;
6+
import com.tqdev.crudapi.data.record.Record;
77
import com.tqdev.crudapi.meta.definition.DatabaseDefinitionException;
88

99
import java.io.IOException;
1010

11-
public interface CrudApiService {
11+
public interface DataService {
1212

1313
// crud
1414

‎full/src/main/java/com/tqdev/crudapi/api/ErrorCode.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/ErrorCode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

33
import org.springframework.http.HttpStatus;
44

‎full/src/main/java/com/tqdev/crudapi/api/FilterInfo.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/FilterInfo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

33
import java.util.ArrayList;
44
import java.util.LinkedList;
@@ -7,7 +7,7 @@
77
import org.jooq.Field;
88
import org.jooq.impl.DSL;
99

10-
import com.tqdev.crudapi.api.spatial.SpatialDSL;
10+
import com.tqdev.crudapi.data.spatial.SpatialDSL;
1111
import com.tqdev.crudapi.meta.reflection.ReflectedTable;
1212

1313
public class FilterInfo {

‎full/src/main/java/com/tqdev/crudapi/api/HabtmValues.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/HabtmValues.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

33
import java.util.ArrayList;
44
import java.util.HashMap;

‎full/src/main/java/com/tqdev/crudapi/api/JooqCrudApiService.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/JooqDataService.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

33
import java.io.IOException;
44
import java.util.ArrayList;
@@ -16,16 +16,16 @@
1616
import org.slf4j.Logger;
1717
import org.slf4j.LoggerFactory;
1818

19-
import com.tqdev.crudapi.api.record.DatabaseRecords;
20-
import com.tqdev.crudapi.api.record.DatabaseRecordsException;
21-
import com.tqdev.crudapi.api.record.ListResponse;
22-
import com.tqdev.crudapi.api.record.Record;
23-
import com.tqdev.crudapi.meta.CrudMetaService;
19+
import com.tqdev.crudapi.data.record.DatabaseRecords;
20+
import com.tqdev.crudapi.data.record.DatabaseRecordsException;
21+
import com.tqdev.crudapi.data.record.ListResponse;
22+
import com.tqdev.crudapi.data.record.Record;
23+
import com.tqdev.crudapi.meta.MetaService;
2424
import com.tqdev.crudapi.meta.reflection.ReflectedTable;
2525

26-
public class JooqCrudApiService extends BaseCrudApiService implements CrudApiService {
26+
public class JooqDataService extends BaseDataService implements DataService {
2727

28-
public static final Logger logger = LoggerFactory.getLogger(JooqCrudApiService.class);
28+
public static final Logger logger = LoggerFactory.getLogger(JooqDataService.class);
2929

3030
private DSLContext dsl;
3131

@@ -35,7 +35,7 @@ public class JooqCrudApiService extends BaseCrudApiService implements CrudApiSer
3535
private OrderingInfo ordering;
3636
private PaginationInfo pagination;
3737

38-
public JooqCrudApiService(DSLContext dsl, CrudMetaService meta) {
38+
public JooqDataService(DSLContext dsl, MetaService meta) {
3939
this.dsl = dsl;
4040
tables = meta.getDatabaseReflection();
4141
columns = new ColumnSelector();

‎full/src/main/java/com/tqdev/crudapi/api/OrderingInfo.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/OrderingInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

33
import java.util.ArrayList;
44

‎full/src/main/java/com/tqdev/crudapi/api/PaginationInfo.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/PaginationInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

33
public class PaginationInfo {
44

‎full/src/main/java/com/tqdev/crudapi/api/Params.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/Params.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

33
import org.springframework.util.LinkedMultiValueMap;
44

‎full/src/main/java/com/tqdev/crudapi/api/PathTree.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/PathTree.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

33
import java.util.ArrayList;
44
import java.util.LinkedHashMap;

‎full/src/main/java/com/tqdev/crudapi/api/RelationIncluder.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/RelationIncluder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api;
1+
package com.tqdev.crudapi.data;
22

33
import java.util.ArrayList;
44
import java.util.Arrays;
@@ -12,7 +12,7 @@
1212
import org.jooq.ResultQuery;
1313
import org.jooq.impl.DSL;
1414

15-
import com.tqdev.crudapi.api.record.Record;
15+
import com.tqdev.crudapi.data.record.Record;
1616
import com.tqdev.crudapi.meta.reflection.DatabaseReflection;
1717
import com.tqdev.crudapi.meta.reflection.ReflectedTable;
1818

‎full/src/main/java/com/tqdev/crudapi/api/record/DatabaseRecords.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/record/DatabaseRecords.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api.record;
1+
package com.tqdev.crudapi.data.record;
22

33
import java.io.FileNotFoundException;
44
import java.io.IOException;
@@ -11,7 +11,7 @@
1111
import com.fasterxml.jackson.core.JsonParseException;
1212
import com.fasterxml.jackson.databind.JsonMappingException;
1313
import com.fasterxml.jackson.databind.ObjectMapper;
14-
import com.tqdev.crudapi.api.CrudApiService;
14+
import com.tqdev.crudapi.data.DataService;
1515

1616
public class DatabaseRecords {
1717

@@ -41,7 +41,7 @@ public static DatabaseRecords fromFile(String filename)
4141
return result;
4242
}
4343

44-
public void create(CrudApiService service) throws DatabaseRecordsException {
44+
public void create(DataService service) throws DatabaseRecordsException {
4545
for (String table : tables.keySet()) {
4646
tables.get(table).create(service);
4747
}

‎full/src/main/java/com/tqdev/crudapi/api/record/DatabaseRecordsException.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/record/DatabaseRecordsException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api.record;
1+
package com.tqdev.crudapi.data.record;
22

33
public class DatabaseRecordsException extends Exception {
44

‎full/src/main/java/com/tqdev/crudapi/api/record/ErrorDocument.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/record/ErrorDocument.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.tqdev.crudapi.api.record;
1+
package com.tqdev.crudapi.data.record;
22

3-
import com.tqdev.crudapi.api.ErrorCode;
3+
import com.tqdev.crudapi.data.ErrorCode;
44

55
public class ErrorDocument {
66

‎full/src/main/java/com/tqdev/crudapi/api/record/ListResponse.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/record/ListResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api.record;
1+
package com.tqdev.crudapi.data.record;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
44
import com.fasterxml.jackson.annotation.JsonInclude.Include;

‎full/src/main/java/com/tqdev/crudapi/api/record/Record.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/record/Record.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api.record;
1+
package com.tqdev.crudapi.data.record;
22

33
import java.util.LinkedHashMap;
44
import java.util.Map;

‎full/src/main/java/com/tqdev/crudapi/api/record/TableRecords.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/record/TableRecords.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.tqdev.crudapi.api.record;
1+
package com.tqdev.crudapi.data.record;
22

33
import java.util.ArrayList;
44

5-
import com.tqdev.crudapi.api.CrudApiService;
6-
import com.tqdev.crudapi.api.Params;
5+
import com.tqdev.crudapi.data.DataService;
6+
import com.tqdev.crudapi.data.Params;
77

88
public class TableRecords {
99

@@ -35,7 +35,7 @@ public TableRecords(String name, ArrayList<Record> records) {
3535
this.records = records;
3636
}
3737

38-
public void create(CrudApiService service) throws DatabaseRecordsException {
38+
public void create(DataService service) throws DatabaseRecordsException {
3939
for (Record record : records) {
4040
if (!service.exists(name)) {
4141
throw new DatabaseRecordsException(

‎full/src/main/java/com/tqdev/crudapi/api/spatial/AsText.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/spatial/AsText.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api.spatial;
1+
package com.tqdev.crudapi.data.spatial;
22

33
import org.jooq.Configuration;
44
import org.jooq.Context;

‎full/src/main/java/com/tqdev/crudapi/api/spatial/Contains.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/spatial/Contains.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api.spatial;
1+
package com.tqdev.crudapi.data.spatial;
22

33
import org.jooq.Configuration;
44
import org.jooq.Context;

‎full/src/main/java/com/tqdev/crudapi/api/spatial/Crosses.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/spatial/Crosses.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api.spatial;
1+
package com.tqdev.crudapi.data.spatial;
22

33
import org.jooq.Configuration;
44
import org.jooq.Context;

‎full/src/main/java/com/tqdev/crudapi/api/spatial/Disjoint.java renamed to ‎full/src/main/java/com/tqdev/crudapi/data/spatial/Disjoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tqdev.crudapi.api.spatial;
1+
package com.tqdev.crudapi.data.spatial;
22

33
import org.jooq.Configuration;
44
import org.jooq.Context;

0 commit comments

Comments
 (0)