Skip to content

Removed compile time dependency on log4j #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
v3rm0n wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removed compile time dependency on log4j #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7da30a7
Removed compile time dependency on log4j
v3rm0n Oct 30, 2018
5e85b33
Version bump
v3rm0n Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mina.version>2.0.16</mina.version>
<log4j.version>2.7</log4j.version>
<slf4j.version>1.7.25</slf4j.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -83,8 +84,14 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -132,7 +139,13 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -201,7 +214,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>3.0.1</version>
<executions>
<execution>
<id>javadoc-jar</id>
Expand Down
26 changes: 12 additions & 14 deletions src/main/java/com/github/kmbulebu/dsc/it100/IT100.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
package com.github.kmbulebu.dsc.it100;

import java.net.SocketAddress;

import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.github.kmbulebu.dsc.it100.commands.read.ReadCommand;
import com.github.kmbulebu.dsc.it100.commands.write.WriteCommand;
import com.github.kmbulebu.dsc.it100.mina.codec.IT100CodecFactory;
import com.github.kmbulebu.dsc.it100.mina.filters.CommandLogFilter;
import com.github.kmbulebu.dsc.it100.mina.filters.PollKeepAliveFilter;
import com.github.kmbulebu.dsc.it100.mina.filters.StatusRequestFilter;
import com.github.kmbulebu.dsc.it100.rxjava.ReadCommandOnSubscribe;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoConnector;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.keepalive.KeepAliveRequestTimeoutHandler;
import org.apache.mina.handler.demux.DemuxingIoHandler;
import org.apache.mina.handler.demux.MessageHandler;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
import rx.Observable;
import rx.Observer;
import rx.observables.ConnectableObservable;
import rx.subjects.PublishSubject;

import com.github.kmbulebu.dsc.it100.commands.read.ReadCommand;
import com.github.kmbulebu.dsc.it100.commands.write.WriteCommand;
import com.github.kmbulebu.dsc.it100.mina.codec.IT100CodecFactory;
import com.github.kmbulebu.dsc.it100.mina.filters.CommandLogFilter;
import com.github.kmbulebu.dsc.it100.mina.filters.PollKeepAliveFilter;
import com.github.kmbulebu.dsc.it100.mina.filters.StatusRequestFilter;
import com.github.kmbulebu.dsc.it100.rxjava.ReadCommandOnSubscribe;
import java.net.SocketAddress;

/**
* API Main Entry point.
Expand All @@ -43,7 +41,7 @@ public class IT100 {
private IoConnector connector = null;
private IoSession session = null;

private static final Logger LOGGER = LogManager.getLogger();
private static final Logger LOGGER = LoggerFactory.getLogger(IT100.class);

private final Configuration configuration;

Expand Down
162 changes: 82 additions & 80 deletions src/main/java/com/github/kmbulebu/dsc/it100/commands/read/ReadCommandFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,97 +3,99 @@
import com.github.kmbulebu.dsc.it100.commands.read.ReadCommand.CommandLengthException;
import com.github.kmbulebu.dsc.it100.commands.read.ReadCommand.InvalidCommandException;

import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.Map;


public class ReadCommandFactory {

private static Map<String, Class<? extends ReadCommand>> codeToCommandMap = new HashMap<String, Class<? extends ReadCommand>>();
private static Map<String, Class<? extends ReadCommand>> codeToCommandMap = new HashMap<String, Class<? extends ReadCommand>>();

static {
codeToCommandMap.put(AcknowledgeCommand.CODE, AcknowledgeCommand.class);
codeToCommandMap.put(BaudRateSetCommand.CODE, BaudRateSetCommand.class);
codeToCommandMap.put(BroadcastLabelsCommand.CODE, BroadcastLabelsCommand.class);
codeToCommandMap.put(CommandErrorCommand.CODE, CommandErrorCommand.class);
codeToCommandMap.put(CommandOutputInProgressCommand.CODE, CommandOutputInProgressCommand.class);
codeToCommandMap.put(EntryDelayInProgressCommand.CODE, EntryDelayInProgressCommand.class);
codeToCommandMap.put(ExitDelayInProgressCommand.CODE, ExitDelayInProgressCommand.class);
codeToCommandMap.put(GeneralSystemTamperCommand.CODE, GeneralSystemTamperCommand.class);
codeToCommandMap.put(GeneralSystemTamperRestoreCommand.CODE, GeneralSystemTamperRestoreCommand.class);
codeToCommandMap.put(InvalidAccessCodeCommand.CODE, InvalidAccessCodeCommand.class);
codeToCommandMap.put(KeybusFaultCommand.CODE, KeybusFaultCommand.class);
codeToCommandMap.put(KeybusFaultRestoredCommand.CODE, KeybusFaultRestoredCommand.class);
codeToCommandMap.put(LCDUpdateCommand.CODE, LCDUpdateCommand.class);
codeToCommandMap.put(LCDCursorCommand.CODE, LCDCursorCommand.class);
codeToCommandMap.put(LEDStatusCommand.CODE, LEDStatusCommand.class);
codeToCommandMap.put(BeepStatusCommand.CODE, BeepStatusCommand.class);
codeToCommandMap.put(BuzzerStatusCommand.CODE, BuzzerStatusCommand.class);
codeToCommandMap.put(DoorChimeStatusCommand.CODE, DoorChimeStatusCommand.class);
codeToCommandMap.put(ToneStatusCommand.CODE, ToneStatusCommand.class);
codeToCommandMap.put(PanelACTroubleCommand.CODE, PanelACTroubleCommand.class);
codeToCommandMap.put(PanelACTroubleRestoreCommand.CODE, PanelACTroubleRestoreCommand.class);
codeToCommandMap.put(PanelBatteryTroubleCommand.CODE, PanelBatteryTroubleCommand.class);
codeToCommandMap.put(PanelBatteryTroubleRestoreCommand.CODE, PanelBatteryTroubleRestoreCommand.class);
codeToCommandMap.put(PartitionArmedCommand.CODE, PartitionArmedCommand.class);
codeToCommandMap.put(PartitionBusyCommand.CODE, PartitionBusyCommand.class);
codeToCommandMap.put(PartitionDisarmedCommand.CODE, PartitionDisarmedCommand.class);
codeToCommandMap.put(PartitionInAlarmCommand.CODE, PartitionInAlarmCommand.class);
codeToCommandMap.put(PartitionNotReadyCommand.CODE, PartitionNotReadyCommand.class);
codeToCommandMap.put(PartitionReadyCommand.CODE, PartitionReadyCommand.class);
codeToCommandMap.put(PartitionReadyToForceArmCommand.CODE, PartitionReadyToForceArmCommand.class);
codeToCommandMap.put(RingDetectedCommand.CODE, RingDetectedCommand.class);
codeToCommandMap.put(SystemBellTroubleCommand.CODE, SystemBellTroubleCommand.class);
codeToCommandMap.put(SystemBellTroubleRestoreCommand.CODE, SystemBellTroubleRestoreCommand.class);
codeToCommandMap.put(SystemErrorCommand.CODE, SystemErrorCommand.class);
codeToCommandMap.put(TimeDateBroadcastCommand.CODE, TimeDateBroadcastCommand.class);
codeToCommandMap.put(TroubleStatusCommand.CODE, TroubleStatusCommand.class);
codeToCommandMap.put(TroubleStatusRestoreCommand.CODE, TroubleStatusRestoreCommand.class);
codeToCommandMap.put(ZoneAlarmCommand.CODE, ZoneAlarmCommand.class);
codeToCommandMap.put(ZoneAlarmRestoreCommand.CODE, ZoneAlarmRestoreCommand.class);
codeToCommandMap.put(ZoneFaultCommand.CODE, ZoneFaultCommand.class);
codeToCommandMap.put(ZoneFaultRestoreCommand.CODE, ZoneFaultRestoreCommand.class);
codeToCommandMap.put(ZoneOpenCommand.CODE, ZoneOpenCommand.class);
codeToCommandMap.put(ZoneRestoredCommand.CODE, ZoneRestoredCommand.class);
codeToCommandMap.put(ZoneTamperCommand.CODE, ZoneTamperCommand.class);
codeToCommandMap.put(ZoneTamperRestoreCommand.CODE, ZoneTamperRestoreCommand.class);
codeToCommandMap.put(UserOpeningCommand.CODE, UserOpeningCommand.class);
codeToCommandMap.put(UserClosingCommand.CODE, UserClosingCommand.class);
codeToCommandMap.put(PartialClosingCommand.CODE, PartialClosingCommand.class);
codeToCommandMap.put(SpecialClosingCommand.CODE, SpecialClosingCommand.class);
codeToCommandMap.put(SoftwareVersionCommand.CODE, SoftwareVersionCommand.class);
}
static {
codeToCommandMap.put(AcknowledgeCommand.CODE, AcknowledgeCommand.class);
codeToCommandMap.put(BaudRateSetCommand.CODE, BaudRateSetCommand.class);
codeToCommandMap.put(BroadcastLabelsCommand.CODE, BroadcastLabelsCommand.class);
codeToCommandMap.put(CommandErrorCommand.CODE, CommandErrorCommand.class);
codeToCommandMap.put(CommandOutputInProgressCommand.CODE, CommandOutputInProgressCommand.class);
codeToCommandMap.put(EntryDelayInProgressCommand.CODE, EntryDelayInProgressCommand.class);
codeToCommandMap.put(ExitDelayInProgressCommand.CODE, ExitDelayInProgressCommand.class);
codeToCommandMap.put(GeneralSystemTamperCommand.CODE, GeneralSystemTamperCommand.class);
codeToCommandMap.put(GeneralSystemTamperRestoreCommand.CODE, GeneralSystemTamperRestoreCommand.class);
codeToCommandMap.put(InvalidAccessCodeCommand.CODE, InvalidAccessCodeCommand.class);
codeToCommandMap.put(KeybusFaultCommand.CODE, KeybusFaultCommand.class);
codeToCommandMap.put(KeybusFaultRestoredCommand.CODE, KeybusFaultRestoredCommand.class);
codeToCommandMap.put(LCDUpdateCommand.CODE, LCDUpdateCommand.class);
codeToCommandMap.put(LCDCursorCommand.CODE, LCDCursorCommand.class);
codeToCommandMap.put(LEDStatusCommand.CODE, LEDStatusCommand.class);
codeToCommandMap.put(BeepStatusCommand.CODE, BeepStatusCommand.class);
codeToCommandMap.put(BuzzerStatusCommand.CODE, BuzzerStatusCommand.class);
codeToCommandMap.put(DoorChimeStatusCommand.CODE, DoorChimeStatusCommand.class);
codeToCommandMap.put(ToneStatusCommand.CODE, ToneStatusCommand.class);
codeToCommandMap.put(PanelACTroubleCommand.CODE, PanelACTroubleCommand.class);
codeToCommandMap.put(PanelACTroubleRestoreCommand.CODE, PanelACTroubleRestoreCommand.class);
codeToCommandMap.put(PanelBatteryTroubleCommand.CODE, PanelBatteryTroubleCommand.class);
codeToCommandMap.put(PanelBatteryTroubleRestoreCommand.CODE, PanelBatteryTroubleRestoreCommand.class);
codeToCommandMap.put(PartitionArmedCommand.CODE, PartitionArmedCommand.class);
codeToCommandMap.put(PartitionBusyCommand.CODE, PartitionBusyCommand.class);
codeToCommandMap.put(PartitionDisarmedCommand.CODE, PartitionDisarmedCommand.class);
codeToCommandMap.put(PartitionInAlarmCommand.CODE, PartitionInAlarmCommand.class);
codeToCommandMap.put(PartitionNotReadyCommand.CODE, PartitionNotReadyCommand.class);
codeToCommandMap.put(PartitionReadyCommand.CODE, PartitionReadyCommand.class);
codeToCommandMap.put(PartitionReadyToForceArmCommand.CODE, PartitionReadyToForceArmCommand.class);
codeToCommandMap.put(RingDetectedCommand.CODE, RingDetectedCommand.class);
codeToCommandMap.put(SystemBellTroubleCommand.CODE, SystemBellTroubleCommand.class);
codeToCommandMap.put(SystemBellTroubleRestoreCommand.CODE, SystemBellTroubleRestoreCommand.class);
codeToCommandMap.put(SystemErrorCommand.CODE, SystemErrorCommand.class);
codeToCommandMap.put(TimeDateBroadcastCommand.CODE, TimeDateBroadcastCommand.class);
codeToCommandMap.put(TroubleStatusCommand.CODE, TroubleStatusCommand.class);
codeToCommandMap.put(TroubleStatusRestoreCommand.CODE, TroubleStatusRestoreCommand.class);
codeToCommandMap.put(ZoneAlarmCommand.CODE, ZoneAlarmCommand.class);
codeToCommandMap.put(ZoneAlarmRestoreCommand.CODE, ZoneAlarmRestoreCommand.class);
codeToCommandMap.put(ZoneFaultCommand.CODE, ZoneFaultCommand.class);
codeToCommandMap.put(ZoneFaultRestoreCommand.CODE, ZoneFaultRestoreCommand.class);
codeToCommandMap.put(ZoneOpenCommand.CODE, ZoneOpenCommand.class);
codeToCommandMap.put(ZoneRestoredCommand.CODE, ZoneRestoredCommand.class);
codeToCommandMap.put(ZoneTamperCommand.CODE, ZoneTamperCommand.class);
codeToCommandMap.put(ZoneTamperRestoreCommand.CODE, ZoneTamperRestoreCommand.class);
codeToCommandMap.put(UserOpeningCommand.CODE, UserOpeningCommand.class);
codeToCommandMap.put(UserClosingCommand.CODE, UserClosingCommand.class);
codeToCommandMap.put(PartialClosingCommand.CODE, PartialClosingCommand.class);
codeToCommandMap.put(SpecialClosingCommand.CODE, SpecialClosingCommand.class);
codeToCommandMap.put(SoftwareVersionCommand.CODE, SoftwareVersionCommand.class);
}


public ReadCommand parseCommand(String receivedCommand) throws InvalidCommandException {
if (receivedCommand.length() < 3) {
throw new CommandLengthException(receivedCommand.length());
}
public ReadCommand parseCommand(String receivedCommand) throws InvalidCommandException {
if (receivedCommand.length() < 3) {
throw new CommandLengthException(receivedCommand.length());
}

final String commandCode = receivedCommand.substring(0, 3);
final String commandCode = receivedCommand.substring(0, 3);

Class<? extends ReadCommand> commandClass = codeToCommandMap.get(commandCode);
//System.out.println(commandCode + ", " + commandClass);
if (commandClass == null) {
throw new ReadCommand.UnknownCommandException(receivedCommand);
}
Class<? extends ReadCommand> commandClass = codeToCommandMap.get(commandCode);
//System.out.println(commandCode + ", " + commandClass);
if (commandClass == null) {
throw new ReadCommand.UnknownCommandException(receivedCommand);
}

ReadCommand command;
try {
command = commandClass.newInstance();
} catch (InstantiationException e) {
throw new InvalidCommandException(e);
} catch (IllegalAccessException e) {
throw new InvalidCommandException(e);
}
command.init(receivedCommand);
return command;
}
ReadCommand command;
try {
command = commandClass.getDeclaredConstructor().newInstance();
} catch (InstantiationException |
IllegalAccessException |
NoSuchMethodException |
InvocationTargetException e) {
throw new InvalidCommandException(e);
}
command.init(receivedCommand);
return command;
}

public static void registerCommand(String commandCode, Class<? extends ReadCommand> clazz) {
if (codeToCommandMap.containsKey(commandCode)) {
throw new IllegalArgumentException("You may not redefine an existing command.");
}
codeToCommandMap.put(commandCode, clazz);
}
public static void registerCommand(String commandCode, Class<? extends ReadCommand> clazz) {
if (codeToCommandMap.containsKey(commandCode)) {
throw new IllegalArgumentException("You may not redefine an existing command.");
}
codeToCommandMap.put(commandCode, clazz);
}
}
Loading