Skip to content
This repository was archived by the owner on Nov 12, 2025. It is now read-only.

Commit 2ade08d

Browse files
boyterboyter
authored
Merge pull request #257 from gafawork/master
Refactoring and search correction
2 parents b6188ce + ac8c98e commit 2ade08d

30 files changed

+285
-197
lines changed

‎pom.xml‎

Lines changed: 77 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.searchcode.app</groupId>
55
<artifactId>searchcode</artifactId>
@@ -8,14 +8,15 @@
88
<name>searchcode</name>
99
<url>http://maven.apache.org</url>
1010
<properties>
11-
<jdk.version>1.11</jdk.version>
12-
<spark.version>2.7.2</spark.version>
11+
<jdk.version>21</jdk.version>
12+
<spark.version>2.9.4</spark.version>
1313
<spark.freemarker.version>2.0.0</spark.freemarker.version>
1414
<freemarker.version>2.3.23</freemarker.version>
1515
<dbcp.version>2.1.1</dbcp.version>
1616
<jbcrypt.version>0.4</jbcrypt.version>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
19+
<java.io.tmpdir>\tmp\search-code</java.io.tmpdir>
1920
</properties>
2021
<dependencies>
2122
<!-- Spark Java -->
@@ -45,13 +46,13 @@
4546
<dependency>
4647
<groupId>org.xerial</groupId>
4748
<artifactId>sqlite-jdbc</artifactId>
48-
<version>3.8.6</version>
49+
<version>3.41.2.2</version>
4950
</dependency>
5051
<!-- MySQL/Sphinx http://sphinxsearch.com/forum/view.html?id=16178 must be version 5.1.35 -->
5152
<dependency>
52-
<groupId>mysql</groupId>
53-
<artifactId>mysql-connector-java</artifactId>
54-
<version>5.1.35</version>
53+
<groupId>com.mysql</groupId>
54+
<artifactId>mysql-connector-j</artifactId>
55+
<version>9.2.0</version>
5556
</dependency>
5657
<!-- Connection pool -->
5758
<dependency>
@@ -74,31 +75,31 @@
7475
<dependency>
7576
<groupId>com.google.code.gson</groupId>
7677
<artifactId>gson</artifactId>
77-
<version>2.8.0</version>
78+
<version>2.8.9</version>
7879
<scope>compile</scope>
7980
</dependency>
8081
<!-- Guava, generally awesome -->
8182
<dependency>
8283
<groupId>com.google.guava</groupId>
8384
<artifactId>guava</artifactId>
84-
<version>18.0</version>
85+
<version>32.1.3-android</version>
8586
</dependency>
8687
<!-- Quartz Job Scheduler -->
8788
<dependency>
8889
<groupId>org.quartz-scheduler</groupId>
8990
<artifactId>quartz</artifactId>
90-
<version>2.2.2</version>
91+
<version>2.4.0-rc1</version>
9192
</dependency>
9293
<dependency>
9394
<groupId>org.quartz-scheduler</groupId>
9495
<artifactId>quartz-jobs</artifactId>
95-
<version>2.2.3</version>
96+
<version>2.4.0-rc2</version>
9697
</dependency>
9798
<!-- Git Core Library -->
9899
<dependency>
99100
<groupId>org.eclipse.jgit</groupId>
100101
<artifactId>org.eclipse.jgit</artifactId>
101-
<version>4.5.0.201609210915-r</version>
102+
<version>6.6.1.202309021850-r</version>
102103
</dependency>
103104
<!-- String escaping -->
104105
<dependency>
@@ -110,7 +111,7 @@
110111
<dependency>
111112
<groupId>commons-io</groupId>
112113
<artifactId>commons-io</artifactId>
113-
<version>2.4</version>
114+
<version>2.18.0</version>
114115
</dependency>
115116
<!-- Charset guesser -->
116117
<dependency>
@@ -163,74 +164,91 @@
163164
<dependency>
164165
<groupId>junit</groupId>
165166
<artifactId>junit</artifactId>
166-
<version>4.12</version>
167+
<version>4.13.1</version>
167168
<scope>test</scope>
168169
</dependency>
169-
<!-- Mocking framework -->
170+
<!-- Mocking framework
170171
<dependency>
171172
<groupId>org.mockito</groupId>
172173
<artifactId>mockito-all</artifactId>
173174
<version>1.9.5</version>
174175
<scope>test</scope>
175176
</dependency>
177+
-->
178+
<dependency>
179+
<groupId>org.mockito</groupId>
180+
<artifactId>mockito-core</artifactId>
181+
<version>5.17.0</version>
182+
</dependency>
183+
176184
<dependency>
177185
<groupId>org.assertj</groupId>
178186
<artifactId>assertj-core</artifactId>
179187
<version>3.5.2</version>
180188
<scope>test</scope>
181189
</dependency>
190+
191+
192+
<!-- refactory - jar add -->
193+
<dependency>
194+
<groupId>org.apache.httpcomponents.client5</groupId>
195+
<artifactId>httpclient5</artifactId>
196+
<version>5.3.1</version> <!-- Verifique a versão mais recente -->
197+
</dependency>
198+
182199
</dependencies>
183200

184201
<build>
185202
<plugins>
186-
<plugin>
187-
<groupId>org.apache.maven.plugins</groupId>
188-
<artifactId>maven-compiler-plugin</artifactId>
189-
<version>3.8.0</version>
190-
<configuration>
191-
<source>11</source>
192-
<target>11</target>
193-
<release>11</release>
194-
</configuration>
195-
</plugin>
196-
<plugin>
197-
<groupId>org.apache.maven.plugins</groupId>
198-
<artifactId>maven-jar-plugin</artifactId>
199-
<version>2.4</version>
200-
<configuration>
201-
<archive>
202-
<manifest>
203-
<addClasspath>true</addClasspath>
204-
<mainClass>com.searchcode.app.App</mainClass>
205-
<classpathPrefix>dependency-jars/</classpathPrefix>
206-
</manifest>
207-
</archive>
208-
</configuration>
209-
</plugin>
210-
<plugin>
211-
<groupId>org.apache.maven.plugins</groupId>
212-
<artifactId>maven-dependency-plugin</artifactId>
213-
<version>2.5.1</version>
214-
<executions>
215-
<execution>
216-
<id>copy-dependencies</id>
217-
<phase>package</phase>
218-
<goals>
219-
<goal>copy-dependencies</goal>
220-
</goals>
203+
<plugin>
204+
<groupId>org.apache.maven.plugins</groupId>
205+
<artifactId>maven-compiler-plugin</artifactId>
206+
<version>3.8.0</version>
207+
<configuration>
208+
<source>21</source>
209+
<target>21</target>
210+
<release>21</release>
211+
</configuration>
212+
</plugin>
213+
<plugin>
214+
<groupId>org.apache.maven.plugins</groupId>
215+
<artifactId>maven-jar-plugin</artifactId>
216+
<version>2.4</version>
221217
<configuration>
222-
<outputDirectory>
223-
${project.build.directory}/dependency-jars/
224-
</outputDirectory>
218+
<archive>
219+
<manifest>
220+
<addClasspath>true</addClasspath>
221+
<mainClass>com.searchcode.app.App</mainClass>
222+
<classpathPrefix>dependency-jars/</classpathPrefix>
223+
</manifest>
224+
</archive>
225225
</configuration>
226-
</execution>
227-
</executions>
228-
</plugin>
226+
</plugin>
227+
<plugin>
228+
<groupId>org.apache.maven.plugins</groupId>
229+
<artifactId>maven-dependency-plugin</artifactId>
230+
<version>2.5.1</version>
231+
<executions>
232+
<execution>
233+
<id>copy-dependencies</id>
234+
<phase>package</phase>
235+
<goals>
236+
<goal>copy-dependencies</goal>
237+
</goals>
238+
<configuration>
239+
<outputDirectory>
240+
${project.build.directory}/dependency-jars/
241+
</outputDirectory>
242+
</configuration>
243+
</execution>
244+
</executions>
245+
</plugin>
229246
<plugin>
230247
<groupId>org.apache.maven.plugins</groupId>
231248
<artifactId>maven-surefire-plugin</artifactId>
232-
<version>2.19.1</version>
249+
<version>3.5.1</version>
233250
<configuration>
251+
<argLine>-Djava.io.tmpdir=${java.io.tmpdir}</argLine>
234252
<excludes>
235253
<exclude>**/*ITCase.java</exclude>
236254
</excludes>
@@ -243,6 +261,7 @@
243261
</goals>
244262
<phase>integration-test</phase>
245263
<configuration>
264+
<argLine>-Djava.io.tmpdir=${java.io.tmpdir}</argLine>
246265
<excludes>
247266
<exclude>none</exclude>
248267
</excludes>
@@ -266,5 +285,5 @@
266285
</executions>
267286
</plugin>
268287
</plugins>
269-
</build>
288+
</build>
270289
</project>

‎src/main/java/com/searchcode/app/config/MySQLDatabaseConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ public class MySQLDatabaseConfig implements IDatabaseConfig {
2828
private HikariDataSource datasource = null;
2929

3030
public MySQLDatabaseConfig() {
31-
this.helpers = Singleton.getHelpers();
3231
this.logger = Singleton.getLogger();
32+
this.helpers = Singleton.getHelpers();
3333

3434
var config = new HikariConfig();
3535
config.setJdbcUrl((String)Properties.getProperties().getOrDefault("searchcode_connection_string", "jdbc:mysql://localhost:3306/searchcode?serverTimezone=UTC"));

‎src/main/java/com/searchcode/app/config/SphinxSearchConfig.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
package com.searchcode.app.config;
1212

13-
import com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException;
13+
// TODO REMOVE
14+
//import com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException;
1415
import com.searchcode.app.service.Singleton;
1516
import com.searchcode.app.util.Helpers;
1617
import com.searchcode.app.util.LoggerWrapper;
@@ -39,12 +40,13 @@ public class SphinxSearchConfig {
3940
private final LoggerWrapper logger;
4041

4142
public SphinxSearchConfig() {
42-
this.helpers = Singleton.getHelpers();
4343
this.logger = Singleton.getLogger();
44+
this.helpers = Singleton.getHelpers();
4445

4546
this.SPHINX_SERVERS_SHARDS = Properties.getProperties().getProperty(Values.SPHINX_SERVERS_SHARDS, Values.DEFAULT_SPHINX_SERVERS_SHARDS);
4647
}
4748

49+
// TODO VERIFY THROWS sqlexception
4850
public Optional<Connection> getConnection(String server) throws SQLException {
4951
Connection connection = null;
5052

@@ -63,7 +65,7 @@ public Optional<Connection> getConnection(String server) throws SQLException {
6365
}
6466
} catch (ClassNotFoundException ex) {
6567
this.logger.severe(String.format("f9e4283d::error in class %s exception %s it appears searchcode is unable to connect sphinx using mysql connection as the driver is missing", ex.getClass(), ex.getMessage()));
66-
} catch (MySQLSyntaxErrorException ex) {
68+
} catch (SQLException ex) {
6769
this.logger.severe(String.format("2362eb21::error in class %s exception %s it appears searchcode is unable to connect sphinx", ex.getClass(), ex.getMessage()));
6870
}
6971

‎src/main/java/com/searchcode/app/dao/Api.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public Api() {
3838
}
3939

4040
public Api(IDatabaseConfig dbConfig, Helpers helpers, LoggerWrapper logger) {
41+
this.logger = logger;
4142
this.dbConfig = dbConfig;
4243
this.helpers = helpers;
43-
this.logger = logger;
4444
this.createTableIfMissing();
4545
}
4646

‎src/main/java/com/searchcode/app/dao/Data.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public Data() {
3737
}
3838

3939
public Data(IDatabaseConfig dbConfig, Helpers helpers, LoggerWrapper logger) {
40+
this.logger = logger;
4041
this.dbConfig = dbConfig;
4142
this.helpers = helpers;
42-
this.logger = logger;
4343

4444
if (Singleton.getHelpers().isStandaloneInstance()) {
4545
this.createTableIfMissing();

‎src/main/java/com/searchcode/app/dao/LanguageType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public LanguageType() {
3838
}
3939

4040
public LanguageType(IDatabaseConfig dbConfig, Helpers helpers, LoggerWrapper logger, Cache<String, Optional<LanguageTypeDTO>> typeCache) {
41+
this.logger = logger;
4142
this.dbConfig = dbConfig;
4243
this.helpers = helpers;
43-
this.logger = logger;
4444
this.typeCache = typeCache;
4545
}
4646

‎src/main/java/com/searchcode/app/dao/SQLiteRepo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public SQLiteRepo() {
3737
}
3838

3939
public SQLiteRepo(IDatabaseConfig dbConfig, Helpers helpers, LoggerWrapper loggerWrapper) {
40+
this.logger = loggerWrapper;
4041
this.dbConfig = dbConfig;
4142
this.helpers = helpers;
42-
this.logger = loggerWrapper;
4343
this.createTableIfMissing();
4444
}
4545

‎src/main/java/com/searchcode/app/dao/SourceCode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public SourceCode() {
4545
}
4646

4747
public SourceCode(IDatabaseConfig dbConfig, Helpers helpers, LanguageType languageType, LoggerWrapper logger, Cache<String, Optional<SourceCodeDTO>> codeCache) {
48+
this.logger = logger;
4849
this.dbConfig = dbConfig;
4950
this.helpers = helpers;
5051
this.languageType = languageType;
51-
this.logger = logger;
5252
this.codeCache = codeCache;
5353
}
5454

‎src/main/java/com/searchcode/app/jobs/DeleteRepositoryJob.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ public class DeleteRepositoryJob implements Job {
4343
private final Helpers helpers;
4444

4545
public DeleteRepositoryJob() {
46+
this.logger = Singleton.getLogger();
4647
this.dataService = Singleton.getDataService();
4748
this.indexService = Singleton.getIndexService();
4849
this.repo = Singleton.getRepo();
4950
this.helpers = Singleton.getHelpers();
50-
this.logger = Singleton.getLogger();
5151
}
5252

5353
public void execute(JobExecutionContext context) {

‎src/main/java/com/searchcode/app/jobs/enqueue/EnqueueFileRepositoryJob.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ public class EnqueueFileRepositoryJob implements Job {
4242
private final Helpers helpers;
4343

4444
public EnqueueFileRepositoryJob() {
45+
this.logger = Singleton.getLogger();
4546
this.indexService = Singleton.getIndexService();
4647
this.repo = Singleton.getRepo();
47-
this.logger = Singleton.getLogger();
4848
this.helpers = Singleton.getHelpers();
4949
}
5050

0 commit comments

Comments
 (0)