Skip to content

Commit

Permalink
More cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ajs6f committed Nov 6, 2014
1 parent 66ce10c commit 5532a40
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 28 deletions.
34 changes: 13 additions & 21 deletions src/main/java/org/fcrepo/camel/FedoraClient.java
Expand Up @@ -13,41 +13,35 @@
*/
package org.fcrepo.camel;

import java.util.Map;
import java.util.HashMap;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.apache.camel.component.http4.HttpOperationFailedException;
import java.util.HashMap;
import java.util.Map;

import javax.ws.rs.core.Link;

import java.net.URI;

import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.camel.component.http4.HttpOperationFailedException;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.entity.StringEntity;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpHead;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpPatch;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpPatch;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;

import java.io.IOException;

/**
* Represents a client to interact with Fedora's HTTP API.
*
Expand All @@ -58,8 +52,6 @@
*/
public class FedoraClient {

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

private CloseableHttpClient httpclient;

private volatile Boolean throwExceptionOnFailure = true;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/fcrepo/camel/FedoraComponent.java
Expand Up @@ -17,11 +17,10 @@

import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.slf4j.Logger;

/**
* Represents the component that manages {@link FedoraEndpoint}.
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/org/fcrepo/camel/FedoraEndpoint.java
Expand Up @@ -13,14 +13,11 @@
*/
package org.fcrepo.camel;

import static org.slf4j.LoggerFactory.getLogger;

import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultEndpoint;
import org.slf4j.Logger;

/**
* Represents a Fedora endpoint.
Expand All @@ -29,8 +26,6 @@
*/
public class FedoraEndpoint extends DefaultEndpoint {

private static final Logger LOGGER = getLogger(FedoraEndpoint.class);

public static final String JMS_HEADER_PREFIX = "org.fcrepo.jms.";

public static final String FCREPO_JMS_IDENTIFIER = JMS_HEADER_PREFIX + "identifier";
Expand Down

0 comments on commit 5532a40

Please sign in to comment.