Skip to content

Commit 28bd1cd

Browse files
jimirocksjimirocks
committed
Split SDK into model and service modules
1 parent 9c10b2b commit 28bd1cd

File tree

1,145 files changed

+8807
-2435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,145 files changed

+8807
-2435
lines changed

‎findBugsFilter.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<FindBugsFilter>
33
<Match>
4-
<Class name="com.gooddata.executeafm.result.ExecutionResult" />
4+
<Class name="com.gooddata.sdk.executeafm.result.ExecutionResult" />
55
<Bug pattern="URF_UNREAD_FIELD" />
66
</Match>
77
</FindBugsFilter>

‎gooddata-java-model/pom.xml‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<artifactId>gooddata-java-model</artifactId>
8+
9+
<parent>
10+
<artifactId>gooddata-java-parent</artifactId>
11+
<groupId>com.gooddata</groupId>
12+
<version>3.0.0-RC.1-SNAPSHOT</version>
13+
</parent>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>com.gooddata</groupId>
18+
<artifactId>gooddata-rest-common</artifactId>
19+
</dependency>
20+
<dependency>
21+
<groupId>org.springframework</groupId>
22+
<artifactId>spring-core</artifactId>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.springframework</groupId>
26+
<artifactId>spring-web</artifactId>
27+
<exclusions>
28+
<exclusion>
29+
<groupId>aopalliance</groupId>
30+
<artifactId>aopalliance</artifactId>
31+
</exclusion>
32+
<exclusion>
33+
<groupId>org.springframework</groupId>
34+
<artifactId>spring-aop</artifactId>
35+
</exclusion>
36+
</exclusions>
37+
</dependency>
38+
<dependency>
39+
<groupId>com.fasterxml.jackson.core</groupId>
40+
<artifactId>jackson-core</artifactId>
41+
</dependency>
42+
<dependency>
43+
<groupId>com.fasterxml.jackson.core</groupId>
44+
<artifactId>jackson-annotations</artifactId>
45+
</dependency>
46+
<dependency>
47+
<groupId>com.fasterxml.jackson.core</groupId>
48+
<artifactId>jackson-databind</artifactId>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.commons</groupId>
52+
<artifactId>commons-lang3</artifactId>
53+
</dependency>
54+
<dependency>
55+
<groupId>joda-time</groupId>
56+
<artifactId>joda-time</artifactId>
57+
</dependency>
58+
59+
<dependency>
60+
<groupId>org.testng</groupId>
61+
<artifactId>testng</artifactId>
62+
<scope>test</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.mockito</groupId>
66+
<artifactId>mockito-core</artifactId>
67+
<scope>test</scope>
68+
</dependency>
69+
<dependency>
70+
<groupId>org.hamcrest</groupId>
71+
<artifactId>hamcrest</artifactId>
72+
<scope>test</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>net.javacrumbs.json-unit</groupId>
76+
<artifactId>json-unit</artifactId>
77+
<scope>test</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>net.javacrumbs.json-unit</groupId>
81+
<artifactId>json-unit-core</artifactId>
82+
<scope>test</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>com.shazam</groupId>
86+
<artifactId>shazamcrest</artifactId>
87+
<scope>test</scope>
88+
</dependency>
89+
<dependency>
90+
<groupId>nl.jqno.equalsverifier</groupId>
91+
<artifactId>equalsverifier</artifactId>
92+
<scope>test</scope>
93+
</dependency>
94+
<dependency>
95+
<groupId>commons-io</groupId>
96+
<artifactId>commons-io</artifactId>
97+
<scope>test</scope>
98+
</dependency>
99+
<dependency>
100+
<groupId>org.spockframework</groupId>
101+
<artifactId>spock-core</artifactId>
102+
<scope>test</scope>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.codehaus.groovy</groupId>
106+
<artifactId>groovy-all</artifactId>
107+
<scope>test</scope>
108+
</dependency>
109+
<dependency>
110+
<groupId>cglib</groupId>
111+
<artifactId>cglib-nodep</artifactId>
112+
<scope>test</scope>
113+
</dependency>
114+
</dependencies>
115+
116+
<build>
117+
<plugins>
118+
<plugin>
119+
<groupId>org.codehaus.gmavenplus</groupId>
120+
<artifactId>gmavenplus-plugin</artifactId>
121+
</plugin>
122+
</plugins>
123+
</build>
124+
125+
</project>

src/main/java/com/gooddata/account/Account.java renamed to gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Account.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
* Copyright (C) 2004-2017, GoodData(R) Corporation. All rights reserved.
2+
* Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved.
33
* This source code is licensed under the BSD-style license found in the
44
* LICENSE.txt file in the root directory of this source tree.
55
*/
6-
package com.gooddata.account;
6+
package com.gooddata.sdk.model.account;
77

88
import com.fasterxml.jackson.annotation.JsonCreator;
99
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -193,7 +193,12 @@ public String getProjects() {
193193
}
194194
}
195195

196-
static String getId(String uri) {
196+
/**
197+
* Extract Account's ID from Account's URI
198+
* @param uri Account's URI
199+
* @return Account's ID extracted from URI
200+
*/
201+
public static String getId(String uri) {
197202
return TEMPLATE.match(uri).get("id");
198203
}
199204

@@ -205,6 +210,6 @@ public String toString() {
205210
/**
206211
* Class representing update view of account
207212
*/
208-
static class UpdateView {
213+
public static class UpdateView {
209214
}
210215
}

src/main/java/com/gooddata/auditevent/AuditEvent.java renamed to gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
* Copyright (C) 2004-2017, GoodData(R) Corporation. All rights reserved.
2+
* Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved.
33
* This source code is licensed under the BSD-style license found in the
44
* LICENSE.txt file in the root directory of this source tree.
55
*/
6-
package com.gooddata.auditevent;
6+
package com.gooddata.sdk.model.auditevent;
77

88
import com.fasterxml.jackson.annotation.JsonCreator;
99
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/com/gooddata/auditevent/AuditEvents.java renamed to gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEvents.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
* Copyright (C) 2004-2017, GoodData(R) Corporation. All rights reserved.
2+
* Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved.
33
* This source code is licensed under the BSD-style license found in the
44
* LICENSE.txt file in the root directory of this source tree.
55
*/
6-
package com.gooddata.auditevent;
6+
package com.gooddata.sdk.model.auditevent;
77

88
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
99
import com.fasterxml.jackson.annotation.JsonTypeInfo;

src/main/java/com/gooddata/auditevent/AuditEventsDeserializer.java renamed to gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEventsDeserializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
* Copyright (C) 2004-2017, GoodData(R) Corporation. All rights reserved.
2+
* Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved.
33
* This source code is licensed under the BSD-style license found in the
44
* LICENSE.txt file in the root directory of this source tree.
55
*/
6-
package com.gooddata.auditevent;
6+
package com.gooddata.sdk.model.auditevent;
77

88
import com.gooddata.collections.PageableListDeserializer;
99
import com.gooddata.collections.Paging;

src/main/java/com/gooddata/auditevent/AuditEventsSerializer.java renamed to gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEventsSerializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
* Copyright (C) 2004-2017, GoodData(R) Corporation. All rights reserved.
2+
* Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved.
33
* This source code is licensed under the BSD-style license found in the
44
* LICENSE.txt file in the root directory of this source tree.
55
*/
6-
package com.gooddata.auditevent;
6+
package com.gooddata.sdk.model.auditevent;
77

88
import com.gooddata.collections.PageableListSerializer;
99

src/main/java/com/gooddata/connector/ConnectorType.java renamed to gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ConnectorType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
* Copyright (C) 2004-2017, GoodData(R) Corporation. All rights reserved.
2+
* Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved.
33
* This source code is licensed under the BSD-style license found in the
44
* LICENSE.txt file in the root directory of this source tree.
55
*/
6-
package com.gooddata.connector;
6+
package com.gooddata.sdk.model.connector;
77

88
/**
99
* Enum containing implemented connector types.

src/main/java/com/gooddata/connector/CoupaInstance.java renamed to gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/CoupaInstance.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
/*
2-
* Copyright (C) 2004-2017, GoodData(R) Corporation. All rights reserved.
2+
* Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved.
33
* This source code is licensed under the BSD-style license found in the
44
* LICENSE.txt file in the root directory of this source tree.
55
*/
6-
package com.gooddata.connector;
6+
package com.gooddata.sdk.model.connector;
77

88
import static com.gooddata.util.Validate.notEmpty;
99

1010
import com.fasterxml.jackson.annotation.*;
1111
import com.gooddata.util.GoodDataToStringBuilder;
1212

13-
import java.util.Objects;
14-
1513
/**
1614
* Coupa connector instance.
1715
*/

src/main/java/com/gooddata/connector/CoupaInstances.java renamed to gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/CoupaInstances.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
* Copyright (C) 2004-2017, GoodData(R) Corporation. All rights reserved.
2+
* Copyright (C) 2004-2019, GoodData(R) Corporation. All rights reserved.
33
* This source code is licensed under the BSD-style license found in the
44
* LICENSE.txt file in the root directory of this source tree.
55
*/
6-
package com.gooddata.connector;
6+
package com.gooddata.sdk.model.connector;
77

88
import com.fasterxml.jackson.annotation.*;
99

@@ -16,9 +16,9 @@
1616
@JsonTypeName("coupaInstances")
1717
@JsonTypeInfo(include = JsonTypeInfo.As.WRAPPER_OBJECT, use = JsonTypeInfo.Id.NAME)
1818
@JsonIgnoreProperties(ignoreUnknown = true)
19-
class CoupaInstances {
19+
public class CoupaInstances {
2020

21-
static final String URL = "/gdc/projects/{project}/connectors/coupa/integration/config/settings/instances";
21+
public static final String URL = "/gdc/projects/{project}/connectors/coupa/integration/config/settings/instances";
2222

2323
private final Collection<CoupaInstance> items;
2424

@@ -27,7 +27,7 @@ private CoupaInstances(@JsonProperty("items") List<CoupaInstance> items) {
2727
this.items = items;
2828
}
2929

30-
Collection<CoupaInstance> getItems() {
30+
public Collection<CoupaInstance> getItems() {
3131
return items;
3232
}
3333
}

0 commit comments

Comments
 (0)