Skip to content

checkstyle & tab fixes #7

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
hgschmie wants to merge 2 commits into
base: master
Choose a base branch
from
Open

checkstyle & tab fixes #7

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
1f36ea0
checkstyle & tab fixes
hgschmie Dec 20, 2013
b02ed5a
local fixes
hgschmie Jan 28, 2014
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: 2 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,53 +5,40 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.nesscomputing</groupId>
<artifactId>ness-oss-parent</artifactId>
<version>33</version>
<artifactId>ness-root</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>

<scm>
<connection>scm:git:git://github.com/NessComputing/components-ness-jmx.git</connection>
<developerConnection>scm:git:git@github.com:NessComputing/components-ness-jmx.git</developerConnection>
<url>http://github.com/NessComputing/components-ness-jmx</url>
<tag>HEAD</tag>
</scm>

<groupId>com.nesscomputing.components</groupId>
<artifactId>ness-jmx</artifactId>
<name>ness-jmx</name>
<version>1.3.2-SNAPSHOT</version>
<packaging>jar</packaging>
<description>JMX related code.</description>

<dependencies>
<dependency>
<groupId>com.nesscomputing.components</groupId>
<artifactId>ness-logging</artifactId>
<version>1.1.1</version>
</dependency>

<dependency>
<groupId>com.nesscomputing.components</groupId>
<artifactId>ness-lifecycle</artifactId>
<version>1.3.0</version>
</dependency>

<dependency>
<groupId>com.nesscomputing.components</groupId>
<artifactId>ness-galaxy</artifactId>
<version>1.1.0</version>
</dependency>

<dependency>
<groupId>com.nesscomputing.components</groupId>
<artifactId>ness-config</artifactId>
<version>2.3.1</version>
</dependency>

<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-core</artifactId>
<version>1.0.2</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -92,7 +79,6 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1</version>
</dependency>

<dependency>
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/nesscomputing/jmx/JmxModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,16 @@

import javax.management.MBeanServer;

import org.weakref.jmx.MBeanExporter;
import org.weakref.jmx.guice.MBeanModule;

import com.google.inject.AbstractModule;
import com.google.inject.Binder;
import com.google.inject.Module;
import com.google.inject.Provides;
import com.google.inject.Scopes;
import com.google.inject.Singleton;
import com.google.inject.util.Modules;
import com.nesscomputing.lifecycle.Lifecycle;

import org.weakref.jmx.MBeanExporter;
import org.weakref.jmx.guice.MBeanModule;

/**
* Sets up JMX bindings. Specifically, binds an {@link MBeanExporter}
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/nesscomputing/jmx/LifecycledMBeanExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@

import javax.management.MBeanServer;

import org.weakref.jmx.MBeanExporter;

import com.google.inject.Inject;
import com.google.inject.Singleton;

import com.nesscomputing.lifecycle.LifecycleStage;
import com.nesscomputing.lifecycle.guice.OnStage;
import com.nesscomputing.logging.Log;

import org.weakref.jmx.MBeanExporter;


@Singleton
public class LifecycledMBeanExporter extends MBeanExporter
Expand Down
17 changes: 9 additions & 8 deletions src/main/java/com/nesscomputing/jmx/jolokia/JolokiaModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@

import javax.servlet.http.HttpServlet;

import org.apache.commons.configuration.Configuration;
import org.jolokia.backend.BackendManager;
import org.jolokia.http.HttpRequestHandler;
import org.jolokia.restrictor.AllowAllRestrictor;
import org.jolokia.restrictor.Restrictor;
import org.jolokia.util.ConfigKey;
import org.jolokia.util.LogHandler;

import com.google.common.collect.Maps;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
Expand All @@ -39,13 +31,22 @@
import com.google.inject.Singleton;
import com.google.inject.name.Names;
import com.google.inject.servlet.ServletModule;

import com.nesscomputing.config.Config;
import com.nesscomputing.config.ConfigProvider;
import com.nesscomputing.lifecycle.Lifecycle;
import com.nesscomputing.lifecycle.LifecycleListener;
import com.nesscomputing.lifecycle.LifecycleStage;
import com.nesscomputing.logging.Log;

import org.apache.commons.configuration.Configuration;
import org.jolokia.backend.BackendManager;
import org.jolokia.http.HttpRequestHandler;
import org.jolokia.restrictor.AllowAllRestrictor;
import org.jolokia.restrictor.Restrictor;
import org.jolokia.util.ConfigKey;
import org.jolokia.util.LogHandler;

/**
* Bind the jolokia servlet in the Trumpet context.
*/
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/nesscomputing/jmx/jolokia/JolokiaServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.google.inject.Inject;
import com.google.inject.Singleton;

import org.jolokia.backend.BackendManager;
import org.jolokia.http.HttpRequestHandler;
import org.jolokia.util.ConfigKey;
import org.json.simple.JSONAware;

import com.google.inject.Inject;
import com.google.inject.Singleton;

/**
* Expose Jolokia REST APIs through a Guice driven servlet.
*/
Expand All @@ -42,14 +42,14 @@ public class JolokiaServlet extends HttpServlet
private static final long serialVersionUID = 42L;

// POST- and GET- HttpRequestHandler
private transient final ServletRequestHandler httpGetHandler;
private transient final ServletRequestHandler httpPostHandler;
private final transient ServletRequestHandler httpGetHandler;
private final transient ServletRequestHandler httpPostHandler;

// Backend dispatcher
private transient final BackendManager backendManager;
private final transient BackendManager backendManager;

// Request handler for parsing request parameters and building up a response
private transient final HttpRequestHandler requestHandler;
private final transient HttpRequestHandler requestHandler;

@Inject
public JolokiaServlet(final BackendManager backendManager,
Expand Down Expand Up @@ -112,7 +112,7 @@ private void sendResponse(final HttpServletResponse resp, final String contentTy
writer.flush();
}

private static interface ServletRequestHandler
private interface ServletRequestHandler
{
JSONAware handleRequest(HttpServletRequest req, HttpServletResponse resp) throws IOException;
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/nesscomputing/jmx/starter/JmxExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

import com.google.inject.Inject;
import com.google.inject.name.Named;

import com.nesscomputing.jmx.starter.guice.IOExceptionProvider;
import com.nesscomputing.jmx.starter.guice.JmxStarterModule;
import com.nesscomputing.lifecycle.LifecycleStage;
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/nesscomputing/jmx/starter/guice/JmxExporterConfigProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
import java.io.IOException;
import java.net.InetAddress;

import org.apache.commons.lang3.ObjectUtils;

import com.google.inject.Inject;

import com.nesscomputing.galaxy.GalaxyConfig;
import com.nesscomputing.jmx.starter.JmxExporterConfig;
import com.nesscomputing.jmx.starter.NetUtils;

import org.apache.commons.lang3.ObjectUtils;

public class JmxExporterConfigProvider implements IOExceptionProvider<JmxExporterConfig>
{
private final InetAddress configuredHost;
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/nesscomputing/jmx/starter/guice/JmxStarterModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,21 @@

import java.util.Map;

import org.apache.commons.lang3.StringUtils;

import com.google.common.collect.ImmutableMap;
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;
import com.google.inject.TypeLiteral;
import com.google.inject.name.Named;
import com.google.inject.name.Names;
import com.google.inject.throwingproviders.ThrowingProviderBinder;

import com.nesscomputing.config.Config;
import com.nesscomputing.jmx.starter.JmxExporter;
import com.nesscomputing.jmx.starter.JmxExporterConfig;
import com.nesscomputing.logging.Log;

import org.apache.commons.lang3.StringUtils;

public class JmxStarterModule extends AbstractModule
{
public static final String JMX_STARTER_NAME = "_jmxStarter";
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/nesscomputing/jmx/jolokia/TestJolokiaModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@

import javax.servlet.http.HttpServlet;

import org.junit.Assert;
import org.junit.Test;

import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.Stage;

import com.nesscomputing.config.ConfigModule;
import com.nesscomputing.jmx.jolokia.JolokiaModule;
import com.nesscomputing.lifecycle.guice.LifecycleModule;

import org.junit.Assert;
import org.junit.Test;

public class TestJolokiaModule
{
@Test
Expand Down
11 changes: 6 additions & 5 deletions src/test/java/com/nesscomputing/jmx/starter/guice/TestJmxExporterConfigProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,23 @@

import javax.management.MBeanServer;

import org.junit.Assert;
import org.junit.Test;
import org.weakref.jmx.testing.TestingMBeanServer;

import com.google.inject.Binder;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.Scopes;
import com.google.inject.Stage;

import com.nesscomputing.config.Config;
import com.nesscomputing.config.ConfigModule;
import com.nesscomputing.galaxy.GalaxyConfigModule;
import com.nesscomputing.jmx.starter.JmxExporterConfig;
import com.nesscomputing.testing.lessio.AllowNetworkListen;

import org.junit.Assert;
import org.junit.Test;
import org.kitei.testing.lessio.AllowNetworkListen;
import org.weakref.jmx.testing.TestingMBeanServer;

@AllowNetworkListen(ports={0})
public class TestJmxExporterConfigProvider
Expand Down
13 changes: 7 additions & 6 deletions src/test/java/com/nesscomputing/jmx/starter/guice/TestJmxStarterModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,14 @@
*/
package com.nesscomputing.jmx.starter.guice;

import org.junit.Assert;
import org.junit.Test;
import org.weakref.jmx.testing.TestingMBeanServer;

import com.google.inject.Binder;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.Module;
import com.google.inject.Stage;

import com.nesscomputing.config.Config;
import com.nesscomputing.config.ConfigModule;
import com.nesscomputing.galaxy.GalaxyConfigModule;
Expand All @@ -34,8 +31,12 @@
import com.nesscomputing.lifecycle.Lifecycle;
import com.nesscomputing.lifecycle.LifecycleStage;
import com.nesscomputing.lifecycle.guice.LifecycleModule;
import com.nesscomputing.testing.lessio.AllowNetworkAccess;
import com.nesscomputing.testing.lessio.AllowNetworkListen;

import org.junit.Assert;
import org.junit.Test;
import org.kitei.testing.lessio.AllowNetworkAccess;
import org.kitei.testing.lessio.AllowNetworkListen;
import org.weakref.jmx.testing.TestingMBeanServer;

@AllowNetworkListen(ports={0})
@AllowNetworkAccess(endpoints={"0.0.0.0:*","127.0.0.1:*"})
Expand Down