clean up imports

2 files changed, 46 insertions, 53 deletions

diff --git a/src/main/java/org/rhq/plugins/puppet/PuppetComponent.java b/src/main/java/org/rhq/plugins/puppet/PuppetComponent.java
index 2b76554..71f1bb8 100644
--- a/src/main/java/org/rhq/plugins/puppet/PuppetComponent.java
+++ b/src/main/java/org/rhq/plugins/puppet/PuppetComponent.java
@@ -1,18 +1,15 @@
 
 package org.rhq.plugins.puppet;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
 import org.rhq.core.domain.measurement.AvailabilityType;
 import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
 import org.rhq.core.pluginapi.inventory.CreateResourceReport;
 import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
 import org.rhq.core.pluginapi.inventory.ResourceComponent;
 import org.rhq.core.pluginapi.inventory.ResourceContext;
 import org.rhq.core.pluginapi.operation.OperationContext;
diff --git a/src/main/java/org/rhq/plugins/puppet/PuppetDiscovery.java b/src/main/java/org/rhq/plugins/puppet/PuppetDiscovery.java
index b65d27a..064987b 100644
--- a/src/main/java/org/rhq/plugins/puppet/PuppetDiscovery.java
+++ b/src/main/java/org/rhq/plugins/puppet/PuppetDiscovery.java
@@ -1,50 +1,46 @@
-package org.rhq.plugins.puppet;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.Property;
-import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
-import org.rhq.core.pluginapi.inventory.ProcessScanResult;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
-
-
-/**
- * Discovery class
- */
-public class PuppetDiscovery implements ResourceDiscoveryComponent {
-
-
-    private final Log log = LogFactory.getLog(this.getClass());
-
-
-    /**
-     * Run the discovery
-     */
-    public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext discoveryContext) throws Exception {
-
-        Set<DiscoveredResourceDetails> discoveredResources = new HashSet<DiscoveredResourceDetails>();
-
-        /**
-         * TODO : do your discovery here
-         * A discovered resource must have a unique key, that must
-         * stay the same when the resource is discovered the next
-         * time
-         */
-        DiscoveredResourceDetails detail = null; // new DiscoveredResourceDetails(  );
-
-
-        // Add to return values
-        discoveredResources.add(detail);
-        log.info("Discovered new ... TODO "); // TODO change
-
-        return discoveredResources;
-
-    }
+package org.rhq.plugins.puppet;

+

+import java.util.HashSet;

+import java.util.Set;

+

+import org.apache.commons.logging.Log;

+import org.apache.commons.logging.LogFactory;

+

+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;

+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;

+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;

+

+

+/**

+ * Discovery class

+ */

+public class PuppetDiscovery implements ResourceDiscoveryComponent {

+

+

+    private final Log log = LogFactory.getLog(this.getClass());

+

+

+    /**

+     * Run the discovery

+     */

+    public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext discoveryContext) throws Exception {

+

+        Set<DiscoveredResourceDetails> discoveredResources = new HashSet<DiscoveredResourceDetails>();

+

+        /**

+         * TODO : do your discovery here

+         * A discovered resource must have a unique key, that must

+         * stay the same when the resource is discovered the next

+         * time

+         */

+        DiscoveredResourceDetails detail = null; // new DiscoveredResourceDetails(  );

+

+

+        // Add to return values

+        discoveredResources.add(detail);

+        log.info("Discovered new ... TODO "); // TODO change

+

+        return discoveredResources;

+

+    }

 }
\ No newline at end of file