Skip to content

Commit 0a4fb49

Browse files
committed
chore: remove fully qualified names for improved readability (#2624)
(cherry picked from commit c225ddd)
1 parent 912b967 commit 0a4fb49

39 files changed

Lines changed: 378 additions & 291 deletions

File tree

console/src/test/java/com/arcadedb/console/CompositeIndexUpdateTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void testWhereAfterAsyncInsert() {
135135
}
136136
String dateTimePattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS";
137137
GlobalConfiguration.SERVER_DATABASE_DIRECTORY.setValue("./target/databases");
138-
GlobalConfiguration.DATE_TIME_IMPLEMENTATION.setValue(java.time.LocalDateTime.class);
138+
GlobalConfiguration.DATE_TIME_IMPLEMENTATION.setValue(LocalDateTime.class);
139139
GlobalConfiguration.DATE_TIME_FORMAT.setValue(dateTimePattern);
140140
GlobalConfiguration.SERVER_METRICS.setValue(false);
141141
GlobalConfiguration.HA_ENABLED.setValue(false);

console/src/test/java/com/arcadedb/console/ConsoleAsyncInsertTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import com.arcadedb.serializer.json.JSONArray;
3737
import com.arcadedb.serializer.json.JSONObject;
3838
import com.arcadedb.server.ArcadeDBServer;
39+
import com.arcadedb.server.BaseGraphServerTest;
3940
import com.arcadedb.server.TestServerHelper;
4041
import com.arcadedb.server.security.ServerSecurity;
4142
import com.arcadedb.utility.FileUtils;
@@ -64,7 +65,7 @@ public class ConsoleAsyncInsertTest {
6465
static final int PARALLEL_LEVEL = 6;
6566
static final String RECORD_TIME_FORMAT_PATTERN = "yyyyMMdd'_'HHmmss.SSSSSS";
6667
static final String userName = "user";
67-
static final String password = com.arcadedb.server.BaseGraphServerTest.DEFAULT_PASSWORD_FOR_TESTS;
68+
static final String password = BaseGraphServerTest.DEFAULT_PASSWORD_FOR_TESTS;
6869

6970
AtomicInteger autoIncrementOrderId = new AtomicInteger(0);
7071

@@ -174,7 +175,7 @@ public void testBulkAsyncInsertProductsUsingSQL() {
174175
String dateTimePattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS";
175176
GlobalConfiguration.SERVER_METRICS.setValue(false);
176177
GlobalConfiguration.HA_ENABLED.setValue(false);
177-
GlobalConfiguration.DATE_TIME_IMPLEMENTATION.setValue(java.time.LocalDateTime.class);
178+
GlobalConfiguration.DATE_TIME_IMPLEMENTATION.setValue(LocalDateTime.class);
178179
GlobalConfiguration.DATE_TIME_FORMAT.setValue(dateTimePattern);
179180
GlobalConfiguration.ASYNC_WORKER_THREADS.setValue(PARALLEL_LEVEL);
180181

@@ -251,7 +252,7 @@ public void testBulkAsyncInsertProductsUsingAPI() {
251252
String dateTimePattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS";
252253
GlobalConfiguration.SERVER_METRICS.setValue(false);
253254
GlobalConfiguration.HA_ENABLED.setValue(false);
254-
GlobalConfiguration.DATE_TIME_IMPLEMENTATION.setValue(java.time.LocalDateTime.class);
255+
GlobalConfiguration.DATE_TIME_IMPLEMENTATION.setValue(LocalDateTime.class);
255256
GlobalConfiguration.DATE_TIME_FORMAT.setValue(dateTimePattern);
256257
GlobalConfiguration.ASYNC_WORKER_THREADS.setValue(PARALLEL_LEVEL);
257258

@@ -332,7 +333,7 @@ public void testOrderByAfterDeleteInsert() {
332333
}
333334
}
334335
String dateTimePattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS";
335-
GlobalConfiguration.DATE_TIME_IMPLEMENTATION.setValue(java.time.LocalDateTime.class);
336+
GlobalConfiguration.DATE_TIME_IMPLEMENTATION.setValue(LocalDateTime.class);
336337
GlobalConfiguration.DATE_TIME_FORMAT.setValue(dateTimePattern);
337338
GlobalConfiguration.SERVER_METRICS.setValue(false);
338339
GlobalConfiguration.HA_ENABLED.setValue(false);

e2e-perf/src/test/java/com/arcadedb/test/support/TypeIdSupplier.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323

2424
import java.util.Iterator;
2525
import java.util.List;
26+
import java.util.function.Supplier;
2627

27-
public class TypeIdSupplier implements java.util.function.Supplier<Integer> {
28+
public class TypeIdSupplier implements Supplier<Integer> {
2829
/**
2930
* This class is a supplier for user IDs.
3031
* It fetches user IDs from the database in batches.

engine/src/main/java/com/arcadedb/GlobalConfiguration.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import com.arcadedb.utility.SystemVariableResolver;
2929

3030
import java.io.*;
31+
import java.time.LocalDate;
32+
import java.time.LocalDateTime;
3133
import java.util.*;
3234
import java.util.logging.*;
3335

@@ -152,7 +154,7 @@ public Object call(final Object value) {
152154

153155
DATE_IMPLEMENTATION("arcadedb.dateImplementation", SCOPE.DATABASE,
154156
"Default date implementation to use on deserialization. By default java.time.LocalDate is used, but the following are supported: java.util.Date, java.util.Calendar, java.time.LocalDate",
155-
Class.class, java.time.LocalDate.class, value -> {
157+
Class.class, LocalDate.class, value -> {
156158
if (value instanceof String string) {
157159
try {
158160
return Class.forName(string);
@@ -168,7 +170,7 @@ public Object call(final Object value) {
168170

169171
DATE_TIME_IMPLEMENTATION("arcadedb.dateTimeImplementation", SCOPE.DATABASE,
170172
"Default datetime implementation to use on deserialization. By default java.time.LocalDateTime is used, but the following are supported: java.util.Date, java.util.Calendar, java.time.LocalDateTime, java.time.ZonedDateTime",
171-
Class.class, java.time.LocalDateTime.class, value -> {
173+
Class.class, LocalDateTime.class, value -> {
172174
if (value instanceof String string) {
173175
try {
174176
return Class.forName(string);

engine/src/main/java/com/arcadedb/Profiler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.arcadedb.engine.PageManager;
2525
import com.arcadedb.serializer.json.JSONObject;
2626
import com.arcadedb.utility.FileUtils;
27+
import com.sun.management.OperatingSystemMXBean;
2728

2829
import javax.management.MBeanServer;
2930
import javax.management.ObjectName;
@@ -202,7 +203,7 @@ public synchronized JSONObject toJSON() {
202203
json.put("ramOsTotal", new JSONObject().put("space", osTotalMem));
203204

204205
final double cpuLoad = ManagementFactory.getPlatformMXBean(
205-
com.sun.management.OperatingSystemMXBean.class).getCpuLoad();
206+
OperatingSystemMXBean.class).getCpuLoad();
206207
json.put("cpuLoad", new JSONObject().put("perc", cpuLoad * 100));
207208
}
208209

engine/src/main/java/com/arcadedb/engine/PaginatedComponentFile.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import java.nio.*;
2626
import java.nio.channels.*;
2727
import java.nio.channels.spi.*;
28+
import java.nio.file.Files;
29+
import java.nio.file.StandardCopyOption;
2830
import java.util.logging.*;
2931
import java.util.zip.*;
3032

@@ -91,9 +93,9 @@ public void rename(final String newFileName) throws IOException {
9193
newFile = new File(osFile.getParentFile(), newFilePath);
9294
}
9395
try {
94-
java.nio.file.Files.move(osFile.getAbsoluteFile().toPath(),
96+
Files.move(osFile.getAbsoluteFile().toPath(),
9597
newFile.getAbsoluteFile().toPath(),
96-
java.nio.file.StandardCopyOption.ATOMIC_MOVE);
98+
StandardCopyOption.ATOMIC_MOVE);
9799
open(newFile.getAbsolutePath(), mode);
98100
} catch (Exception e) {
99101
open(filePath, mode);

engine/src/main/java/com/arcadedb/engine/TransactionManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ private void checkWALFiles() {
532532
file.setActive(false);
533533
inactiveWALFilePool.add(file);
534534
}
535-
} catch (final java.nio.channels.ClosedChannelException e) {
535+
} catch (final ClosedChannelException e) {
536536
try {
537537
file.close();
538538
} catch (IOException ex) {

engine/src/main/java/com/arcadedb/query/sql/executor/BasicCommandContext.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.arcadedb.database.Database;
2323
import com.arcadedb.database.DatabaseInternal;
2424
import com.arcadedb.database.Document;
25+
import com.arcadedb.exception.CommandSQLParsingException;
2526

2627
import java.util.HashMap;
2728
import java.util.HashSet;
@@ -125,7 +126,7 @@ public Object getVariable(String name, final Object defaultValue) {
125126
if (name.contains(".")) {
126127
final String[] parts = name.split("\\.");
127128
if (parts.length > 2) {
128-
throw new com.arcadedb.exception.CommandSQLParsingException(
129+
throw new CommandSQLParsingException(
129130
"Nested property access is not supported in this context: " + name);
130131
}
131132
name = parts[0];

engine/src/main/java/com/arcadedb/query/sql/executor/CheckClusterTypeStep.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package com.arcadedb.query.sql.executor;
2020

2121
import com.arcadedb.database.Database;
22+
import com.arcadedb.engine.Bucket;
2223
import com.arcadedb.exception.CommandExecutionException;
2324
import com.arcadedb.exception.TimeoutException;
2425
import com.arcadedb.schema.DocumentType;
@@ -51,7 +52,7 @@ public ResultSet syncPull(final CommandContext context, final int nRecords) thro
5152

5253
final Database db = context.getDatabase();
5354

54-
final com.arcadedb.engine.Bucket bucketObj;
55+
final Bucket bucketObj;
5556
if (bucketName != null)
5657
bucketObj = db.getSchema().getBucketByName(bucketName);
5758
else

engine/src/main/java/com/arcadedb/query/sql/executor/MoveVertexExecutionPlanner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public UpdateExecutionPlan createExecutionPlan(final CommandContext ctx) {
5959
}
6060

6161
private void handleTarget(final UpdateExecutionPlan result, final Identifier targetType,
62-
final com.arcadedb.query.sql.parser.Bucket targetBucket,
62+
final Bucket targetBucket,
6363
final CommandContext ctx) {
6464
result.chain(new MoveVertexStep(targetType, targetBucket, ctx));
6565
}

0 commit comments

Comments
 (0)