Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-06 07:32:46 +00:00
Code Releases Activity

Updates dependency versions

Browse Source
This commit is contained in:
Rogiel Sulzbach
2011-12-21 11:43:14 -02:00
parent 9f85cffe85
commit 84033a0bb9
10 changed files with 106 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
l2jserver2-common/pom.xml
View File

@@ -23,7 +23,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version> <version>1.6.4</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -59,7 +59,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId> <artifactId>jcl-over-slf4j</artifactId>
<version>1.6.1</version> <version>1.6.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
@@ -76,13 +76,13 @@
<dependency> <dependency>
<groupId>com.orientechnologies</groupId> <groupId>com.orientechnologies</groupId>
<artifactId>orientdb-core</artifactId> <artifactId>orientdb-core</artifactId>
<version>1.0rc5</version> <version>1.0rc7</version>
</dependency> </dependency>
<!-- cache --> <!-- cache -->
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId> <artifactId>ehcache-core</artifactId>
<version>2.4.2</version> <version>2.5.0</version>
</dependency> </dependency>
<!-- utils --> <!-- utils -->
<dependency> <dependency>
@@ -93,17 +93,17 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>10.0.1</version> <version>11.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.0.1</version> <version>2.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-pool</groupId> <groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId> <artifactId>commons-pool</artifactId>
<version>1.5.6</version> <version>1.5.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>

10
l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java
View File

@@ -46,7 +46,7 @@ import com.l2jserver.util.ArrayIterator;
import com.l2jserver.util.factory.CollectionFactory; import com.l2jserver.util.factory.CollectionFactory;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery; import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery;
import com.orientechnologies.orient.core.query.nativ.OQueryContextNativeSchema; import com.orientechnologies.orient.core.query.nativ.OQueryContextNative;
import com.orientechnologies.orient.core.record.impl.ODocument; import com.orientechnologies.orient.core.record.impl.ODocument;
/** /**
@@ -392,7 +392,7 @@ public abstract class AbstractOrientDatabaseService extends AbstractService
int rows = 0; int rows = 0;
while (iterator.hasNext()) { while (iterator.hasNext()) {
final T object = iterator.next(); final T object = iterator.next();
final ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> query = createQuery( final ONativeSynchQuery<OQueryContextNative> query = createQuery(
database, object); database, object);
final ODocument document; final ODocument document;
if (query != null) { if (query != null) {
@@ -423,7 +423,7 @@ public abstract class AbstractOrientDatabaseService extends AbstractService
* @return the <b>prepared</b> query. If <tt>null</tt> is returned a * @return the <b>prepared</b> query. If <tt>null</tt> is returned a
* insert query will be performed. * insert query will be performed.
*/ */
protected abstract ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected abstract ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database, T object); ODatabaseDocumentTx database, T object);
/** /**
@@ -515,7 +515,7 @@ public abstract class AbstractOrientDatabaseService extends AbstractService
* *
* @return the <b>prepared</b> query * @return the <b>prepared</b> query
*/ */
protected abstract ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected abstract ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database); ODatabaseDocumentTx database);
/** /**
@@ -578,7 +578,7 @@ public abstract class AbstractOrientDatabaseService extends AbstractService
* *
* @return the <b>prepared</b> query * @return the <b>prepared</b> query
*/ */
protected abstract ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected abstract ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database); ODatabaseDocumentTx database);
/** /**

16
l2jserver2-gameserver/pom.xml
View File

@@ -42,7 +42,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.8.2</version> <version>4.10</version>
<type>jar</type> <type>jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@@ -51,14 +51,14 @@
<dependency> <dependency>
<groupId>org.jboss.netty</groupId> <groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
<version>3.2.4.Final</version> <version>3.2.7.Final</version>
</dependency> </dependency>
<!-- google guice --> <!-- google guice -->
<!-- logging --> <!-- logging -->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version> <version>1.6.4</version>
<type>jar</type> <type>jar</type>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
@@ -66,34 +66,34 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.16</version> <version>5.1.18</version>
<type>jar</type> <type>jar</type>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>1.3.155</version> <version>1.3.162</version>
<type>jar</type> <type>jar</type>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<version>10.8.1.2</version> <version>10.8.2.2</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orientechnologies</groupId> <groupId>com.orientechnologies</groupId>
<artifactId>orientdb-core</artifactId> <artifactId>orientdb-core</artifactId>
<version>1.0rc5</version> <version>1.0rc7</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<!-- cache --> <!-- cache -->
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId> <artifactId>ehcache-core</artifactId>
<version>2.4.2</version> <version>2.5.0</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<!-- html parser/generator --> <!-- html parser/generator -->

69
l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterDAO.java
View File

@@ -50,7 +50,7 @@ import com.l2jserver.service.database.DatabaseService;
import com.l2jserver.util.geometry.Point3D; import com.l2jserver.util.geometry.Point3D;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery; import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery;
import com.orientechnologies.orient.core.query.nativ.OQueryContextNativeSchema; import com.orientechnologies.orient.core.query.nativ.OQueryContextNative;
import com.orientechnologies.orient.core.record.impl.ODocument; import com.orientechnologies.orient.core.record.impl.ODocument;
/** /**
@@ -200,18 +200,16 @@ public class OrientDBCharacterDAO extends
public L2Character select(final CharacterID id) { public L2Character select(final CharacterID id) {
return database.query(new SelectSingleQuery<L2Character>() { return database.query(new SelectSingleQuery<L2Character>() {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database) { ODatabaseDocumentTx database) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return criteria.field(CHAR_ID).eq(id.getID()).go(); return criteria.field(CHAR_ID).eq(id.getID()).go();
}; }
}; };
} }
@@ -226,16 +224,14 @@ public class OrientDBCharacterDAO extends
public Collection<CharacterID> selectIDs() { public Collection<CharacterID> selectIDs() {
return database.query(new SelectListQuery<CharacterID>() { return database.query(new SelectListQuery<CharacterID>() {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database) { ODatabaseDocumentTx database) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return true; return true;
}; };
}; };
@@ -252,7 +248,7 @@ public class OrientDBCharacterDAO extends
public int insertObjects(L2Character... objects) { public int insertObjects(L2Character... objects) {
return database.query(new InsertUpdateQuery<L2Character>(objects) { return database.query(new InsertUpdateQuery<L2Character>(objects) {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database, L2Character object) { ODatabaseDocumentTx database, L2Character object) {
return null; return null;
} }
@@ -309,16 +305,14 @@ public class OrientDBCharacterDAO extends
public int updateObjects(final L2Character... characters) { public int updateObjects(final L2Character... characters) {
return database.query(new InsertUpdateQuery<L2Character>(characters) { return database.query(new InsertUpdateQuery<L2Character>(characters) {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database, final L2Character character) { ODatabaseDocumentTx database, final L2Character character) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return criteria.field(CHAR_ID) return criteria.field(CHAR_ID)
.eq(character.getID().getID()).go(); .eq(character.getID().getID()).go();
}; };
@@ -376,16 +370,14 @@ public class OrientDBCharacterDAO extends
public int deleteObjects(L2Character... objects) { public int deleteObjects(L2Character... objects) {
return database.query(new InsertUpdateQuery<L2Character>(objects) { return database.query(new InsertUpdateQuery<L2Character>(objects) {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database, final L2Character character) { ODatabaseDocumentTx database, final L2Character character) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return criteria.field(CHAR_ID) return criteria.field(CHAR_ID)
.eq(character.getID().getID()).go(); .eq(character.getID().getID()).go();
}; };
@@ -416,16 +408,14 @@ public class OrientDBCharacterDAO extends
public L2Character selectByName(final String name) { public L2Character selectByName(final String name) {
return database.query(new SelectSingleQuery<L2Character>() { return database.query(new SelectSingleQuery<L2Character>() {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database) { ODatabaseDocumentTx database) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return criteria.field(NAME).eq(name).go(); return criteria.field(NAME).eq(name).go();
}; };
}; };
@@ -442,17 +432,16 @@ public class OrientDBCharacterDAO extends
public List<L2Character> selectByAccount(final AccountID account) { public List<L2Character> selectByAccount(final AccountID account) {
return database.query(new SelectListQuery<L2Character>() { return database.query(new SelectListQuery<L2Character>() {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database) { ODatabaseDocumentTx database) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) { return criteria.field(ACCOUNT_ID).eq(account.getID())
return criteria.field(ACCOUNT_ID).eq(account.getID()).go(); .go();
}; };
}; };
} }

44
l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterFriendDAO.java
View File

@@ -38,7 +38,7 @@ import com.l2jserver.service.database.DatabaseService;
import com.l2jserver.service.database.jdbc.JDBCCharacterDAO; import com.l2jserver.service.database.jdbc.JDBCCharacterDAO;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery; import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery;
import com.orientechnologies.orient.core.query.nativ.OQueryContextNativeSchema; import com.orientechnologies.orient.core.query.nativ.OQueryContextNative;
import com.orientechnologies.orient.core.record.impl.ODocument; import com.orientechnologies.orient.core.record.impl.ODocument;
/** /**
@@ -115,16 +115,14 @@ public class OrientDBCharacterFriendDAO extends
public CharacterFriend select(final FriendID id) { public CharacterFriend select(final FriendID id) {
return database.query(new SelectSingleQuery<CharacterFriend>() { return database.query(new SelectSingleQuery<CharacterFriend>() {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database) { ODatabaseDocumentTx database) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return criteria.field(CHAR_ID).eq(id.getID1().getID()) return criteria.field(CHAR_ID).eq(id.getID1().getID())
.field(CHAR_ID_FRIEND).eq(id.getID2().getID()) .field(CHAR_ID_FRIEND).eq(id.getID2().getID())
.go(); .go();
@@ -144,16 +142,14 @@ public class OrientDBCharacterFriendDAO extends
final List<CharacterFriend> list = database final List<CharacterFriend> list = database
.query(new SelectListQuery<CharacterFriend>() { .query(new SelectListQuery<CharacterFriend>() {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database) { ODatabaseDocumentTx database) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(
database, CLASS_NAME, database, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return criteria.field(CHAR_ID) return criteria.field(CHAR_ID)
.eq(character.getID().getID()).go(); .eq(character.getID().getID()).go();
}; };
@@ -172,16 +168,14 @@ public class OrientDBCharacterFriendDAO extends
public List<FriendID> selectIDs() { public List<FriendID> selectIDs() {
return database.query(new SelectListQuery<FriendID>() { return database.query(new SelectListQuery<FriendID>() {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database) { ODatabaseDocumentTx database) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return true; return true;
}; };
}; };
@@ -198,7 +192,7 @@ public class OrientDBCharacterFriendDAO extends
public int insertObjects(CharacterFriend... friends) { public int insertObjects(CharacterFriend... friends) {
return database.query(new InsertUpdateQuery<CharacterFriend>(friends) { return database.query(new InsertUpdateQuery<CharacterFriend>(friends) {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database, CharacterFriend object) { ODatabaseDocumentTx database, CharacterFriend object) {
return null; return null;
} }
@@ -230,16 +224,14 @@ public class OrientDBCharacterFriendDAO extends
public int deleteObjects(CharacterFriend... friends) { public int deleteObjects(CharacterFriend... friends) {
return database.query(new InsertUpdateQuery<CharacterFriend>(friends) { return database.query(new InsertUpdateQuery<CharacterFriend>(friends) {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database, final CharacterFriend friend) { ODatabaseDocumentTx database, final CharacterFriend friend) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return criteria.field(CHAR_ID) return criteria.field(CHAR_ID)
.eq(friend.getCharacterID().getID()).and() .eq(friend.getCharacterID().getID()).and()
.field(CHAR_ID_FRIEND) .field(CHAR_ID_FRIEND)

34
l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBChatMessageDAO.java
View File

@@ -38,7 +38,7 @@ import com.l2jserver.service.database.DatabaseService;
import com.l2jserver.service.game.chat.ChatMessageType; import com.l2jserver.service.game.chat.ChatMessageType;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery; import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery;
import com.orientechnologies.orient.core.query.nativ.OQueryContextNativeSchema; import com.orientechnologies.orient.core.query.nativ.OQueryContextNative;
import com.orientechnologies.orient.core.record.impl.ODocument; import com.orientechnologies.orient.core.record.impl.ODocument;
/** /**
@@ -132,16 +132,14 @@ public class OrientDBChatMessageDAO extends
public ChatMessage select(final ChatMessageID id) { public ChatMessage select(final ChatMessageID id) {
return database.query(new SelectSingleQuery<ChatMessage>() { return database.query(new SelectSingleQuery<ChatMessage>() {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database) { ODatabaseDocumentTx database) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return criteria.field(MESSAGE_ID).eq(id.getID()).go(); return criteria.field(MESSAGE_ID).eq(id.getID()).go();
}; };
}; };
@@ -158,16 +156,14 @@ public class OrientDBChatMessageDAO extends
public List<ChatMessageID> selectIDs() { public List<ChatMessageID> selectIDs() {
return database.query(new SelectListQuery<ChatMessageID>() { return database.query(new SelectListQuery<ChatMessageID>() {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database) { ODatabaseDocumentTx database) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return true; return true;
}; };
}; };
@@ -184,7 +180,7 @@ public class OrientDBChatMessageDAO extends
public int insertObjects(ChatMessage... messages) { public int insertObjects(ChatMessage... messages) {
return database.query(new InsertUpdateQuery<ChatMessage>(messages) { return database.query(new InsertUpdateQuery<ChatMessage>(messages) {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database, ChatMessage object) { ODatabaseDocumentTx database, ChatMessage object) {
return null; return null;
} }
@@ -226,16 +222,14 @@ public class OrientDBChatMessageDAO extends
public int deleteObjects(ChatMessage... messages) { public int deleteObjects(ChatMessage... messages) {
return database.query(new InsertUpdateQuery<ChatMessage>(messages) { return database.query(new InsertUpdateQuery<ChatMessage>(messages) {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database, final ChatMessage message) { ODatabaseDocumentTx database, final ChatMessage message) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return criteria.field(MESSAGE_ID).eq(message.getID()) return criteria.field(MESSAGE_ID).eq(message.getID())
.and().go(); .and().go();
}; };

34
l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBClanDAO.java
View File

@@ -37,7 +37,7 @@ import com.l2jserver.service.database.AbstractOrientDatabaseService.SelectSingle
import com.l2jserver.service.database.DatabaseService; import com.l2jserver.service.database.DatabaseService;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery; import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery;
import com.orientechnologies.orient.core.query.nativ.OQueryContextNativeSchema; import com.orientechnologies.orient.core.query.nativ.OQueryContextNative;
import com.orientechnologies.orient.core.record.impl.ODocument; import com.orientechnologies.orient.core.record.impl.ODocument;
/** /**
@@ -111,16 +111,14 @@ public class OrientDBClanDAO extends AbstractOrientDBDAO<Clan, ClanID>
public Clan select(final ClanID id) { public Clan select(final ClanID id) {
return database.query(new SelectSingleQuery<Clan>() { return database.query(new SelectSingleQuery<Clan>() {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database) { ODatabaseDocumentTx database) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return criteria.field(CLAN_ID).eq(id.getID()).go(); return criteria.field(CLAN_ID).eq(id.getID()).go();
}; };
}; };
@@ -137,16 +135,14 @@ public class OrientDBClanDAO extends AbstractOrientDBDAO<Clan, ClanID>
public List<ClanID> selectIDs() { public List<ClanID> selectIDs() {
return database.query(new SelectListQuery<ClanID>() { return database.query(new SelectListQuery<ClanID>() {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database) { ODatabaseDocumentTx database) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return true; return true;
}; };
}; };
@@ -163,7 +159,7 @@ public class OrientDBClanDAO extends AbstractOrientDBDAO<Clan, ClanID>
public int insertObjects(Clan... clans) { public int insertObjects(Clan... clans) {
return database.query(new InsertUpdateQuery<Clan>(clans) { return database.query(new InsertUpdateQuery<Clan>(clans) {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database, Clan object) { ODatabaseDocumentTx database, Clan object) {
return null; return null;
} }
@@ -194,16 +190,14 @@ public class OrientDBClanDAO extends AbstractOrientDBDAO<Clan, ClanID>
public int deleteObjects(Clan... clans) { public int deleteObjects(Clan... clans) {
return database.query(new InsertUpdateQuery<Clan>(clans) { return database.query(new InsertUpdateQuery<Clan>(clans) {
@Override @Override
protected ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery( protected ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database, final Clan clan) { ODatabaseDocumentTx database, final Clan clan) {
return new ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>>( return new ONativeSynchQuery<OQueryContextNative>(database,
database, CLASS_NAME, CLASS_NAME, new OQueryContextNative()) {
new OQueryContextNativeSchema<ODocument>()) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public boolean filter( public boolean filter(OQueryContextNative criteria) {
OQueryContextNativeSchema<ODocument> criteria) {
return criteria.field(CLAN_ID).eq(clan.getID()).go(); return criteria.field(CLAN_ID).eq(clan.getID()).go();
}; };
}; };

8
l2jserver2-loginserver/pom.xml
View File

@@ -22,26 +22,26 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.8.2</version> <version>4.10</version>
<type>jar</type> <type>jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.netty</groupId> <groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
<version>3.2.4.Final</version> <version>3.2.7.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version> <version>1.6.4</version>
<type>jar</type> <type>jar</type>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.16</version> <version>5.1.18</version>
<type>jar</type> <type>jar</type>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>

6
l2jserver2-loginserver/src/main/java/com/l2jserver/ls/net/LoginServerChannelPipelineFactory.java
View File

@@ -6,8 +6,6 @@ import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder; import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
import org.jboss.netty.handler.codec.frame.LengthFieldPrepender; import org.jboss.netty.handler.codec.frame.LengthFieldPrepender;
import org.jboss.netty.handler.codec.serialization.ObjectDecoder;
import org.jboss.netty.handler.codec.serialization.ObjectEncoder;
import com.l2jserver.service.gameserver.GameServerNetworkService; import com.l2jserver.service.gameserver.GameServerNetworkService;
@@ -30,8 +28,8 @@ public class LoginServerChannelPipelineFactory implements
pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder( pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(
1048576, 0, 4, 0, 4)); 1048576, 0, 4, 0, 4));
pipeline.addLast("encoder", new ObjectEncoder()); // pipeline.addLast("encoder", new ObjectEncoder());
pipeline.addLast("decoder", new ObjectDecoder()); // pipeline.addLast("decoder", new ObjectDecoder());
return null; return null;
} }

2
pom.xml
View File

@@ -199,7 +199,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.8.2</version> <version>4.10</version>
<type>jar</type> <type>jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>