Skip to content

Commit 1a84ba1

Browse files
thomasgrassauerthomasgrassauer
authored
Merge pull request #34 from thomasgrassauer/openkitconstants
OpenKitConstants
2 parents 36171c0 + 2646e05 commit 1a84ba1

File tree

6 files changed

+44
-31
lines changed

6 files changed

+44
-31
lines changed

‎src/main/java/com/dynatrace/openkit/api/OpenKitConstants.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.dynatrace.openkit.api;
2+
3+
/**
4+
* Defines constant values used in OpenKit
5+
*/
6+
public class OpenKitConstants {
7+
8+
// default values used in configuration
9+
public static final String DEFAULT_APPLICATION_VERSION = "0.4";
10+
public static final String DEFAULT_OPERATING_SYSTEM = "OpenKit " + DEFAULT_APPLICATION_VERSION;
11+
public static final String DEFAULT_MANUFACTURER = "Dynatrace";
12+
public static final String DEFAULT_DEVICE_ID = "OpenKitDevice";
13+
14+
}

‎src/main/java/com/dynatrace/openkit/core/DeviceImpl.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,17 @@
66
package com.dynatrace.openkit.core;
77

88
import com.dynatrace.openkit.api.Device;
9+
import com.dynatrace.openkit.api.OpenKitConstants;
910

1011
/**
1112
* Actual implementation of the {@link Device} interface.
1213
*/
1314
public class DeviceImpl implements Device {
1415

15-
public static final String DEFAULT_OPERATING_SYSTEM = "OpenKit 0.3"; // 'OpenKit 0.3'
16-
public static final String DEFAULT_MANUFACTURER = "Dynatrace"; // default: 'Dynatrace'
17-
public static final String DEFAULT_DEVICE_ID = "OpenKitDevice"; // default: 'OpenKitDevice'
18-
1916
// platform information
20-
private String operatingSystem = DEFAULT_OPERATING_SYSTEM;
21-
private String manufacturer = DEFAULT_MANUFACTURER;
22-
private String modelID = DEFAULT_DEVICE_ID;
17+
private String operatingSystem = OpenKitConstants.DEFAULT_OPERATING_SYSTEM;
18+
private String manufacturer = OpenKitConstants.DEFAULT_MANUFACTURER;
19+
private String modelID = OpenKitConstants.DEFAULT_DEVICE_ID;
2320

2421
// *** Device interface methods ***
2522

‎src/main/java/com/dynatrace/openkit/core/configuration/AbstractConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.concurrent.atomic.AtomicBoolean;
99
import java.util.concurrent.atomic.AtomicInteger;
1010

11+
import com.dynatrace.openkit.api.OpenKitConstants;
1112
import com.dynatrace.openkit.core.DeviceImpl;
1213
import com.dynatrace.openkit.protocol.StatusResponse;
1314

@@ -21,7 +22,6 @@ public abstract class AbstractConfiguration {
2122
private static final int DEFAULT_MAX_BEACON_SIZE = 30 * 1024; // default: max 30KB (in B) to send in one beacon
2223
private static final boolean DEFAULT_CAPTURE_ERRORS = true; // default: capture errors on
2324
private static final boolean DEFAULT_CAPTURE_CRASHES = true; // default: capture crashes on
24-
private static final String DEFAULT_APPLICATION_VERSION = "0.3"; // default: '0.3'
2525

2626
// immutable settings
2727
private final String applicationName;
@@ -68,7 +68,7 @@ protected AbstractConfiguration(OpenKitType openKitType, String applicationName,
6868
captureCrashes = new AtomicBoolean(DEFAULT_CAPTURE_CRASHES);
6969

7070
device = new DeviceImpl();
71-
applicationVersion = DEFAULT_APPLICATION_VERSION;
71+
applicationVersion = OpenKitConstants.DEFAULT_APPLICATION_VERSION;
7272
httpClientConfiguration = null;
7373
}
7474

‎src/test/java/com/dynatrace/openkit/test/AbstractAppMonTest.java‎

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

88
import java.util.ArrayList;
99

10+
import com.dynatrace.openkit.api.OpenKitConstants;
1011
import org.junit.Assert;
1112

1213
import com.dynatrace.openkit.protocol.HTTPClient.RequestType;
@@ -18,10 +19,10 @@ public abstract class AbstractAppMonTest extends AbstractTest {
1819
public static final String TEST_APPLICATION_ID = "TestApplicationID";
1920
public static final String TEST_ENDPOINT = "http://localhost/";
2021
public static final String TEST_IP = "123.45.67.89";
21-
public static final String TEST_OPENKIT_DEFAULT_VERSION = "0.3";
22+
public static final String TEST_OPENKIT_DEFAULT_VERSION = OpenKitConstants.DEFAULT_APPLICATION_VERSION;
2223
public static final String TEST_DEVICE_TYPE = "OpenKitDevice";
2324
public static final String TEST_MANUFACTURER = "Dynatrace";
24-
public static final String TEST_OS = "OpenKit+0.3";
25+
public static final String TEST_OS = "OpenKit+" + OpenKitConstants.DEFAULT_APPLICATION_VERSION;
2526

2627
protected String getDefaultEndpoint() {
2728
return TEST_ENDPOINT + "dynaTraceMonitor?type=m&srvid=1&app=" + TEST_APPLICATION_NAME + "&va=7.0.0000&pt=1";

‎src/test/java/com/dynatrace/openkit/test/ConfigurationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.dynatrace.openkit.test;
22

3+
import com.dynatrace.openkit.api.OpenKitConstants;
34
import com.dynatrace.openkit.core.configuration.AbstractConfiguration;
45
import com.dynatrace.openkit.core.configuration.AppMonConfiguration;
56
import com.dynatrace.openkit.core.configuration.DynatraceConfiguration;
@@ -15,7 +16,6 @@ public class ConfigurationTest {
1516
private static final String host = "localhost:9999";
1617
private static final String tenantId = "asdf";
1718
private static final String applicationName = "testApp";
18-
private static final String applicationVersion = "0.3";
1919

2020
@Test
2121
public void saasURLIsCorrect() {
@@ -64,6 +64,6 @@ public void applicationIdAndApplicationNameIdenticalForAppMonConfig() {
6464
public void defaultApplicationVersionIsCorrect() {
6565
AbstractConfiguration configuration = new AppMonConfiguration(applicationName, 17, "", false, new SSLStrictTrustManager());
6666

67-
assertThat(applicationVersion, is(configuration.getApplicationVersion()));
67+
assertThat(configuration.getApplicationVersion(), is(OpenKitConstants.DEFAULT_APPLICATION_VERSION));
6868
}
6969
}

‎src/test/java/com/dynatrace/openkit/test/DeviceImplTest.java‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.dynatrace.openkit.test;
22

3+
import com.dynatrace.openkit.api.OpenKitConstants;
34
import com.dynatrace.openkit.core.DeviceImpl;
45
import org.junit.Test;
56

@@ -12,14 +13,14 @@ public class DeviceImplTest {
1213
public void defaultValueForModelIdIsCorrect() {
1314
DeviceImpl device = new DeviceImpl();
1415

15-
assertThat(DeviceImpl.DEFAULT_DEVICE_ID, is(device.getModelID()));
16+
assertThat(OpenKitConstants.DEFAULT_DEVICE_ID, is(device.getModelID()));
1617
}
1718

1819
@Test
1920
public void settingModelIdUsingValidValue(){
2021
DeviceImpl device = new DeviceImpl();
2122

22-
assertThat(DeviceImpl.DEFAULT_DEVICE_ID, is(device.getModelID()));
23+
assertThat(OpenKitConstants.DEFAULT_DEVICE_ID, is(device.getModelID()));
2324

2425
String validModelId = "testDevice";
2526
device.setModelID(validModelId);
@@ -31,38 +32,38 @@ public void settingModelIdUsingValidValue(){
3132
public void settingModelIdUsingEmptyValue(){
3233
DeviceImpl device = new DeviceImpl();
3334

34-
assertThat(DeviceImpl.DEFAULT_DEVICE_ID, is(device.getModelID()));
35+
assertThat(OpenKitConstants.DEFAULT_DEVICE_ID, is(device.getModelID()));
3536

3637
String emptyModelId = "";
3738
device.setModelID(emptyModelId);
3839

39-
assertThat(DeviceImpl.DEFAULT_DEVICE_ID, is(device.getModelID()));
40+
assertThat(OpenKitConstants.DEFAULT_DEVICE_ID, is(device.getModelID()));
4041
}
4142

4243
@Test
4344
public void settingModelIdUsingUndefinedValue(){
4445
DeviceImpl device = new DeviceImpl();
4546

46-
assertThat(DeviceImpl.DEFAULT_DEVICE_ID, is(device.getModelID()));
47+
assertThat(OpenKitConstants.DEFAULT_DEVICE_ID, is(device.getModelID()));
4748

4849
String undefinedModelId = null;
4950
device.setModelID(undefinedModelId);
5051

51-
assertThat(DeviceImpl.DEFAULT_DEVICE_ID, is(device.getModelID()));
52+
assertThat(OpenKitConstants.DEFAULT_DEVICE_ID, is(device.getModelID()));
5253
}
5354

5455
@Test
5556
public void defaultValueForOperatingSystemIsCorrect() {
5657
DeviceImpl device = new DeviceImpl();
5758

58-
assertThat(DeviceImpl.DEFAULT_OPERATING_SYSTEM, is(device.getOperatingSystem()));
59+
assertThat(OpenKitConstants.DEFAULT_OPERATING_SYSTEM, is(device.getOperatingSystem()));
5960
}
6061

6162
@Test
6263
public void settingOperatingSystemUsingValidValue(){
6364
DeviceImpl device = new DeviceImpl();
6465

65-
assertThat(DeviceImpl.DEFAULT_OPERATING_SYSTEM, is(device.getOperatingSystem()));
66+
assertThat(OpenKitConstants.DEFAULT_OPERATING_SYSTEM, is(device.getOperatingSystem()));
6667

6768
String validModelId = "testDevice";
6869
device.setOperatingSystem(validModelId);
@@ -74,38 +75,38 @@ public void settingOperatingSystemUsingValidValue(){
7475
public void settingOperatingSystemUsingEmptyValue(){
7576
DeviceImpl device = new DeviceImpl();
7677

77-
assertThat(DeviceImpl.DEFAULT_OPERATING_SYSTEM, is(device.getOperatingSystem()));
78+
assertThat(OpenKitConstants.DEFAULT_OPERATING_SYSTEM, is(device.getOperatingSystem()));
7879

7980
String emptyOperatingSystem = "";
8081
device.setOperatingSystem(emptyOperatingSystem);
8182

82-
assertThat(DeviceImpl.DEFAULT_OPERATING_SYSTEM, is(device.getOperatingSystem()));
83+
assertThat(OpenKitConstants.DEFAULT_OPERATING_SYSTEM, is(device.getOperatingSystem()));
8384
}
8485

8586
@Test
8687
public void settingOperatingSystemUsingUndefinedValue(){
8788
DeviceImpl device = new DeviceImpl();
8889

89-
assertThat(DeviceImpl.DEFAULT_OPERATING_SYSTEM, is(device.getOperatingSystem()));
90+
assertThat(OpenKitConstants.DEFAULT_OPERATING_SYSTEM, is(device.getOperatingSystem()));
9091

9192
String undefinedOperatingSystem = null;
9293
device.setOperatingSystem(undefinedOperatingSystem);
9394

94-
assertThat(DeviceImpl.DEFAULT_OPERATING_SYSTEM, is(device.getOperatingSystem()));
95+
assertThat(OpenKitConstants.DEFAULT_OPERATING_SYSTEM, is(device.getOperatingSystem()));
9596
}
9697

9798
@Test
9899
public void defaultValueForMancufacturerModelIdIsCorrect() {
99100
DeviceImpl device = new DeviceImpl();
100101

101-
assertThat(DeviceImpl.DEFAULT_MANUFACTURER, is(device.getManufacturer()));
102+
assertThat(OpenKitConstants.DEFAULT_MANUFACTURER, is(device.getManufacturer()));
102103
}
103104

104105
@Test
105106
public void settingManufacturerUsingValidValue(){
106107
DeviceImpl device = new DeviceImpl();
107108

108-
assertThat(DeviceImpl.DEFAULT_MANUFACTURER, is(device.getManufacturer()));
109+
assertThat(OpenKitConstants.DEFAULT_MANUFACTURER, is(device.getManufacturer()));
109110

110111
String validManufacturer = "testManufacturer";
111112
device.setManufacturer(validManufacturer);
@@ -117,23 +118,23 @@ public void settingManufacturerUsingValidValue(){
117118
public void settingManufacturerUsingEmptyValue(){
118119
DeviceImpl device = new DeviceImpl();
119120

120-
assertThat(DeviceImpl.DEFAULT_MANUFACTURER, is(device.getManufacturer()));
121+
assertThat(OpenKitConstants.DEFAULT_MANUFACTURER, is(device.getManufacturer()));
121122

122123
String emptyManufacturer = "";
123124
device.setManufacturer(emptyManufacturer);
124125

125-
assertThat(DeviceImpl.DEFAULT_MANUFACTURER, is(device.getManufacturer()));
126+
assertThat(OpenKitConstants.DEFAULT_MANUFACTURER, is(device.getManufacturer()));
126127
}
127128

128129
@Test
129130
public void settingManufacturerUsingUndefinedValue(){
130131
DeviceImpl device = new DeviceImpl();
131132

132-
assertThat(DeviceImpl.DEFAULT_MANUFACTURER, is(device.getManufacturer()));
133+
assertThat(OpenKitConstants.DEFAULT_MANUFACTURER, is(device.getManufacturer()));
133134

134135
String undefinedManufacturer = null;
135136
device.setManufacturer(undefinedManufacturer);
136137

137-
assertThat(DeviceImpl.DEFAULT_MANUFACTURER, is(device.getManufacturer()));
138+
assertThat(OpenKitConstants.DEFAULT_MANUFACTURER, is(device.getManufacturer()));
138139
}
139140
}

0 commit comments

Comments
 (0)