Skip to content

Commit 5a52bf6

Browse files
committed
fix code style issues
1 parent dcefd29 commit 5a52bf6

36 files changed

+1227
-1340
lines changed

src/main/java/ug/sparkpl/momoapi/ImproperlyConfiguredException.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package ug.sparkpl.momoapi;
22

3-
public class ImproperlyConfiguredException extends Exception {
3+
public class ImproperlyConfiguredException extends Exception {
4+
public ImproperlyConfiguredException(String errorMessage) {
45

5-
public ImproperlyConfiguredException(String errorMessage) {
6-
super(errorMessage);
7-
}
6+
super(errorMessage);
7+
}
88
}
99

1010

+62-45
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,101 @@
11
package ug.sparkpl.momoapi;
22

3+
import java.io.IOException;
4+
import java.util.UUID;
5+
import java.util.concurrent.TimeUnit;
6+
7+
import ug.sparkpl.momoapi.models.NewUser;
8+
import ug.sparkpl.momoapi.models.User;
9+
import ug.sparkpl.momoapi.network.collections.CollectionsApiService;
10+
import ug.sparkpl.momoapi.utils.DateTimeTypeConverter;
11+
12+
import org.apache.commons.cli.CommandLine;
13+
import org.apache.commons.cli.CommandLineParser;
14+
import org.apache.commons.cli.DefaultParser;
15+
import org.apache.commons.cli.HelpFormatter;
16+
import org.apache.commons.cli.Option;
17+
import org.apache.commons.cli.Options;
18+
import org.apache.commons.cli.ParseException;
19+
import org.joda.time.DateTime;
20+
321
import com.google.gson.FieldNamingPolicy;
422
import com.google.gson.Gson;
523
import com.google.gson.GsonBuilder;
24+
625
import okhttp3.OkHttpClient;
7-
import org.apache.commons.cli.*;
8-
import org.joda.time.DateTime;
926
import retrofit2.Response;
1027
import retrofit2.Retrofit;
1128
import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
1229
import retrofit2.converter.gson.GsonConverterFactory;
13-
import ug.sparkpl.momoapi.Utils.DateTimeTypeConverter;
14-
import ug.sparkpl.momoapi.models.NewUser;
15-
import ug.sparkpl.momoapi.models.User;
16-
import ug.sparkpl.momoapi.network.collections.CollectionsApiService;
1730

18-
import java.io.IOException;
19-
import java.util.UUID;
20-
import java.util.concurrent.TimeUnit;
2131

2232
public class MomoApi {
2333

2434

25-
MomoApi() {
26-
35+
MomoApi() {
2736

28-
}
2937

30-
public static void main(String[] args) throws ParseException, IOException {
38+
}
3139

32-
String BASE_URL = "https://ericssonbasicapi2.azure-api.net";
33-
CollectionsApiService apiService;
40+
/**
41+
* Provision Sandbox Account.
42+
*
43+
* @param args providerCallBackHost and primaryKey(Ocp-Apim-Subscription-Key)
44+
* @throws ParseException when args are missing
45+
* @throws IOException when network error occurs
46+
*/
47+
public static void main(String[] args) throws ParseException, IOException {
3448

35-
Gson gson = new GsonBuilder()
36-
.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
37-
.registerTypeAdapter(DateTime.class, new DateTimeTypeConverter())
38-
.create();
49+
String baseUrl = "https://ericssonbasicapi2.azure-api.net";
50+
final CollectionsApiService apiService;
51+
Gson gson = new GsonBuilder()
52+
.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
53+
.registerTypeAdapter(DateTime.class, new DateTimeTypeConverter())
54+
.create();
3955

4056

41-
final OkHttpClient.Builder okhttpbuilder = new OkHttpClient.Builder();
57+
final OkHttpClient.Builder okhttpbuilder = new OkHttpClient.Builder();
4258

43-
okhttpbuilder.connectTimeout(30, TimeUnit.SECONDS);
44-
okhttpbuilder.readTimeout(30, TimeUnit.SECONDS);
45-
okhttpbuilder.writeTimeout(30, TimeUnit.SECONDS);
59+
okhttpbuilder.connectTimeout(30, TimeUnit.SECONDS);
60+
okhttpbuilder.readTimeout(30, TimeUnit.SECONDS);
61+
okhttpbuilder.writeTimeout(30, TimeUnit.SECONDS);
4662

4763

48-
OkHttpClient httpClient = okhttpbuilder
49-
.build();
64+
OkHttpClient httpClient = okhttpbuilder
65+
.build();
5066

5167

52-
Retrofit retrofitClient = new Retrofit.Builder()
53-
.client(httpClient)
54-
.baseUrl(BASE_URL)
55-
.addConverterFactory(GsonConverterFactory.create(gson))
56-
.addCallAdapterFactory(RxJavaCallAdapterFactory.create())
57-
.build();
68+
Retrofit retrofitClient = new Retrofit.Builder()
69+
.client(httpClient)
70+
.baseUrl(baseUrl)
71+
.addConverterFactory(GsonConverterFactory.create(gson))
72+
.addCallAdapterFactory(RxJavaCallAdapterFactory.create())
73+
.build();
5874

59-
apiService = retrofitClient.create(CollectionsApiService.class);
75+
apiService = retrofitClient.create(CollectionsApiService.class);
6076

61-
CommandLineParser parser = new DefaultParser();
62-
final Options options = new Options();
63-
options.addOption(new Option("h", "providerCallBackHost", true, "providerCallBackHost"));
64-
options.addOption(new Option("k", "primaryKey", true, "Ocp-Apim-Subscription-Key"));
65-
CommandLine cmd = parser.parse(options, args);
77+
CommandLineParser parser = new DefaultParser();
78+
final Options options = new Options();
79+
options.addOption(new Option("h", "providerCallBackHost", true, "providerCallBackHost"));
80+
options.addOption(new Option("k", "primaryKey", true, "Ocp-Apim-Subscription-Key"));
81+
CommandLine cmd = parser.parse(options, args);
6682

6783

68-
HelpFormatter formatter = new HelpFormatter();
69-
formatter.printHelp("MomoApi", options);
84+
HelpFormatter formatter = new HelpFormatter();
85+
formatter.printHelp("MomoApi", options);
7086

71-
String token = UUID.randomUUID().toString();
87+
String token = UUID.randomUUID().toString();
7288

73-
Response<Void> res = apiService
74-
.provisonUser(cmd.getOptionValue("k"), token, new NewUser(cmd.getOptionValue("h"))).execute();
89+
Response<Void> res = apiService
90+
.provisonUser(cmd.getOptionValue("k"), token, new NewUser(cmd.getOptionValue("h")))
91+
.execute();
7592

76-
Response<User> user = apiService.getUser(token, cmd.getOptionValue("k")).execute();
93+
Response<User> user = apiService.getUser(token, cmd.getOptionValue("k")).execute();
7794

7895

79-
System.out.print("{'apiKey':" + user.body().getApiKey() + ", 'UserId': " + token + "}");
96+
System.out.print("{'apiKey':" + user.body().getApiKey() + ", 'UserId': " + token + "}");
8097

8198

82-
}
99+
}
83100

84101
}

src/main/java/ug/sparkpl/momoapi/Utils/DateTimeTypeConverter.java

-22
This file was deleted.

src/main/java/ug/sparkpl/momoapi/Utils/Utils.java

-167
This file was deleted.

0 commit comments

Comments
 (0)