Skip to content

Commit 6b9510e

Browse files
gondorgondor
committed
Issue #501 
1 parent 4c97f65 commit 6b9510e

File tree

16 files changed

+75
-86
lines changed

16 files changed

+75
-86
lines changed

‎connectors/httpclient/src/main/java/org/openstack4j/connectors/httpclient/HttpClientFactory.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
import org.apache.http.impl.client.HttpClientBuilder;
1111
import org.openstack4j.core.transport.Config;
1212
import org.openstack4j.core.transport.UntrustedSSL;
13+
import org.openstack4j.core.transport.internal.HttpExecutor;
14+
import org.openstack4j.openstack.logging.Logger;
15+
import org.openstack4j.openstack.logging.LoggerFactory;
1316

1417
/**
1518
* Creates the initial HttpClient and keeps it as a singleton to preserve pooling strategies within the Http Client
@@ -20,6 +23,7 @@ public class HttpClientFactory {
2023

2124
public static final HttpClientFactory INSTANCE = new HttpClientFactory();
2225
private static final String USER_AGENT = "OpenStack4j-Agent";
26+
private static final Logger LOG = LoggerFactory.getLogger(HttpExecutor.class);
2327

2428
private CloseableHttpClient client;
2529
private static HttpClientConfigInterceptor INTERCEPTOR;
@@ -59,7 +63,7 @@ private CloseableHttpClient buildClient(Config config) {
5963
HttpHost proxy = new HttpHost(url.getHost(), config.getProxy().getPort(), url.getProtocol());
6064
cb.setProxy(proxy);
6165
} catch (MalformedURLException e) {
62-
e.printStackTrace();
66+
LOG.error(e.getMessage(), e);
6367
}
6468
}
6569

‎connectors/httpclient/src/main/java/org/openstack4j/connectors/httpclient/HttpExecutorServiceImpl.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import org.openstack4j.core.transport.HttpResponse;
1010
import org.openstack4j.openstack.internal.OSAuthenticator;
1111
import org.openstack4j.openstack.internal.OSClientSession;
12+
import org.openstack4j.openstack.logging.Logger;
13+
import org.openstack4j.openstack.logging.LoggerFactory;
1214

1315
/**
1416
* HttpExecutor is the default implementation for HttpExecutorService which is responsible for interfacing with HttpClient and mapping common status codes, requests and responses
@@ -19,6 +21,7 @@
1921
public class HttpExecutorServiceImpl implements HttpExecutorService {
2022

2123
private static final String NAME = "Apache HttpClient Connector";
24+
private static final Logger LOG = LoggerFactory.getLogger(HttpExecutorServiceImpl.class);
2225

2326
/**
2427
* {@inheritDoc}
@@ -32,7 +35,7 @@ public <R> HttpResponse execute(HttpRequest<R> request) {
3235
throw re;
3336
}
3437
catch (Exception e) {
35-
e.printStackTrace();
38+
LOG.error(e.getMessage(), e);
3639
return null;
3740
}
3841
}

‎core/src/main/java/org/openstack4j/core/transport/HttpEntityHandler.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import org.openstack4j.api.exceptions.ResponseException;
88
import org.openstack4j.core.transport.functions.ResponseToActionResponse;
99
import org.openstack4j.model.compute.ActionResponse;
10+
import org.openstack4j.openstack.logging.Logger;
11+
import org.openstack4j.openstack.logging.LoggerFactory;
1012

1113
/**
1214
* Handles retrieving an Entity from an HttpResponse while validating resulting status codes.
@@ -15,6 +17,9 @@
1517
*/
1618
public class HttpEntityHandler {
1719

20+
private static final Logger LOG = LoggerFactory.getLogger(HttpEntityHandler.class);
21+
22+
1823
public static <T> T handle(HttpResponse response, Class<T> returnType, ExecutionOptions<T> options) {
1924
return handle(response, returnType, options, Boolean.FALSE);
2025
}
@@ -70,9 +75,9 @@ private static <T> Handle<T> handle404(Handle<T> handle) {
7075
try {
7176
return handle.complete(handle.getReturnType().newInstance());
7277
} catch (InstantiationException e) {
73-
e.printStackTrace();
78+
LOG.error(e.getMessage(), e);
7479
} catch (IllegalAccessException e) {
75-
e.printStackTrace();
80+
LOG.error(e.getMessage(), e);
7681
}
7782
}
7883

@@ -96,7 +101,7 @@ private static <T> Handle<T> handleLessThan500(Handle<T> handle) {
96101
} catch (ResponseException re) {
97102
throw re;
98103
} catch (Exception e) {
99-
e.printStackTrace();
104+
LOG.error(e.getMessage(), e);
100105
}
101106
}
102107
return handle.continueHandling();
@@ -111,7 +116,7 @@ public static void closeQuietly(HttpResponse response) {
111116
try {
112117
response.close();
113118
} catch (IOException e) {
114-
e.printStackTrace();
119+
LOG.error(e.getMessage(), e);
115120
}
116121
}
117122

‎core/src/main/java/org/openstack4j/core/transport/UntrustedSSL.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
import javax.net.ssl.TrustManager;
1010
import javax.net.ssl.X509TrustManager;
1111

12+
import org.openstack4j.openstack.logging.Logger;
13+
import org.openstack4j.openstack.logging.LoggerFactory;
14+
1215
/**
1316
* Contains an open SSL Context which allows self signed certs and an open hostname verifier
1417
*
@@ -17,7 +20,8 @@
1720
public class UntrustedSSL {
1821

1922
private static final UntrustedSSL INSTANCE = new UntrustedSSL();
20-
23+
private static final Logger LOG = LoggerFactory.getLogger(UntrustedSSL.class);
24+
2125
private SSLContext context;
2226
private HostnameVerifier verifier;
2327

@@ -42,7 +46,7 @@ public boolean verify(String s, SSLSession session) {
4246
} };
4347
}
4448
catch (Throwable t) {
45-
t.printStackTrace();
49+
LOG.error(t.getMessage(), t);
4650
}
4751
}
4852

‎core/src/main/java/org/openstack4j/model/storage/block/Volume.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.openstack4j.common.Buildable;
1010
import org.openstack4j.model.ModelEntity;
1111
import org.openstack4j.model.storage.block.builder.VolumeBuilder;
12+
import org.openstack4j.openstack.logging.LoggerFactory;
1213

1314
import com.fasterxml.jackson.annotation.JsonCreator;
1415
import com.fasterxml.jackson.annotation.JsonValue;
@@ -69,7 +70,7 @@ public static MigrationStatus fromValue(String migrationStatus) {
6970
try {
7071
return valueOf(CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(migrationStatus, "migrationStatus")));
7172
} catch (IllegalArgumentException e) {
72-
e.printStackTrace();
73+
LoggerFactory.getLogger(MigrationStatus.class).error(e.getMessage(), e);
7374
}
7475
}
7576
return NONE;

‎core/src/main/java/org/openstack4j/openstack/compute/domain/actions/BasicActions.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.openstack4j.model.compute.Action;
44
import org.openstack4j.model.compute.RebootType;
5+
import org.openstack4j.openstack.logging.LoggerFactory;
56

67
import com.fasterxml.jackson.annotation.JsonProperty;
78
import com.fasterxml.jackson.annotation.JsonRootName;
@@ -13,7 +14,7 @@
1314
*/
1415
@SuppressWarnings("serial")
1516
public final class BasicActions {
16-
17+
1718
@JsonRootName("pause")
1819
public static class Pause implements ServerAction { }
1920

@@ -128,7 +129,7 @@ public static ServerAction instanceFor(Class<? extends ServerAction> action) {
128129
try {
129130
sa = action.newInstance();
130131
} catch (Throwable t) {
131-
t.printStackTrace();
132+
LoggerFactory.getLogger(ServerAction.class).error(t.getMessage(), t);
132133
}
133134
return sa;
134135
}

‎core/src/main/java/org/openstack4j/openstack/compute/domain/ext/ExtHypervisor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.openstack4j.core.transport.ObjectMapperSingleton;
66
import org.openstack4j.model.compute.ext.Hypervisor;
77
import org.openstack4j.openstack.common.ListResult;
8+
import org.openstack4j.openstack.logging.LoggerFactory;
89

910
import com.fasterxml.jackson.annotation.JsonCreator;
1011
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -210,7 +211,7 @@ public static HypervisorCPUInfo value(String json) {
210211
return ObjectMapperSingleton.getContext(HypervisorCPUInfo.class)
211212
.reader(HypervisorCPUInfo.class).readValue(json);
212213
} catch (Exception e) {
213-
e.printStackTrace();
214+
LoggerFactory.getLogger(HypervisorCPUInfo.class).error(e.getMessage(), e);
214215
}
215216
}
216217
return null;

‎core/src/main/java/org/openstack4j/openstack/compute/internal/ServerServiceImpl.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
import org.openstack4j.openstack.compute.domain.actions.ServerAction;
5252
import org.openstack4j.openstack.compute.functions.ToActionResponseFunction;
5353
import org.openstack4j.openstack.compute.functions.WrapServerIfApplicableFunction;
54+
import org.openstack4j.openstack.logging.Logger;
55+
import org.openstack4j.openstack.logging.LoggerFactory;
5456

5557
/**
5658
* Server Operation API implementation
@@ -59,6 +61,9 @@
5961
*/
6062
public class ServerServiceImpl extends BaseComputeServices implements ServerService {
6163

64+
private static final Logger LOG = LoggerFactory.getLogger(ServerServiceImpl.class);
65+
66+
6267
/**
6368
* {@inheritDoc}
6469
*/
@@ -414,7 +419,7 @@ private int sleep(int ms) {
414419
try {
415420
Thread.sleep(ms);
416421
} catch (InterruptedException e) {
417-
e.printStackTrace();
422+
LOG.error(e.getMessage(), e);
418423
}
419424
return ms;
420425
}

‎core/src/main/java/org/openstack4j/openstack/heat/domain/HeatStackCreate.java‎

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
import org.openstack4j.model.heat.builder.StackCreateBuilder;
1212
import org.openstack4j.openstack.heat.utils.Environment;
1313
import org.openstack4j.openstack.heat.utils.Template;
14+
import org.openstack4j.openstack.logging.Logger;
15+
import org.openstack4j.openstack.logging.LoggerFactory;
1416

1517
import com.fasterxml.jackson.annotation.JsonProperty;
1618
import com.fasterxml.jackson.core.JsonParseException;
@@ -23,7 +25,9 @@
2325
*
2426
*/
2527
public class HeatStackCreate implements StackCreate {
28+
2629
private static final long serialVersionUID = -8775995682456485275L;
30+
private static final Logger LOG = LoggerFactory.getLogger(HeatStackCreate.class);
2731

2832
@JsonProperty("disableRollback")
2933
private boolean disableRollback;
@@ -169,22 +173,9 @@ public StackCreateBuilder templateFromFile(String tplFile) {
169173
Template tpl = new Template(tplFile);
170174
model.template = tpl.getTplContent();
171175
model.files.putAll(tpl.getFiles());
172-
} catch (JsonParseException e) {
173-
// TODO Auto-generated catch block
174-
e.printStackTrace();
175-
} catch (MalformedURLException e) {
176-
// TODO Auto-generated catch block
177-
e.printStackTrace();
178-
} catch (UnsupportedEncodingException e) {
179-
// TODO Auto-generated catch block
180-
e.printStackTrace();
181-
} catch (IOException e) {
182-
// TODO Auto-generated catch block
183-
e.printStackTrace();
184-
} catch (URISyntaxException e) {
185-
// TODO Auto-generated catch block
186-
e.printStackTrace();
187-
}
176+
} catch (Exception e) {
177+
LOG.error(e.getMessage(), e);
178+
}
188179
return this;
189180
}
190181

@@ -201,26 +192,13 @@ public StackCreateBuilder environment(String environment){
201192
}
202193

203194
@Override
204-
public StackCreateBuilder environmentFromFile(String envFile){
195+
public StackCreateBuilder environmentFromFile(String envFile) {
205196
try {
206197
Environment env = new Environment(envFile);
207198
model.environment = env.getEnvContent();
208199
model.files.putAll(env.getFiles());
209-
} catch (JsonParseException e) {
210-
// TODO Auto-generated catch block
211-
e.printStackTrace();
212-
} catch (MalformedURLException e) {
213-
// TODO Auto-generated catch block
214-
e.printStackTrace();
215-
} catch (UnsupportedEncodingException e) {
216-
// TODO Auto-generated catch block
217-
e.printStackTrace();
218-
} catch (IOException e) {
219-
// TODO Auto-generated catch block
220-
e.printStackTrace();
221-
} catch (URISyntaxException e) {
222-
// TODO Auto-generated catch block
223-
e.printStackTrace();
200+
} catch (Exception e) {
201+
LOG.error(e.getMessage(), e);
224202
}
225203
return this;
226204
}

‎core/src/main/java/org/openstack4j/openstack/heat/domain/HeatStackUpdate.java‎

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
import org.openstack4j.model.heat.builder.StackUpdateBuilder;
1212
import org.openstack4j.openstack.heat.utils.Environment;
1313
import org.openstack4j.openstack.heat.utils.Template;
14+
import org.openstack4j.openstack.logging.Logger;
15+
import org.openstack4j.openstack.logging.LoggerFactory;
1416

1517
import com.fasterxml.jackson.annotation.JsonProperty;
1618
import com.fasterxml.jackson.core.JsonParseException;
@@ -23,7 +25,8 @@
2325
public class HeatStackUpdate implements StackUpdate {
2426

2527
private static final long serialVersionUID = 1L;
26-
28+
private static final Logger LOG = LoggerFactory.getLogger(HeatStackUpdate.class);
29+
2730
@JsonProperty("template")
2831
private String template;
2932
@JsonProperty("template_url")
@@ -103,22 +106,9 @@ public StackUpdateBuilder templateFromFile(String tplFile) {
103106
Template tpl = new Template(tplFile);
104107
model.template = tpl.getTplContent();
105108
model.files.putAll(tpl.getFiles());
106-
} catch (JsonParseException e) {
107-
// TODO Auto-generated catch block
108-
e.printStackTrace();
109-
} catch (MalformedURLException e) {
110-
// TODO Auto-generated catch block
111-
e.printStackTrace();
112-
} catch (UnsupportedEncodingException e) {
113-
// TODO Auto-generated catch block
114-
e.printStackTrace();
115-
} catch (IOException e) {
116-
// TODO Auto-generated catch block
117-
e.printStackTrace();
118-
} catch (URISyntaxException e) {
119-
// TODO Auto-generated catch block
120-
e.printStackTrace();
121-
}
109+
} catch (Exception e) {
110+
LOG.error(e.getMessage(), e);
111+
}
122112
return this;
123113
}
124114

@@ -152,22 +142,9 @@ public StackUpdateBuilder environmentFromFile(String envFile){
152142
Environment env = new Environment(envFile);
153143
model.environment = env.getEnvContent();
154144
model.files.putAll(env.getFiles());
155-
} catch (JsonParseException e) {
156-
// TODO Auto-generated catch block
157-
e.printStackTrace();
158-
} catch (MalformedURLException e) {
159-
// TODO Auto-generated catch block
160-
e.printStackTrace();
161-
} catch (UnsupportedEncodingException e) {
162-
// TODO Auto-generated catch block
163-
e.printStackTrace();
164-
} catch (IOException e) {
165-
// TODO Auto-generated catch block
166-
e.printStackTrace();
167-
} catch (URISyntaxException e) {
168-
// TODO Auto-generated catch block
169-
e.printStackTrace();
170-
}
145+
} catch (Exception e) {
146+
LOG.error(e.getMessage(), e);
147+
}
171148
return this;
172149
}
173150

0 commit comments

Comments
 (0)