这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on May 17, 2021. It is now read-only.

Fix some errors in SNMP binding #5031

Merged
merged 1 commit into from
Jan 24, 2017
Merged

Fix some errors in SNMP binding #5031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions bundles/binding/org.openhab.binding.snmp/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/snmp4j-2.2.2.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/snmp4j-2.5.4.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
2 changes: 1 addition & 1 deletion bundles/binding/org.openhab.binding.snmp/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ Bundle-DocURL: http://www.openhab.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Service-Component: OSGI-INF/binding.xml, OSGI-INF/genericbindingprovider.xml
Bundle-ClassPath: .,
lib/snmp4j-2.2.2.jar
lib/snmp4j-2.5.4.jar

2 changes: 1 addition & 1 deletion bundles/binding/org.openhab.binding.snmp/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ output.. = target/classes/
bin.includes = META-INF/,\
.,\
OSGI-INF/,\
lib/snmp4j-2.2.2.jar
lib/snmp4j-2.5.4.jar
source.. = src/main/java/,\
src/main/resources/
Binary file removed bundles/binding/org.openhab.binding.snmp/lib/snmp4j-2.2.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added bundles/binding/org.openhab.binding.snmp/lib/snmp4j-2.5.4.jar
View file
Open in desktop
Binary file not shown.
20 changes: 12 additions & 8 deletions ...ding.snmp/src/main/java/org/openhab/binding/snmp/internal/SnmpGenericBindingProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public void processBindingConfiguration(String context, Item item, String bindin

addBindingConfig(item, newConfig);
} else {
logger.warn("bindingConfig is NULL (item=" + item + ") -> processing bindingConfig aborted!");
logger.warn("bindingConfig is NULL (item={}) -> processing bindingConfig aborted!", item);
}
}

Expand All @@ -164,7 +164,7 @@ public void processBindingConfiguration(String context, Item item, String bindin
* <li>OID</li>
* <li>Value</li>
* </ul>
*
*
* Parses a SNMP-IN configuration by using the regular expression
* <code>([0-9.a-zA-Z/]+):([0-9.a-zA-Z]+):([0-9.a-zA-Z]+):([0-9]+)</code>.
* Where the groups should contain the following content:
Expand All @@ -176,9 +176,9 @@ public void processBindingConfiguration(String context, Item item, String bindin
* <li>Refresh interval (ms)</li>
* <li>[Optional]transformation rule</li>
* </ul>
*
*
* Setting refresh interval to 0 will only receive SNMP traps
*
*
* @param config
* - the Configuration that needs to be updated with the parsing
* results
Expand Down Expand Up @@ -295,9 +295,13 @@ private void parseBindingConfig(SnmpBindingConfig config, Item item, String bind
}
}

private Address parseAddress(String s) {
String address = s.contains("/") ? s : s + "/161";
return GenericAddress.parse("udp:" + address);
private Address parseAddress(String s) throws BindingConfigParseException {
String addressString = s.contains("/") ? s : s + "/161";
Address address = GenericAddress.parse("udp:" + addressString);
if (address == null) {
throw new BindingConfigParseException(getBindingType() + " binding configuration address is invalid: " + s);
}
return address;
}

/**
Expand Down Expand Up @@ -422,7 +426,7 @@ public int getRefreshInterval(String itemName) {
return config != null && config.get(IN_BINDING_KEY) != null ? config.get(IN_BINDING_KEY).refreshInterval : 0;
}

static class SnmpBindingConfig extends HashMap<Command, SnmpBindingConfigElement>implements BindingConfig {
static class SnmpBindingConfig extends HashMap<Command, SnmpBindingConfigElement> implements BindingConfig {

private static final long serialVersionUID = 4697146075427676116L;
Class<? extends Item> itemType;
Expand Down