Extracted Verb to it's own file and made Request package-private

fernandezpablo85 · fernandezpablo85 · commit fa8e93699532 · 2010-09-06T20:24:32.000-03:00
diff --git 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
@@ -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
@@ -12,7 +12,7 @@
  * 
  * @author Pablo Fernandez
  */
-public class Request
+class Request
 {
 
   private static final String CONTENT_LENGTH = "Content-Length";
@@ -235,14 +235,4 @@ public String toString()
   {
     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
@@ -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
@@ -5,7 +5,6 @@
 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
@@ -5,7 +5,6 @@
 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
@@ -5,7 +5,6 @@
 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
@@ -5,7 +5,6 @@
 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
@@ -5,7 +5,6 @@
 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
@@ -5,7 +5,6 @@
 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
@@ -3,7 +3,6 @@
 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
@@ -3,7 +3,6 @@
 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
@@ -3,7 +3,6 @@
 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
@@ -1,7 +1,6 @@
 package org.scribe.test.helpers;
 
 import org.scribe.model.*;
-import org.scribe.model.Request.*;
 
 public class ObjectMother
 {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`package org.scribe.model;`
`2`	`2`
`3`		`-import org.scribe.model.Request.*;`
`4`		`-`
`5`	`3`	`public class OAuthConfig`
`6`	`4`	`{`
`7`	`5`	`private String apiKey;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`* @author Pablo Fernandez`
`14`	`14`	`*/`
`15`		`-public class Request`
	`15`	`+class Request`
`16`	`16`	`{`
`17`	`17`
`18`	`18`	`private static final String CONTENT_LENGTH = "Content-Length";`
`@@ -235,14 +235,4 @@ public String toString()`
`235`	`235`	`{`
`236`	`236`	`return String.format("@Request(%s %s)", getVerb(), getUrl());`
`237`	`237`	`}`
`238`		`-`
`239`		`- /**`
`240`		`- * An enumeration containing the most common HTTP Verbs.`
`241`		`- *`
`242`		`- * @author Pablo Fernandez`
`243`		`- */`
`244`		`- public static enum Verb`
`245`		`- {`
`246`		`- GET, POST, PUT, DELETE`
`247`		`- }`
`248`	`238`	`}`