Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
postcodes-io-java
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
James Coyle
postcodes-io-java
Commits
d5d430d0
Commit
d5d430d0
authored
Sep 17, 2016
by
Deepak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made random postcode fethcer better
parent
83d46c9a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
42 additions
and
27 deletions
+42
-27
src/main/java/com/postcode/io/initializers/NearestPostcode.java
...in/java/com/postcode/io/initializers/NearestPostcode.java
+4
-0
src/main/java/com/postcode/io/initializers/Postcode.java
src/main/java/com/postcode/io/initializers/Postcode.java
+1
-1
src/main/java/com/postcode/io/initializers/PostcodeLookup.java
...ain/java/com/postcode/io/initializers/PostcodeLookup.java
+3
-9
src/main/java/com/postcode/io/initializers/RandomPostcode.java
...ain/java/com/postcode/io/initializers/RandomPostcode.java
+31
-0
src/main/java/com/postcode/io/initializers/ReverseGeocoding.java
...n/java/com/postcode/io/initializers/ReverseGeocoding.java
+0
-14
src/test/java/com/postcode/io/initializers/PostcodeLookupTest.java
...java/com/postcode/io/initializers/PostcodeLookupTest.java
+1
-1
src/test/java/com/postcode/io/initializers/PostcodeTest.java
src/test/java/com/postcode/io/initializers/PostcodeTest.java
+2
-2
No files found.
src/main/java/com/postcode/io/initializers/NearestPostcode.java
View file @
d5d430d0
...
...
@@ -4,6 +4,10 @@ import org.json.JSONObject;
import
com.mashape.unirest.http.Unirest
;
/**
* @author Deepak
*
*/
public
class
NearestPostcode
{
private
static
final
String
LOOKUP_URL
=
"http://api.postcodes.io/postcodes/"
;
...
...
src/main/java/com/postcode/io/initializers/Postcode.java
View file @
d5d430d0
...
...
@@ -100,7 +100,7 @@ public class Postcode {
this
.
json
=
json
;
}
public
static
boolean
validatePostcode
(
String
postcode
)
throws
JSONException
,
UnirestException
{
public
static
boolean
isValid
(
String
postcode
)
throws
JSONException
,
UnirestException
{
return
Unirest
.
get
(
"https://api.postcodes.io/postcodes/"
.
concat
(
postcode
).
concat
(
"/validate"
)).
asJson
()
.
getBody
().
getObject
().
getBoolean
(
"result"
);
}
...
...
src/main/java/com/postcode/io/initializers/PostcodeLookup.java
View file @
d5d430d0
...
...
@@ -5,7 +5,6 @@ import java.util.List;
import
org.json.JSONException
;
import
com.mashape.unirest.http.Unirest
;
import
com.mashape.unirest.http.exceptions.UnirestException
;
import
com.postcode.io.initializers.ReverseGeocoding.Reverse
;
...
...
@@ -84,17 +83,12 @@ public class PostcodeLookup {
return
new
ReverseGeocoding
(
reverses
);
}
public
static
ReverseGeocoding
randomPostcode
()
{
return
new
ReverseGeocoding
(
""
);
}
public
static
ReverseGeocoding
randomPostcode
(
String
outcode
)
{
return
new
ReverseGeocoding
(
outcode
);
public
static
RandomPostcode
randomPostcode
()
{
return
new
RandomPostcode
();
}
public
static
boolean
isValid
(
String
postcode
)
throws
JSONException
,
UnirestException
{
return
Unirest
.
get
(
"https://api.postcodes.io/postcodes/"
.
concat
(
postcode
).
concat
(
"/validate"
)).
asJson
()
.
getBody
().
getObject
().
getBoolean
(
"result"
);
return
Postcode
.
isValid
(
postcode
);
}
public
static
NearestPostcode
nearestPostcode
(
String
postcode
)
{
...
...
src/main/java/com/postcode/io/initializers/RandomPostcode.java
0 → 100644
View file @
d5d430d0
package
com.postcode.io.initializers
;
import
java.io.IOException
;
import
org.json.JSONObject
;
import
com.mashape.unirest.http.Unirest
;
import
com.mashape.unirest.http.exceptions.UnirestException
;
/**
* @author Deepak
*
*/
public
class
RandomPostcode
{
private
static
final
String
RANDOM_LOOKUP_URL
=
"https://api.postcodes.io/random/postcodes"
;
private
static
String
outcode
=
""
;
public
RandomPostcode
()
{
}
public
RandomPostcode
outcode
(
String
outcode
)
{
RandomPostcode
.
outcode
=
outcode
;
return
this
;
}
public
JSONObject
asJson
()
throws
IOException
,
UnirestException
{
return
Unirest
.
get
(
RANDOM_LOOKUP_URL
).
queryString
(
"outcode"
,
outcode
).
asJson
().
getBody
().
getObject
();
}
}
src/main/java/com/postcode/io/initializers/ReverseGeocoding.java
View file @
d5d430d0
...
...
@@ -20,18 +20,12 @@ public class ReverseGeocoding {
private
static
final
String
LOOKUP_URL
=
"http://api.postcodes.io/postcodes?"
;
private
static
final
String
RANDOM_LOOKUP_URL
=
"https://api.postcodes.io/random/postcodes"
;
private
static
Double
longitude
;
private
static
Double
latitude
;
private
static
int
limit
;
private
static
String
outcode
;
private
static
boolean
random
;
private
static
int
radius
;
private
static
boolean
wideSearch
;
...
...
@@ -43,11 +37,6 @@ public class ReverseGeocoding {
public
ReverseGeocoding
()
{
}
public
ReverseGeocoding
(
String
outcode
)
{
ReverseGeocoding
.
outcode
=
outcode
;
ReverseGeocoding
.
random
=
true
;
}
public
ReverseGeocoding
(
Double
longitude
,
Double
latitude
)
{
ReverseGeocoding
.
longitude
=
longitude
;
ReverseGeocoding
.
latitude
=
latitude
;
...
...
@@ -88,9 +77,6 @@ public class ReverseGeocoding {
* @throws UnirestException
*/
public
JSONObject
asJson
()
throws
IOException
,
UnirestException
{
if
(
random
)
{
return
Unirest
.
get
(
RANDOM_LOOKUP_URL
).
queryString
(
"outcode"
,
outcode
).
asJson
().
getBody
().
getObject
();
}
String
url
=
""
;
url
=
url
.
concat
(
"lon="
).
concat
(
String
.
valueOf
(
longitude
));
url
=
url
.
concat
(
"&lat="
).
concat
(
String
.
valueOf
(
latitude
));
...
...
src/test/java/com/postcode/io/initializers/PostcodeLookupTest.java
View file @
d5d430d0
...
...
@@ -98,7 +98,7 @@ public class PostcodeLookupTest {
JSONAssert
.
assertEquals
(
Unirest
.
get
(
"https://api.postcodes.io/random/postcodes"
).
queryString
(
"outcode"
,
"bs347np"
).
asJson
()
.
getBody
().
getObject
(),
PostcodeLookup
.
randomPostcode
(
"bs347np"
).
asJson
(),
JSONCompareMode
.
LENIENT
);
PostcodeLookup
.
randomPostcode
(
).
outcode
(
"bs347np"
).
asJson
(),
JSONCompareMode
.
LENIENT
);
assertTrue
(
PostcodeLookup
.
randomPostcode
().
asJson
().
has
(
"result"
));
assertEquals
(
200
,
PostcodeLookup
.
randomPostcode
().
asJson
().
getInt
(
"status"
));
}
...
...
src/test/java/com/postcode/io/initializers/PostcodeTest.java
View file @
d5d430d0
...
...
@@ -28,8 +28,8 @@ public class PostcodeTest {
@Test
public
void
testPostcodeValidator
()
throws
JSONException
,
UnirestException
{
assertTrue
(
Postcode
.
validatePostcode
(
"ST42EU"
));
assertFalse
(
Postcode
.
validatePostcode
(
"ST4"
));
assertTrue
(
Postcode
.
isValid
(
"ST42EU"
));
assertFalse
(
Postcode
.
isValid
(
"ST4"
));
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment