diff options
author | Dhandapani <dhandapani@gluster.com> | 2011-11-28 18:37:54 +0530 |
---|---|---|
committer | Dhandapani <dhandapani@gluster.com> | 2011-11-28 18:38:51 +0530 |
commit | acf88eed2426497065f79e4029aeb13349054d96 (patch) | |
tree | 135c3506671e38c0010762ef8675c6fce6bbf039 /src/org.gluster.storage.management.gateway | |
parent | 5145756b18e65431328297c6a111162eca69860a (diff) |
Warnings issue fixed.
Diffstat (limited to 'src/org.gluster.storage.management.gateway')
5 files changed, 8 insertions, 12 deletions
diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ClusterInfo.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ClusterInfo.java index ba197b92..1ba4b164 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ClusterInfo.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ClusterInfo.java @@ -29,6 +29,7 @@ import javax.persistence.OneToMany; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.tool.hbm2ddl.SchemaExport; +@SuppressWarnings("deprecation") @Entity(name="cluster_info") public class ClusterInfo { @Id diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java index 3c9b3bd2..ae2196f3 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java @@ -37,7 +37,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.apache.log4j.Logger; import org.gluster.storage.management.core.exceptions.GlusterValidationException; import org.gluster.storage.management.core.response.ClusterNameListResponse; import org.gluster.storage.management.gateway.data.ClusterInfo; @@ -56,7 +55,6 @@ import com.sun.jersey.spi.resource.Singleton; public class ClustersResource extends AbstractResource { @InjectParam private ClusterService clusterService; - private static final Logger logger = Logger.getLogger(ClustersResource.class); @GET @Produces(MediaType.APPLICATION_XML) diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/KeysResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/KeysResource.java index 3063c23e..674e49e7 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/KeysResource.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/KeysResource.java @@ -50,7 +50,6 @@ import com.sun.jersey.multipart.FormDataParam; @Path(RESOURCE_PATH_KEYS) public class KeysResource extends AbstractResource { private static final Logger logger = Logger.getLogger(KeysResource.class); - private ProcessUtil processUtil = new ProcessUtil(); @GET @Produces(MediaType.APPLICATION_OCTET_STREAM) @@ -78,17 +77,17 @@ public class KeysResource extends AbstractResource { } // Copy keys to temp folder - ProcessResult result = processUtil.executeCommand("cp", sourcePrivateKeyFile, targetPrivateKeyFile); + ProcessResult result = ProcessUtil.executeCommand("cp", sourcePrivateKeyFile, targetPrivateKeyFile); if (!result.isSuccess()) { throw new GlusterRuntimeException("Failed to copy key files! [" + result.getOutput() + "]"); } - result = processUtil.executeCommand("cp", sourcePublicKeyFile, targetPubKeyFile); + result = ProcessUtil.executeCommand("cp", sourcePublicKeyFile, targetPubKeyFile); if (!result.isSuccess()) { throw new GlusterRuntimeException("Failed to copy key files! [" + result.getOutput() + "]"); } // To compress the key files - result = processUtil.executeCommand("tar", "cvf", zipFile, "-C", targetDir, SshUtil.PRIVATE_KEY_FILE.getName(), + result = ProcessUtil.executeCommand("tar", "cvf", zipFile, "-C", targetDir, SshUtil.PRIVATE_KEY_FILE.getName(), SshUtil.PUBLIC_KEY_FILE.getName()); if (!result.isSuccess()) { throw new GlusterRuntimeException("Failed to compress key files! [" + result.getOutput() + "]"); @@ -96,7 +95,7 @@ public class KeysResource extends AbstractResource { // To remove the copied key files try { - processUtil.executeCommand("rm", "-f", targetPrivateKeyFile, targetPubKeyFile); // Ignore the errors if any + ProcessUtil.executeCommand("rm", "-f", targetPrivateKeyFile, targetPubKeyFile); // Ignore the errors if any } catch (Exception e) { logger.warn(e.toString()); } @@ -125,7 +124,7 @@ public class KeysResource extends AbstractResource { } } // Extract SSH private and public key files. - ProcessResult output = processUtil.executeCommand("tar", "xvf", uploadedFile.getAbsolutePath(), "-C", + ProcessResult output = ProcessUtil.executeCommand("tar", "xvf", uploadedFile.getAbsolutePath(), "-C", SshUtil.SSH_AUTHORIZED_KEYS_DIR_LOCAL); uploadedFile.delete(); if (!output.isSuccess()) { diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterServerService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterServerService.java index 58482958..df60e3cf 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterServerService.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterServerService.java @@ -32,7 +32,6 @@ import org.gluster.storage.management.core.exceptions.GlusterValidationException import org.gluster.storage.management.core.model.GlusterServer; import org.gluster.storage.management.core.model.Server; import org.gluster.storage.management.core.model.Server.SERVER_STATUS; -import org.gluster.storage.management.core.response.StringListResponse; import org.gluster.storage.management.core.utils.GlusterCoreUtil; import org.gluster.storage.management.core.utils.ProcessUtil; import org.gluster.storage.management.core.utils.StringUtil; diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java index f65c5640..12e986b5 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java @@ -37,12 +37,10 @@ import org.gluster.storage.management.core.constants.CoreConstants; import org.gluster.storage.management.core.exceptions.ConnectionException; import org.gluster.storage.management.core.exceptions.GlusterRuntimeException; import org.gluster.storage.management.core.model.Server; -import org.gluster.storage.management.core.model.Status; import org.gluster.storage.management.core.model.Server.SERVER_STATUS; -import org.gluster.storage.management.core.response.StringListResponse; +import org.gluster.storage.management.core.model.Status; import org.gluster.storage.management.core.utils.ProcessResult; import org.gluster.storage.management.core.utils.ProcessUtil; -import org.gluster.storage.management.gateway.services.GlusterInterfaceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; @@ -333,6 +331,7 @@ public class ServerUtil { * Input string * @return Object of given expected class */ + @SuppressWarnings("unchecked") public <T> T unmarshal(Class<T> expectedClass, String input) { try { // create JAXB context and instantiate marshaller |