+ * TODO make DAO an {@link Iterable}. So if we want to select all objects we can + * do like this: + * for(final Object o : daoInstance) { + * ... + * } + * + * + * @author Rogiel + */ +public interface DataAccessObject { + +} diff --git a/src/main/java/com/l2jserver/service/database/DatabaseConfiguration.java b/src/main/java/com/l2jserver/service/database/DatabaseConfiguration.java new file mode 100644 index 000000000..fc941b327 --- /dev/null +++ b/src/main/java/com/l2jserver/service/database/DatabaseConfiguration.java @@ -0,0 +1,9 @@ +package com.l2jserver.service.database; + +import com.l2jserver.service.configuration.Configuration; +import com.l2jserver.service.configuration.Configuration.ConfigurationName; + +@ConfigurationName("database") +public interface DatabaseConfiguration extends Configuration { + +} diff --git a/src/main/java/com/l2jserver/service/database/DatabaseService.java b/src/main/java/com/l2jserver/service/database/DatabaseService.java new file mode 100644 index 000000000..b38f85a4c --- /dev/null +++ b/src/main/java/com/l2jserver/service/database/DatabaseService.java @@ -0,0 +1,7 @@ +package com.l2jserver.service.database; + +import com.l2jserver.service.Service; + +public interface DatabaseService extends Service { + +} diff --git a/src/main/java/com/l2jserver/service/database/MySQLDatabaseConfiguration.java b/src/main/java/com/l2jserver/service/database/MySQLDatabaseConfiguration.java new file mode 100644 index 000000000..2db0539ab --- /dev/null +++ b/src/main/java/com/l2jserver/service/database/MySQLDatabaseConfiguration.java @@ -0,0 +1,55 @@ +package com.l2jserver.service.database; + +public interface MySQLDatabaseConfiguration extends DatabaseConfiguration { + /** + * @return the jdbc url + */ + @ConfigurationPropertyGetter(name = "jdbc.mysql.url", defaultValue = "jdbc:mysql://localhost/l2jserver2") + String getJdbcUrl(); + + /** + * @param jdbcUrl + * the new jdbc url + */ + @ConfigurationPropertySetter(name = "jdbc.mysql.url") + void setJdbcUrl(String jdbcUrl); + + /** + * @return the jdbc driver class + */ + @ConfigurationPropertyGetter(name = "jdbc.mysql.driver", defaultValue = "com.mysql.jdbc.Driver") + String getDriver(); + + /** + * @param driver + * the new jdbc driver + */ + @ConfigurationPropertySetter(name = "jdbc.mysql.driver") + void setDriver(Class driver); + + /** + * @return the mysql database username + */ + @ConfigurationPropertyGetter(name = "jdbc.mysql.username", defaultValue = "l2j") + String getUsername(); + + /** + * @param username + * the mysql database username + */ + @ConfigurationPropertySetter(name = "jdbc.mysql.username") + void setUsername(String username); + + /** + * @return the mysql database password + */ + @ConfigurationPropertyGetter(name = "jdbc.mysql.password", defaultValue = "changeme") + String getPassword(); + + /** + * @param password + * the mysql database password + */ + @ConfigurationPropertySetter(name = "jdbc.mysql.password") + void setPassword(String password); +} diff --git a/src/main/java/com/l2jserver/service/database/MySQLDatabaseService.java b/src/main/java/com/l2jserver/service/database/MySQLDatabaseService.java new file mode 100644 index 000000000..82997b84c --- /dev/null +++ b/src/main/java/com/l2jserver/service/database/MySQLDatabaseService.java @@ -0,0 +1,177 @@ +package com.l2jserver.service.database; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Iterator; +import java.util.List; + +import org.apache.commons.dbcp.ConnectionFactory; +import org.apache.commons.dbcp.DriverManagerConnectionFactory; +import org.apache.commons.dbcp.PoolableConnectionFactory; +import org.apache.commons.dbcp.PoolingDataSource; +import org.apache.commons.pool.ObjectPool; +import org.apache.commons.pool.impl.GenericObjectPool; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.inject.Inject; +import com.l2jserver.service.AbstractService; +import com.l2jserver.service.ServiceStartException; +import com.l2jserver.service.ServiceStopException; +import com.l2jserver.service.configuration.ConfigurationService; +import com.l2jserver.util.ArrayIterator; +import com.l2jserver.util.factory.CollectionFactory; + +public class MySQLDatabaseService extends AbstractService implements + DatabaseService { + private final MySQLDatabaseConfiguration config; + private final Logger logger = LoggerFactory + .getLogger(MySQLDatabaseService.class); + + private ObjectPool connectionPool; + private ConnectionFactory connectionFactory; + @SuppressWarnings("unused") + private PoolableConnectionFactory poolableConnectionFactory; + private PoolingDataSource dataSource; + + @Inject + public MySQLDatabaseService(ConfigurationService configService) { + config = configService.get(MySQLDatabaseConfiguration.class); + } + + @Override + public void start() throws ServiceStartException { + connectionPool = new GenericObjectPool(null); + connectionFactory = new DriverManagerConnectionFactory( + config.getJdbcUrl(), config.getUsername(), config.getPassword()); + poolableConnectionFactory = new PoolableConnectionFactory( + connectionFactory, connectionPool, null, null, false, true); + dataSource = new PoolingDataSource(connectionPool); + } + + public T query(Query query) { + try { + final Connection conn = dataSource.getConnection(); + try { + return query.query(conn); + } catch (SQLException e) { + logger.error("Error executing query", e); + return null; + } finally { + conn.close(); + } + } catch (SQLException e) { + logger.error("Could not open database connection", e); + return null; + } + } + + @Override + public void stop() throws ServiceStopException { + try { + if (connectionPool != null) + connectionPool.close(); + } catch (Exception e) { + logger.error("Error stopping database service", e); + throw new ServiceStopException(e); + } finally { + connectionPool = null; + connectionFactory = null; + poolableConnectionFactory = null; + dataSource = null; + } + } + + public interface Query { + R query(Connection conn) throws SQLException; + } + + public static abstract class InsertUpdateQuery implements Query { + private final Iterator iterator; + + public InsertUpdateQuery(T... objects) { + this(new ArrayIterator(objects)); + } + + public InsertUpdateQuery(Iterator iterator) { + this.iterator = iterator; + } + + @Override + public Integer query(Connection conn) throws SQLException { + int rows = 0; + while (iterator.hasNext()) { + final T object = iterator.next(); + final PreparedStatement st = conn.prepareStatement(query()); + this.parametize(st, object); + rows += st.executeUpdate(); + final Mapper mapper = keyMapper(object); + if (mapper == null) + continue; + final ResultSet rs = st.getGeneratedKeys(); + while (rs.next()) { + mapper.map(rs); + } + } + return rows; + } + + protected abstract String query(); + + protected abstract void parametize(PreparedStatement st, T object) + throws SQLException; + + protected Mapper keyMapper(T object) { + return null; + } + } + + public static abstract class SelectListQuery implements Query> { + @Override + public List query(Connection conn) throws SQLException { + final PreparedStatement st = conn.prepareStatement(query()); + parametize(st); + st.execute(); + final List list = CollectionFactory.newList(null); + final ResultSet rs = st.getResultSet(); + while (rs.next()) { + list.add(mapper().map(rs)); + } + return list; + } + + protected abstract String query(); + + protected void parametize(PreparedStatement st) throws SQLException { + } + + protected abstract Mapper mapper(); + } + + public static abstract class SelectSingleQuery implements Query { + @Override + public T query(Connection conn) throws SQLException { + final PreparedStatement st = conn.prepareStatement(query()); + parametize(st); + st.execute(); + final ResultSet rs = st.getResultSet(); + while (rs.next()) { + return mapper().map(rs); + } + return null; + } + + protected abstract String query(); + + protected abstract void parametize(PreparedStatement st) + throws SQLException; + + protected abstract Mapper mapper(); + } + + public interface Mapper { + T map(ResultSet rs) throws SQLException; + } +} diff --git a/src/main/java/com/l2jserver/service/logging/Log4JLoggingService.java b/src/main/java/com/l2jserver/service/logging/Log4JLoggingService.java new file mode 100644 index 000000000..79ecb2be6 --- /dev/null +++ b/src/main/java/com/l2jserver/service/logging/Log4JLoggingService.java @@ -0,0 +1,14 @@ +package com.l2jserver.service.logging; + +import org.apache.log4j.BasicConfigurator; + +import com.l2jserver.service.AbstractService; +import com.l2jserver.service.ServiceStopException; + +public class Log4JLoggingService extends AbstractService implements + LoggingService { + @Override + public void stop() throws ServiceStopException { + BasicConfigurator.configure(); + } +} diff --git a/src/main/java/com/l2jserver/service/logging/LoggingService.java b/src/main/java/com/l2jserver/service/logging/LoggingService.java new file mode 100644 index 000000000..1cdf2ed7d --- /dev/null +++ b/src/main/java/com/l2jserver/service/logging/LoggingService.java @@ -0,0 +1,13 @@ +package com.l2jserver.service.logging; + +import org.slf4j.Logger; + +import com.l2jserver.service.Service; + +/** + * The logging service is used to get instances of the {@link Logger} class. + * + * @author Rogiel + */ +public interface LoggingService extends Service { +} diff --git a/src/main/java/com/l2jserver/util/ArrayIterator.java b/src/main/java/com/l2jserver/util/ArrayIterator.java new file mode 100644 index 000000000..6d1a36df6 --- /dev/null +++ b/src/main/java/com/l2jserver/util/ArrayIterator.java @@ -0,0 +1,31 @@ +package com.l2jserver.util; + +import java.util.Iterator; +import java.util.NoSuchElementException; + +public class ArrayIterator implements Iterator { + private final T[] objects; + private int i = 0; + + public ArrayIterator(T... objects) { + this.objects = objects; + } + + @Override + public boolean hasNext() { + return i < objects.length; + } + + @Override + public T next() { + try { + return objects[i++]; + } catch (ArrayIndexOutOfBoundsException e) { + throw new NoSuchElementException(); + } + } + + @Override + public void remove() { + } +} diff --git a/src/main/java/com/l2jserver/util/factory/CollectionFactory.java b/src/main/java/com/l2jserver/util/factory/CollectionFactory.java new file mode 100644 index 000000000..8978a563a --- /dev/null +++ b/src/main/java/com/l2jserver/util/factory/CollectionFactory.java @@ -0,0 +1,92 @@ +package com.l2jserver.util.factory; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.Set; +import java.util.WeakHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; + +/** + * Factory class to create {@link Collection} instances. + * + * @author Rogiel + */ +public class CollectionFactory { + /** + * Creates a new list of type T + * + * @param + * the type + * @param type + * the type + * @return the created list + */ + public static final List newList(Class type) { + return new ArrayList(); + } + + /** + * Creates a new set of type T + * + * @param + * the type + * @param type + * the type + * @return the created set + */ + public static final Set newSet(Class type) { + return new HashSet(); + } + + /** + * Creates a new concurrent queue of type T + * + * @param + * the type + * @param type + * the type + * @return the created queue + */ + public static final Queue newConcurrentQueue(Class type) { + return new ConcurrentLinkedQueue(); + } + + /** + * Creates a new map. + * + * @param + * the key type + * @param + * the value type + * @param key + * the key type class + * @param value + * the value type class + * @return the new map + */ + public static final Map newMap(Class key, Class value) { + return new HashMap(); + } + + /** + * Creates a new weak map. + * + * @param + * the key type + * @param + * the value type + * @param key + * the key type class + * @param value + * the value type class + * @return the new map + */ + public static final Map newWeakMap(Class key, Class value) { + return new WeakHashMap(); + } +} diff --git a/src/main/java/com/l2jserver/util/transformer/Transformer.java b/src/main/java/com/l2jserver/util/transformer/Transformer.java new file mode 100644 index 000000000..a6172447d --- /dev/null +++ b/src/main/java/com/l2jserver/util/transformer/Transformer.java @@ -0,0 +1,27 @@ +package com.l2jserver.util.transformer; + +/** + * An transformer can transform an {@link Object} into an {@link String} and the + * {@link String} back to an equivalent object. + * + * @author Rogiel + */ +public interface Transformer { + /** + * Transform the object in a string + * + * @param value + * the object + * @return the string of the object + */ + String transform(T value); + + /** + * Untransforms the string back to an object + * + * @param value + * the string + * @return the object + */ + T untransform(String value); +} diff --git a/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java b/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java new file mode 100644 index 000000000..4660e625e --- /dev/null +++ b/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java @@ -0,0 +1,42 @@ +package com.l2jserver.util.transformer; + +import java.io.File; +import java.net.InetSocketAddress; + +import com.l2jserver.util.transformer.impl.BooleanTransformer; +import com.l2jserver.util.transformer.impl.ByteTransformer; +import com.l2jserver.util.transformer.impl.ClassTransformer; +import com.l2jserver.util.transformer.impl.DoubleTransformer; +import com.l2jserver.util.transformer.impl.FileTransformer; +import com.l2jserver.util.transformer.impl.FloatTransformer; +import com.l2jserver.util.transformer.impl.InetSocketAddressTransformer; +import com.l2jserver.util.transformer.impl.IntegerTransformer; +import com.l2jserver.util.transformer.impl.LongTransformer; +import com.l2jserver.util.transformer.impl.ShortTransformer; + +public class TransformerFactory { + public static final Transformer getTransfromer(Class type) { + if (type == Byte.class || type == Byte.TYPE) { + return ByteTransformer.SHARED_INSTANCE; + } else if (type == Short.class || type == Short.TYPE) { + return ShortTransformer.SHARED_INSTANCE; + } else if (type == Integer.class || type == Integer.TYPE) { + return IntegerTransformer.SHARED_INSTANCE; + } else if (type == Long.class || type == Long.TYPE) { + return LongTransformer.SHARED_INSTANCE; + } else if (type == Float.class || type == Float.TYPE) { + return FloatTransformer.SHARED_INSTANCE; + } else if (type == Double.class || type == Double.TYPE) { + return DoubleTransformer.SHARED_INSTANCE; + } else if (type == Boolean.class || type == Boolean.TYPE) { + return BooleanTransformer.SHARED_INSTANCE; + } else if(type == InetSocketAddress.class) { + return InetSocketAddressTransformer.SHARED_INSTANCE; + } else if(type == File.class) { + return FileTransformer.SHARED_INSTANCE; + }else if(type == Class.class) { + return ClassTransformer.SHARED_INSTANCE; + } + return null; + } +} diff --git a/src/main/java/com/l2jserver/util/transformer/impl/BooleanTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/BooleanTransformer.java new file mode 100644 index 000000000..8c0658345 --- /dev/null +++ b/src/main/java/com/l2jserver/util/transformer/impl/BooleanTransformer.java @@ -0,0 +1,23 @@ +package com.l2jserver.util.transformer.impl; + +import com.l2jserver.util.transformer.Transformer; + +/** + * Transform an {@link Boolean} into an string. + * + * @author Rogiel + */ +public class BooleanTransformer implements Transformer { + public static final BooleanTransformer SHARED_INSTANCE = new BooleanTransformer(); + + @Override + public String transform(Boolean value) { + return (value ? "true" : "false"); + } + + @Override + public Boolean untransform(String value) { + return Boolean.parseBoolean(value); + } + +} diff --git a/src/main/java/com/l2jserver/util/transformer/impl/ByteTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/ByteTransformer.java new file mode 100644 index 000000000..d6d35085e --- /dev/null +++ b/src/main/java/com/l2jserver/util/transformer/impl/ByteTransformer.java @@ -0,0 +1,23 @@ +package com.l2jserver.util.transformer.impl; + +import com.l2jserver.util.transformer.Transformer; + +/** + * Transform an {@link Integer} into an string. + * + * @author Rogiel + */ +public class ByteTransformer implements Transformer { + public static final ByteTransformer SHARED_INSTANCE = new ByteTransformer(); + + @Override + public String transform(Byte value) { + return Double.toString(value); + } + + @Override + public Byte untransform(String value) { + return Byte.decode(value); + } + +} diff --git a/src/main/java/com/l2jserver/util/transformer/impl/ClassTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/ClassTransformer.java new file mode 100644 index 000000000..9bd87315b --- /dev/null +++ b/src/main/java/com/l2jserver/util/transformer/impl/ClassTransformer.java @@ -0,0 +1,27 @@ +package com.l2jserver.util.transformer.impl; + +import com.l2jserver.util.transformer.Transformer; + +/** + * Transform an {@link Class} into an string. + * + * @author Rogiel + */ +public class ClassTransformer implements Transformer> { + public static final ClassTransformer SHARED_INSTANCE = new ClassTransformer(); + + @Override + public String transform(Class value) { + return value.getName(); + } + + @Override + public Class untransform(String value) { + try { + return Class.forName(value); + } catch (ClassNotFoundException e) { + return null; + } + } + +} diff --git a/src/main/java/com/l2jserver/util/transformer/impl/DoubleTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/DoubleTransformer.java new file mode 100644 index 000000000..3bdf2ccc3 --- /dev/null +++ b/src/main/java/com/l2jserver/util/transformer/impl/DoubleTransformer.java @@ -0,0 +1,23 @@ +package com.l2jserver.util.transformer.impl; + +import com.l2jserver.util.transformer.Transformer; + +/** + * Transform an {@link Integer} into an string. + * + * @author Rogiel + */ +public class DoubleTransformer implements Transformer { + public static final DoubleTransformer SHARED_INSTANCE = new DoubleTransformer(); + + @Override + public String transform(Double value) { + return Double.toString(value); + } + + @Override + public Double untransform(String value) { + return Double.parseDouble(value); + } + +} diff --git a/src/main/java/com/l2jserver/util/transformer/impl/FileTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/FileTransformer.java new file mode 100644 index 000000000..3f5c37fa1 --- /dev/null +++ b/src/main/java/com/l2jserver/util/transformer/impl/FileTransformer.java @@ -0,0 +1,27 @@ +package com.l2jserver.util.transformer.impl; + +import java.io.File; + +import com.l2jserver.util.transformer.Transformer; + +/** + * Transform an {@link Integer} into an string. + * + * @author Rogiel + */ +public class FileTransformer implements Transformer { + public static final FileTransformer SHARED_INSTANCE = new FileTransformer(); + + private final File root = new File("./"); + + @Override + public String transform(File value) { + return value.getAbsolutePath(); + } + + @Override + public File untransform(String value) { + return new File(root, value); + } + +} diff --git a/src/main/java/com/l2jserver/util/transformer/impl/FloatTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/FloatTransformer.java new file mode 100644 index 000000000..2505f9066 --- /dev/null +++ b/src/main/java/com/l2jserver/util/transformer/impl/FloatTransformer.java @@ -0,0 +1,23 @@ +package com.l2jserver.util.transformer.impl; + +import com.l2jserver.util.transformer.Transformer; + +/** + * Transform an {@link Integer} into an string. + * + * @author Rogiel + */ +public class FloatTransformer implements Transformer { + public static final FloatTransformer SHARED_INSTANCE = new FloatTransformer(); + + @Override + public String transform(Float value) { + return Double.toString(value); + } + + @Override + public Float untransform(String value) { + return Float.parseFloat(value); + } + +} diff --git a/src/main/java/com/l2jserver/util/transformer/impl/InetSocketAddressTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/InetSocketAddressTransformer.java new file mode 100644 index 000000000..2c25208e6 --- /dev/null +++ b/src/main/java/com/l2jserver/util/transformer/impl/InetSocketAddressTransformer.java @@ -0,0 +1,29 @@ +package com.l2jserver.util.transformer.impl; + +import java.net.InetSocketAddress; + +import com.l2jserver.util.transformer.Transformer; + +/** + * Transform an {@link Integer} into an string. + * + * @author Rogiel + */ +public class InetSocketAddressTransformer implements + Transformer { + public static final InetSocketAddressTransformer SHARED_INSTANCE = new InetSocketAddressTransformer(); + + @Override + public String transform(InetSocketAddress value) { + return value.getHostName() + ":" + value.getPort(); + } + + @Override + public InetSocketAddress untransform(String value) { + final String[] pieces = value.split(":"); + if (pieces.length != 2) + return null; + return new InetSocketAddress(pieces[0], Integer.parseInt(pieces[1])); + } + +} diff --git a/src/main/java/com/l2jserver/util/transformer/impl/IntegerTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/IntegerTransformer.java new file mode 100644 index 000000000..8a795d8f6 --- /dev/null +++ b/src/main/java/com/l2jserver/util/transformer/impl/IntegerTransformer.java @@ -0,0 +1,23 @@ +package com.l2jserver.util.transformer.impl; + +import com.l2jserver.util.transformer.Transformer; + +/** + * Transform an {@link Integer} into an string. + * + * @author Rogiel + */ +public class IntegerTransformer implements Transformer { + public static final IntegerTransformer SHARED_INSTANCE = new IntegerTransformer(); + + @Override + public String transform(Integer value) { + return Integer.toString(value); + } + + @Override + public Integer untransform(String value) { + return Integer.decode(value); + } + +} diff --git a/src/main/java/com/l2jserver/util/transformer/impl/LongTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/LongTransformer.java new file mode 100644 index 000000000..d77f58720 --- /dev/null +++ b/src/main/java/com/l2jserver/util/transformer/impl/LongTransformer.java @@ -0,0 +1,23 @@ +package com.l2jserver.util.transformer.impl; + +import com.l2jserver.util.transformer.Transformer; + +/** + * Transform an {@link Long} into an string. + * + * @author Rogiel + */ +public class LongTransformer implements Transformer { + public static final LongTransformer SHARED_INSTANCE = new LongTransformer(); + + @Override + public String transform(Long value) { + return Long.toString(value); + } + + @Override + public Long untransform(String value) { + return Long.decode(value); + } + +} diff --git a/src/main/java/com/l2jserver/util/transformer/impl/ShortTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/ShortTransformer.java new file mode 100644 index 000000000..c72dac476 --- /dev/null +++ b/src/main/java/com/l2jserver/util/transformer/impl/ShortTransformer.java @@ -0,0 +1,23 @@ +package com.l2jserver.util.transformer.impl; + +import com.l2jserver.util.transformer.Transformer; + +/** + * Transform an {@link Integer} into an string. + * + * @author Rogiel + */ +public class ShortTransformer implements Transformer { + public static final ShortTransformer SHARED_INSTANCE = new ShortTransformer(); + + @Override + public String transform(Short value) { + return Short.toString(value); + } + + @Override + public Short untransform(String value) { + return Short.decode(value); + } + +} diff --git a/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java b/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java index 89bc75b05..e3cf26d76 100644 --- a/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java +++ b/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java @@ -12,7 +12,6 @@ import com.l2jserver.model.id.ID; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.factory.CharacterIDFactory; import com.l2jserver.model.world.L2Character; -import com.l2jserver.service.BasicServiceModule; import com.l2jserver.service.ServiceModule; import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.database.DatabaseService; @@ -21,8 +20,7 @@ import com.l2jserver.service.game.template.TemplateService; public class IDFactoryTest { private final Injector injector = Guice.createInjector(new ServiceModule(), - new BasicServiceModule(), new DAOModuleMySQL5(), - new IDFactoryModule()); + new DAOModuleMySQL5(), new IDFactoryModule()); private final CharacterIDFactory charIdFactory = injector .getInstance(CharacterIDFactory.class); diff --git a/src/test/java/com/l2jserver/model/world/character/CharacterFriendListTest.java b/src/test/java/com/l2jserver/model/world/character/CharacterFriendListTest.java index 31dd63b31..68f8e21b4 100644 --- a/src/test/java/com/l2jserver/model/world/character/CharacterFriendListTest.java +++ b/src/test/java/com/l2jserver/model/world/character/CharacterFriendListTest.java @@ -13,7 +13,6 @@ import com.l2jserver.model.id.factory.IDFactoryModule; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.factory.CharacterIDFactory; import com.l2jserver.model.world.L2Character; -import com.l2jserver.service.BasicServiceModule; import com.l2jserver.service.ServiceModule; import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.database.DatabaseService; @@ -22,8 +21,7 @@ import com.l2jserver.service.game.template.TemplateService; public class CharacterFriendListTest { private final Injector injector = Guice.createInjector(new ServiceModule(), - new BasicServiceModule(), new DAOModuleMySQL5(), - new IDFactoryModule()); + new DAOModuleMySQL5(), new IDFactoryModule()); private final CharacterIDFactory charIdFactory = injector .getInstance(CharacterIDFactory.class); diff --git a/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java b/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java index b40cc555c..4a5963ce8 100644 --- a/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java +++ b/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java @@ -11,15 +11,13 @@ import com.google.inject.Scopes; import com.l2jserver.db.dao.DAOModuleMySQL5; import com.l2jserver.model.id.factory.IDFactoryModule; import com.l2jserver.model.id.template.factory.ItemTemplateIDFactory; -import com.l2jserver.service.BasicServiceModule; import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.game.scripting.ScriptingService; import com.l2jserver.service.game.scripting.ScriptingServiceImpl; public class StaticTemplateServiceTest { private final Injector injector = Guice.createInjector( - new BasicServiceModule(), new IDFactoryModule(), - new DAOModuleMySQL5(), new AbstractModule() { + new IDFactoryModule(), new DAOModuleMySQL5(), new AbstractModule() { @Override protected void configure() { bind(ScriptingService.class).to(ScriptingServiceImpl.class) diff --git a/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java b/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java index 78ffe0df8..dd14d2ae2 100644 --- a/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java +++ b/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java @@ -23,7 +23,6 @@ import com.l2jserver.model.world.item.ItemListener; import com.l2jserver.model.world.player.PlayerEvent; import com.l2jserver.model.world.player.PlayerListener; import com.l2jserver.model.world.player.PlayerSpawnEvent; -import com.l2jserver.service.BasicServiceModule; import com.l2jserver.service.ServiceModule; import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.game.world.WorldService; @@ -40,9 +39,9 @@ public class WorldEventDispatcherImplTest { @Before public void tearUp() throws ServiceStartException { - Injector injector = Guice.createInjector(new BasicServiceModule(), - new ServiceModule(), new DAOModuleMySQL5(), - new IDFactoryModule(), new AbstractModule() { + Injector injector = Guice.createInjector(new ServiceModule(), + new DAOModuleMySQL5(), new IDFactoryModule(), + new AbstractModule() { @Override protected void configure() { bind(WorldService.class).to(WorldServiceImpl.class).in( diff --git a/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java b/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java index f206765c5..e742733f3 100644 --- a/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java +++ b/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java @@ -13,7 +13,6 @@ import com.l2jserver.model.world.Item; import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.WorldObject; import com.l2jserver.model.world.filter.impl.InstanceFilter; -import com.l2jserver.service.BasicServiceModule; import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.game.world.WorldService; import com.l2jserver.service.game.world.WorldServiceImpl; @@ -25,17 +24,15 @@ public class WorldServiceImplTest { @Before public void tearUp() throws ServiceStartException { - Injector injector = Guice.createInjector(new BasicServiceModule(), - new AbstractModule() { - @Override - protected void configure() { - bind(WorldService.class).to(WorldServiceImpl.class).in( - Scopes.SINGLETON); - bind(WorldEventDispatcher.class).to( - WorldEventDispatcherImpl.class).in( - Scopes.SINGLETON); - } - }); + Injector injector = Guice.createInjector(new AbstractModule() { + @Override + protected void configure() { + bind(WorldService.class).to(WorldServiceImpl.class).in( + Scopes.SINGLETON); + bind(WorldEventDispatcher.class).to( + WorldEventDispatcherImpl.class).in(Scopes.SINGLETON); + } + }); world = injector.getInstance(WorldService.class); Assert.assertNotNull(world);
+ * for(final Object o : daoInstance) { + * ... + * } + *