diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b2fb4d..7615b74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ## [3.0.0-RC3-SNAPSHOT] ### Changed - `pl.smsapi.BasicAuthClient` marked as deprecated +- non-proxy action factories marked as deprecated ### Removed - deprecated `pl.smsapi.proxy.Proxy#execute` method diff --git a/src/main/java/pl/smsapi/api/ActionFactory.java b/src/main/java/pl/smsapi/api/ActionFactory.java index 072e9b6..bfb9b78 100644 --- a/src/main/java/pl/smsapi/api/ActionFactory.java +++ b/src/main/java/pl/smsapi/api/ActionFactory.java @@ -9,10 +9,18 @@ public abstract class ActionFactory { protected Client client; protected Proxy proxy; + /** + * @deprecated use {@link ActionFactory(Client, Proxy)} instead + */ + @Deprecated public ActionFactory() { this.proxy = new ProxyNative("https://api.smsapi.pl/"); } + /** + * @deprecated use {@link ActionFactory(Client, Proxy)} instead + */ + @Deprecated public ActionFactory(Client client) { this.client = client; this.proxy = new ProxyNative("https://api.smsapi.pl/"); diff --git a/src/main/java/pl/smsapi/api/ContactsFactory.java b/src/main/java/pl/smsapi/api/ContactsFactory.java index 896e8ea..4be3f36 100644 --- a/src/main/java/pl/smsapi/api/ContactsFactory.java +++ b/src/main/java/pl/smsapi/api/ContactsFactory.java @@ -7,6 +7,10 @@ public class ContactsFactory extends ActionFactory { + /** + * @deprecated use {@link ContactsFactory(Client, Proxy)} instead + */ + @Deprecated public ContactsFactory(Client client) { super(client); this.proxy = new ProxyNative("https://api.smsapi.pl/contacts/"); diff --git a/src/main/java/pl/smsapi/api/MmsFactory.java b/src/main/java/pl/smsapi/api/MmsFactory.java index 7580af8..68355cb 100644 --- a/src/main/java/pl/smsapi/api/MmsFactory.java +++ b/src/main/java/pl/smsapi/api/MmsFactory.java @@ -8,6 +8,10 @@ public class MmsFactory extends ActionFactory { + /** + * @deprecated use {@link MmsFactory(Client, Proxy)} instead + */ + @Deprecated public MmsFactory(Client client) { super(client); } diff --git a/src/main/java/pl/smsapi/api/SenderFactory.java b/src/main/java/pl/smsapi/api/SenderFactory.java index d2ea572..920ce4a 100644 --- a/src/main/java/pl/smsapi/api/SenderFactory.java +++ b/src/main/java/pl/smsapi/api/SenderFactory.java @@ -9,6 +9,10 @@ public class SenderFactory extends ActionFactory { + /** + * @deprecated use {@link SenderFactory(Client, Proxy)} instead + */ + @Deprecated public SenderFactory(Client client) { super(client); } diff --git a/src/main/java/pl/smsapi/api/SmsFactory.java b/src/main/java/pl/smsapi/api/SmsFactory.java index 4fb9d41..8db06f2 100644 --- a/src/main/java/pl/smsapi/api/SmsFactory.java +++ b/src/main/java/pl/smsapi/api/SmsFactory.java @@ -8,6 +8,10 @@ public class SmsFactory extends ActionFactory { + /** + * @deprecated use {@link SmsFactory(Client, Proxy)} instead + */ + @Deprecated public SmsFactory(Client client) { super(client); } diff --git a/src/main/java/pl/smsapi/api/UserFactory.java b/src/main/java/pl/smsapi/api/UserFactory.java index f48eeaa..dfbe5fe 100644 --- a/src/main/java/pl/smsapi/api/UserFactory.java +++ b/src/main/java/pl/smsapi/api/UserFactory.java @@ -9,6 +9,10 @@ public class UserFactory extends ActionFactory { + /** + * @deprecated use {@link UserFactory(Client, Proxy)} instead + */ + @Deprecated public UserFactory(Client client) { super(client); } diff --git a/src/main/java/pl/smsapi/api/VmsFactory.java b/src/main/java/pl/smsapi/api/VmsFactory.java index 4dc8f5a..565a530 100644 --- a/src/main/java/pl/smsapi/api/VmsFactory.java +++ b/src/main/java/pl/smsapi/api/VmsFactory.java @@ -8,6 +8,10 @@ public class VmsFactory extends ActionFactory { + /** + * @deprecated use {@link VmsFactory(Client, Proxy)} instead + */ + @Deprecated public VmsFactory(Client client) { super(client); } diff --git a/src/test/java/pl/smsapi/test/run/ContactsTest.java b/src/test/java/pl/smsapi/test/run/ContactsTest.java index 87ebde7..8b0151f 100644 --- a/src/test/java/pl/smsapi/test/run/ContactsTest.java +++ b/src/test/java/pl/smsapi/test/run/ContactsTest.java @@ -9,6 +9,8 @@ import pl.smsapi.api.response.RawResponse; import pl.smsapi.api.response.contacts.*; import pl.smsapi.exception.SmsapiException; +import pl.smsapi.proxy.Proxy; +import pl.smsapi.proxy.ProxyNative; import pl.smsapi.test.TestSmsapi; import java.util.List; @@ -30,7 +32,7 @@ public class ContactsTest extends TestSmsapi { @Before public void before() throws SmsapiException { - apiFactory = new ContactsFactory(getAuthorizationClient()); + apiFactory = new ContactsFactory(getAuthorizationClient(), getProxy()); deleteTestData(); @@ -38,6 +40,10 @@ public void before() throws SmsapiException { testGroup = createTestGroup(); } + protected Proxy getProxy() { + return new ProxyNative("http://api.smsapi.pl/contacts/"); + } + @After public void after() throws SmsapiException { deleteTestData();