Skip to content

Commit 0558367

Browse files
Kud8Kud8
committed
CheckStyle fixes
1 parent f9b9aea commit 0558367

17 files changed

Lines changed: 98 additions & 66 deletions

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<artifactId>exec-maven-plugin</artifactId>
2929
<version>1.4.0</version>
3030
<configuration>
31-
<mainClass>arhangel.dim.core.jdbc.DBOrganizer</mainClass>
31+
<mainClass>arhangel.dim.core.jdbc.DataBaseOrganizer</mainClass>
3232
</configuration>
3333
</plugin>
3434
<plugin>

‎src/main/java/arhangel/dim/client/ClientMain.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void init() {
6363
public void handleUserCommands() throws Exception {
6464
BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
6565
String line;
66-
while(true) {
66+
while (true) {
6767
line = reader.readLine();
6868
Message writeMessage;
6969
if (line.startsWith("/")) {
@@ -87,6 +87,7 @@ public void stopThreads() {
8787
try {
8888
listenThread.interrupt();
8989
writeThread.interrupt();
90+
// join
9091
} catch (Exception e) {
9192
System.err.println("Failed to stop threads " + e.toString());
9293
} finally {

‎src/main/java/arhangel/dim/client/MessageListener.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ public void handleAnswer(AnswerMessage answer) throws Exception {
5858
case CHAT:
5959
System.out.println(message);
6060
break;
61+
default:
62+
break;
6163
}
6264
}
6365
}

‎src/main/java/arhangel/dim/core/authorization/Authorize.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import arhangel.dim.core.session.Session;
88
import arhangel.dim.core.store.UserStore;
99

10-
import java.io.*;
10+
import java.io.DataOutputStream;
1111
import java.util.List;
1212

1313
/**

‎src/main/java/arhangel/dim/core/commands/ChatListCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public void run(String[] args, Session session) throws Exception {
3636
builder.append(userIdIt);
3737
builder.append(", ");
3838
}
39-
builder.deleteCharAt(builder.length()-1);
39+
builder.deleteCharAt(builder.length() - 1);
4040
builder.append("\n");
4141
}
42-
builder.deleteCharAt(builder.length()-1);
42+
builder.deleteCharAt(builder.length() - 1);
4343
message = builder.toString();
4444
}
4545
writer.write(protocol.encode(new AnswerMessage(message, success)));

‎src/main/java/arhangel/dim/core/commands/TextCommand.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package arhangel.dim.core.commands;
22

3-
import arhangel.dim.core.message.*;
3+
import arhangel.dim.core.message.AnswerMessage;
4+
import arhangel.dim.core.message.Chat;
5+
import arhangel.dim.core.message.Protocol;
6+
import arhangel.dim.core.message.SerializationProtocol;
47
import arhangel.dim.core.store.ChatStore;
58
import arhangel.dim.core.store.DataStore;
69
import arhangel.dim.core.session.Session;
@@ -55,8 +58,8 @@ public void run(String[] args, Session session) throws Exception {
5558
chat.addMessage(authorId, authorName, messageFromUser);
5659
SessionManager manager = session.getSessionManager();
5760
for (Integer id : participants) {
58-
Session destinationSession = manager.getSessionById(id);
5961
success = AnswerMessage.Value.CHAT;
62+
Session destinationSession = manager.getSessionById(id);
6063
AnswerMessage answer = new AnswerMessage(messageFromUser, success);
6164
answer.setMessage(String.format("Chat %d, from %d: %s", chatId, authorId, messageFromUser));
6265
answer.setId(authorId);

src/main/java/arhangel/dim/core/jdbc/DBOrganizer.java renamed to src/main/java/arhangel/dim/core/jdbc/DataBaseOrganizer.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
/**
88
* Организация базы данных перед запуском(Создание таблиц).
99
*/
10-
public class DBOrganizer {
11-
public static void reorganizeDB(String[] args) throws Exception {
10+
public class DataBaseOrganizer {
11+
public static void reorganizeDataBase(String[] args) throws Exception {
1212
Class.forName("org.postgresql.Driver");
13-
Connection c = DriverManager.getConnection("jdbc:postgresql://178.62.140.149:5432/Kud8", "trackuser", "trackuser");
13+
Connection conn = DriverManager.getConnection("jdbc:postgresql://178.62.140.149:5432/Kud8",
14+
"trackuser", "trackuser");
1415
Statement stmt;
1516
String sql;
1617

17-
stmt = c.createStatement();
18+
stmt = conn.createStatement();
1819
sql = "CREATE TABLE IF NOT EXISTS users " +
1920
"(ID SERIAL PRIMARY KEY," +
2021
" LOGIN TEXT NOT NULL," +
@@ -23,14 +24,14 @@ public static void reorganizeDB(String[] args) throws Exception {
2324
stmt.executeUpdate(sql);
2425
stmt.close();
2526

26-
stmt = c.createStatement();
27+
stmt = conn.createStatement();
2728
sql = "CREATE TABLE IF NOT EXISTS chats " +
2829
"(ID SERIAL PRIMARY KEY," +
2930
" TEMP TEXT NOT NULL)";
3031
stmt.executeUpdate(sql);
3132
stmt.close();
3233

33-
stmt = c.createStatement();
34+
stmt = conn.createStatement();
3435
sql = "CREATE TABLE IF NOT EXISTS message " +
3536
"(ID SERIAL PRIMARY KEY," +
3637
" AUTHOR_ID INT NOT NULL," +
@@ -39,14 +40,14 @@ public static void reorganizeDB(String[] args) throws Exception {
3940
stmt.executeUpdate(sql);
4041
stmt.close();
4142

42-
stmt = c.createStatement();
43+
stmt = conn.createStatement();
4344
sql = "CREATE TABLE IF NOT EXISTS userschat " +
4445
"(ID SERIAL PRIMARY KEY," +
4546
" USER_ID INT NOT NULL," +
4647
" CHAT_ID INT NOT NULL)";
4748
stmt.executeUpdate(sql);
4849
stmt.close();
4950

50-
c.close();
51+
conn.close();
5152
}
5253
}

‎src/main/java/arhangel/dim/core/jdbc/QueryExecutor.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ public class QueryExecutor {
2020
/**
2121
* Словарь подготовленных запросов, с Generated Keys
2222
*/
23-
private Map<String, PreparedStatement> preparedStatementMapGK;
23+
private Map<String, PreparedStatement> preparedStatementMapGenKey;
2424

2525
public QueryExecutor() {
2626
preparedStatementMap = new HashMap<>();
27-
preparedStatementMapGK = new HashMap<>();
27+
preparedStatementMapGenKey = new HashMap<>();
2828
}
2929

3030
public void prepareStatement(Connection connection, String query) throws SQLException {
@@ -34,8 +34,8 @@ public void prepareStatement(Connection connection, String query) throws SQLExce
3434
}
3535

3636
public void prepareStatementGeneratedKeys(Connection connection, String query) throws SQLException {
37-
if (preparedStatementMapGK.get(query) == null) {
38-
preparedStatementMapGK.put(query, connection.prepareStatement(query,
37+
if (preparedStatementMapGenKey.get(query) == null) {
38+
preparedStatementMapGenKey.put(query, connection.prepareStatement(query,
3939
PreparedStatement.RETURN_GENERATED_KEYS));
4040
}
4141
}
@@ -77,7 +77,7 @@ public void execUpdate(String sql, Map<Integer, Object> args) throws SQLExceptio
7777
}
7878

7979
public <T> T execUpdate(String sql, Map<Integer, Object> args, ResultHandler<T> handler) throws SQLException {
80-
PreparedStatement pstmt = preparedStatementMapGK.get(sql);
80+
PreparedStatement pstmt = preparedStatementMapGenKey.get(sql);
8181
if (pstmt == null) {
8282
throw new SQLException(String.format("Statement \"%s\" wasn't prepared", sql));
8383
}
@@ -95,7 +95,7 @@ public void close() throws SQLException {
9595
for (Map.Entry<String, PreparedStatement> pair : preparedStatementMap.entrySet()) {
9696
pair.getValue().close();
9797
}
98-
for (Map.Entry<String, PreparedStatement> pair : preparedStatementMapGK.entrySet()) {
98+
for (Map.Entry<String, PreparedStatement> pair : preparedStatementMapGenKey.entrySet()) {
9999
pair.getValue().close();
100100
}
101101
}

‎src/main/java/arhangel/dim/core/message/Chat.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package arhangel.dim.core.message;
22

3-
import arhangel.dim.core.store.DBMessageStore;
3+
import arhangel.dim.core.store.DataBaseMessageStore;
44
import arhangel.dim.core.store.MessageStore;
55

66
import java.sql.Connection;
@@ -19,14 +19,14 @@ public Chat(Integer id, Connection conn) {
1919
this.id = id;
2020
this.participantIds = new ArrayList<>();
2121
this.connection = conn;
22-
this.messageStore = new DBMessageStore(connection, this);
22+
this.messageStore = new DataBaseMessageStore(connection, this);
2323
}
2424

2525
public Chat(List<Integer> participantIds, Integer id, Connection conn) {
2626
this.id = id;
2727
this.participantIds = participantIds;
2828
this.connection = conn;
29-
this.messageStore = new DBMessageStore(conn, this);
29+
this.messageStore = new DataBaseMessageStore(conn, this);
3030
}
3131

3232
public boolean addParticipant(int id) {

‎src/main/java/arhangel/dim/core/message/SerializationProtocol.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package arhangel.dim.core.message;
22

3-
import java.io.*;
3+
import java.io.ByteArrayOutputStream;
4+
import java.io.IOException;
5+
import java.io.ObjectOutput;
6+
import java.io.ObjectOutputStream;
7+
import java.io.ByteArrayInputStream;
8+
import java.io.ObjectInputStream;
9+
import java.io.ObjectInput;
410
import java.nio.ByteBuffer;
511

612
public class SerializationProtocol<T> implements Protocol<T> {

0 commit comments

Comments
 (0)