diff --git a/src/main/java/org/scribe/builder/api/DefaultApi10a.java b/src/main/java/org/scribe/builder/api/DefaultApi10a.java index 12413a7..32c4478 100644 --- a/src/main/java/org/scribe/builder/api/DefaultApi10a.java +++ b/src/main/java/org/scribe/builder/api/DefaultApi10a.java @@ -1,10 +1,8 @@ package org.scribe.builder.api; import org.scribe.extractors.*; -import org.scribe.model.OAuthConfig; -import org.scribe.model.Request.Verb; -import org.scribe.oauth.OAuth10aServiceImpl; -import org.scribe.oauth.OAuthService; +import org.scribe.model.*; +import org.scribe.oauth.*; import org.scribe.services.*; public abstract class DefaultApi10a implements Api diff --git a/src/main/java/org/scribe/model/OAuthConfig.java b/src/main/java/org/scribe/model/OAuthConfig.java index d2d94cc..f2634f1 100644 --- a/src/main/java/org/scribe/model/OAuthConfig.java +++ b/src/main/java/org/scribe/model/OAuthConfig.java @@ -1,7 +1,5 @@ package org.scribe.model; -import org.scribe.model.Request.*; - public class OAuthConfig { private String apiKey; diff --git a/src/main/java/org/scribe/model/Request.java b/src/main/java/org/scribe/model/Request.java index c74219e..f7853be 100644 --- a/src/main/java/org/scribe/model/Request.java +++ b/src/main/java/org/scribe/model/Request.java @@ -12,7 +12,7 @@ import org.scribe.utils.*; * * @author Pablo Fernandez */ -public class Request +class Request { private static final String CONTENT_LENGTH = "Content-Length"; @@ -235,14 +235,4 @@ public class Request { return String.format("@Request(%s %s)", getVerb(), getUrl()); } - - /** - * An enumeration containing the most common HTTP Verbs. - * - * @author Pablo Fernandez - */ - public static enum Verb - { - GET, POST, PUT, DELETE - } } diff --git a/src/main/java/org/scribe/model/Verb.java b/src/main/java/org/scribe/model/Verb.java new file mode 100644 index 0000000..b370791 --- /dev/null +++ b/src/main/java/org/scribe/model/Verb.java @@ -0,0 +1,11 @@ +package org.scribe.model; + +/** + * An enumeration containing the most common HTTP Verbs. + * + * @author Pablo Fernandez + */ +public enum Verb +{ + GET, POST, PUT, DELETE +} diff --git a/src/test/java/org/scribe/examples/FoursquareExample.java b/src/test/java/org/scribe/examples/FoursquareExample.java index 083f914..d74eb9c 100644 --- a/src/test/java/org/scribe/examples/FoursquareExample.java +++ b/src/test/java/org/scribe/examples/FoursquareExample.java @@ -5,7 +5,6 @@ import java.util.Scanner; import org.scribe.builder.*; import org.scribe.builder.api.*; import org.scribe.model.*; -import org.scribe.model.Request.*; import org.scribe.oauth.*; public class FoursquareExample diff --git a/src/test/java/org/scribe/examples/LinkedInExample.java b/src/test/java/org/scribe/examples/LinkedInExample.java index 6b2240f..8fd1247 100644 --- a/src/test/java/org/scribe/examples/LinkedInExample.java +++ b/src/test/java/org/scribe/examples/LinkedInExample.java @@ -5,7 +5,6 @@ import java.util.Scanner; import org.scribe.builder.*; import org.scribe.builder.api.*; import org.scribe.model.*; -import org.scribe.model.Request.*; import org.scribe.oauth.*; public class LinkedInExample diff --git a/src/test/java/org/scribe/examples/TwitterExample.java b/src/test/java/org/scribe/examples/TwitterExample.java index ad8a33c..1891d0d 100644 --- a/src/test/java/org/scribe/examples/TwitterExample.java +++ b/src/test/java/org/scribe/examples/TwitterExample.java @@ -5,7 +5,6 @@ import java.util.Scanner; import org.scribe.builder.*; import org.scribe.builder.api.*; import org.scribe.model.*; -import org.scribe.model.Request.*; import org.scribe.oauth.*; public class TwitterExample diff --git a/src/test/java/org/scribe/examples/YahooExample.java b/src/test/java/org/scribe/examples/YahooExample.java index 9140c50..4be2109 100644 --- a/src/test/java/org/scribe/examples/YahooExample.java +++ b/src/test/java/org/scribe/examples/YahooExample.java @@ -5,7 +5,6 @@ import java.util.Scanner; import org.scribe.builder.*; import org.scribe.builder.api.*; import org.scribe.model.*; -import org.scribe.model.Request.*; import org.scribe.oauth.*; public class YahooExample diff --git a/src/test/java/org/scribe/extractors/BaseStringExtractorTest.java b/src/test/java/org/scribe/extractors/BaseStringExtractorTest.java index e63a7c6..d140c3a 100644 --- a/src/test/java/org/scribe/extractors/BaseStringExtractorTest.java +++ b/src/test/java/org/scribe/extractors/BaseStringExtractorTest.java @@ -5,7 +5,6 @@ import static org.junit.Assert.*; import org.junit.*; import org.scribe.exceptions.*; import org.scribe.model.*; -import org.scribe.model.Request.*; import org.scribe.test.helpers.*; public class BaseStringExtractorTest diff --git a/src/test/java/org/scribe/extractors/HeaderExtractorTest.java b/src/test/java/org/scribe/extractors/HeaderExtractorTest.java index ace4a24..0b461c7 100644 --- a/src/test/java/org/scribe/extractors/HeaderExtractorTest.java +++ b/src/test/java/org/scribe/extractors/HeaderExtractorTest.java @@ -5,7 +5,6 @@ import static org.junit.Assert.*; import org.junit.*; import org.scribe.exceptions.*; import org.scribe.model.*; -import org.scribe.model.Request.*; import org.scribe.test.helpers.*; public class HeaderExtractorTest diff --git a/src/test/java/org/scribe/model/OAuthConfigTest.java b/src/test/java/org/scribe/model/OAuthConfigTest.java index 9c1e072..1bffac5 100644 --- a/src/test/java/org/scribe/model/OAuthConfigTest.java +++ b/src/test/java/org/scribe/model/OAuthConfigTest.java @@ -3,7 +3,6 @@ package org.scribe.model; import static org.junit.Assert.*; import org.junit.*; -import org.scribe.model.Request.*; public class OAuthConfigTest { diff --git a/src/test/java/org/scribe/model/OAuthRequestTest.java b/src/test/java/org/scribe/model/OAuthRequestTest.java index 2c2d7d2..9d2ac79 100644 --- a/src/test/java/org/scribe/model/OAuthRequestTest.java +++ b/src/test/java/org/scribe/model/OAuthRequestTest.java @@ -3,7 +3,6 @@ package org.scribe.model; import static org.junit.Assert.*; import org.junit.*; -import org.scribe.model.Request.*; public class OAuthRequestTest { diff --git a/src/test/java/org/scribe/model/RequestTest.java b/src/test/java/org/scribe/model/RequestTest.java index d293e08..6356177 100644 --- a/src/test/java/org/scribe/model/RequestTest.java +++ b/src/test/java/org/scribe/model/RequestTest.java @@ -3,7 +3,6 @@ package org.scribe.model; import static org.junit.Assert.*; import org.junit.*; -import org.scribe.model.Request.*; public class RequestTest { diff --git a/src/test/java/org/scribe/test/helpers/ObjectMother.java b/src/test/java/org/scribe/test/helpers/ObjectMother.java index 32613cf..a69a3c1 100644 --- a/src/test/java/org/scribe/test/helpers/ObjectMother.java +++ b/src/test/java/org/scribe/test/helpers/ObjectMother.java @@ -1,7 +1,6 @@ package org.scribe.test.helpers; import org.scribe.model.*; -import org.scribe.model.Request.*; public class ObjectMother {