Skip to content

Commit e70727c

Browse files
brianksorensenbrianksorensen
committed
merge clean-up
1 parent 5b4c44e commit e70727c

File tree

21 files changed

+543
-33
lines changed

21 files changed

+543
-33
lines changed

‎data-services/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.atg.openssp</groupId>
66
<artifactId>open-ssp-data-services</artifactId>
7-
<version>0.1-SNAPSHOT</version>
7+
<version>0.1</version>
88
<name>open-ssp-data-services</name>
99
<url>http://maven.apache.org</url>
1010
<packaging>war</packaging>
@@ -125,17 +125,17 @@
125125
<dependency>
126126
<groupId>com.atg.openssp</groupId>
127127
<artifactId>open-ssp-common</artifactId>
128-
<version>0.3-SNAPSHOT</version>
128+
<version>0.3</version>
129129
</dependency>
130130
<dependency>
131131
<groupId>com.atg.openssp</groupId>
132132
<artifactId>core</artifactId>
133-
<version>0.3-SNAPSHOT</version>
133+
<version>0.3</version>
134134
</dependency>
135135
<dependency>
136136
<groupId>com.atg.openssp</groupId>
137137
<artifactId>open-ssp-openrtb</artifactId>
138-
<version>0.3-SNAPSHOT</version>
138+
<version>0.3</version>
139139
</dependency>
140140

141141
</dependencies>

‎data-services/src/main/java/com/atg/openssp/dataprovider/service/LoginService.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.atg.openssp.common.exception.RequestException;
44
import com.atg.openssp.core.system.LocalContext;
5-
import com.atg.openssp.dataprovider.provider.handler.AppDataHandler;
65
import com.atg.openssp.dataprovider.provider.handler.LoginHandler;
76
import com.atg.openssp.dataprovider.provider.handler.DataHandler;
87

‎data-sim-client/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.atg.openssp</groupId>
77
<artifactId>open-ssp-dsp-sim-client</artifactId>
8-
<version>0.1-SNAPSHOT</version>
8+
<version>0.1</version>
99
<name>open-ssp-dsp-sim-client</name>
1010
<url>http://maven.apache.org</url>
1111
<properties>
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.atg.openssp</groupId>
3939
<artifactId>open-ssp-common</artifactId>
40-
<version>0.3-SNAPSHOT</version>
40+
<version>0.3</version>
4141
</dependency>
4242

4343
</dependencies>

‎dsp-sim/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.atg.openssp</groupId>
77
<artifactId>open-ssp-dsp-sim</artifactId>
8-
<version>0.1-SNAPSHOT</version>
8+
<version>0.1</version>
99
<name>open-ssp-dsp-sim</name>
1010
<url>http://maven.apache.org</url>
1111
<properties>
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>com.atg.openssp</groupId>
2929
<artifactId>open-ssp-common</artifactId>
30-
<version>0.3-SNAPSHOT</version>
30+
<version>0.3</version>
3131
</dependency>
3232

3333
</dependencies>

‎open-ssp-parent/channel-adserver/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.atg.openssp</groupId>
66
<artifactId>open-ssp-parent</artifactId>
7-
<version>0.2</version>
7+
<version>0.3</version>
88
</parent>
99
<artifactId>channel-adserver</artifactId>
1010

‎open-ssp-parent/core/pom.xml

+47-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.atg.openssp</groupId>
1010
<artifactId>open-ssp-parent</artifactId>
11-
<version>0.2</version>
11+
<version>0.3</version>
1212
</parent>
1313
<artifactId>core</artifactId>
1414
<name>core</name>
@@ -31,15 +31,36 @@
3131
<groupId>org.apache.maven.plugins</groupId>
3232
<artifactId>maven-surefire-plugin</artifactId>
3333
<configuration>
34-
<encoding>UTF-8</encoding>
3534
<systemProperties>
35+
<encoding>UTF-8</encoding>
3636
<property>
3737
<name>catalina.home</name>
3838
<value>${my.dev.catalina.home}</value>
3939
</property>
4040
</systemProperties>
4141
</configuration>
4242
</plugin>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-install-plugin</artifactId>
46+
<executions>
47+
<execution>
48+
<phase>install</phase>
49+
<goals>
50+
<goal>install-file</goal>
51+
</goals>
52+
<configuration>
53+
<packaging>jar</packaging>
54+
<artifactId>${project.artifactId}</artifactId>
55+
<groupId>${project.groupId}</groupId>
56+
<version>${project.version}</version>
57+
<file>
58+
${project.build.directory}/open-ssp.jar
59+
</file>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
</plugin>
4364
</plugins>
4465
</build>
4566
</profile>
@@ -72,6 +93,7 @@
7293
<outputFile>
7394
${project.build.outputDirectory}/app.properties
7495
</outputFile>
96+
<properties/>
7597
</configuration>
7698
<executions>
7799
<execution>
@@ -88,6 +110,22 @@
88110
<artifactId>maven-war-plugin</artifactId>
89111
<version>2.6</version>
90112
</plugin>
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-jar-plugin</artifactId>
116+
<version>3.0.2</version>
117+
<executions>
118+
<execution>
119+
<id>make-a-jar</id>
120+
<phase>compile</phase>
121+
<goals>
122+
<goal>jar</goal>
123+
</goals>
124+
<configuration>
125+
</configuration>
126+
</execution>
127+
</executions>
128+
</plugin>
91129
</plugins>
92130
</build>
93131

@@ -182,6 +220,13 @@
182220
<scope>test</scope>
183221
</dependency>
184222

223+
<!-- https://mvnrepository.com/artifact/com.lmax/disruptor -->
224+
<dependency>
225+
<groupId>com.lmax</groupId>
226+
<artifactId>disruptor</artifactId>
227+
<version>3.3.0</version>
228+
</dependency>
229+
185230
<!-- <dependency> <groupId>org.cache2k</groupId> <artifactId>cache2k-api</artifactId>
186231
<version>${cache2k-version}</version> <scope>provided</scope> </dependency> -->
187232

‎open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/dto/AppDto.java

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package com.atg.openssp.core.cache.broker.dto;
2+
3+
import openrtb.bidrequest.model.App;
4+
5+
import java.io.Serializable;
6+
import java.util.List;
7+
8+
/**
9+
*
10+
* @author André Schmer
11+
*
12+
*/
13+
public class AppDto implements Serializable {
14+
15+
private static final long serialVersionUID = 6743606462533687452L;
16+
17+
private List<App> apps;
18+
19+
public AppDto() {}
20+
21+
public List<App> getApps() {
22+
return apps;
23+
}
24+
25+
public void setSupplier(final List<App> apps) {
26+
this.apps = apps;
27+
}
28+
29+
@Override
30+
public String toString() {
31+
return String.format("AppDto [apps=%s]", apps);
32+
}
33+
34+
}

‎open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/remote/AbstractRemoteDataProvider.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@
1010
import com.atg.openssp.common.configuration.ContextCache;
1111
import com.atg.openssp.common.configuration.ContextProperties;
1212
import com.atg.openssp.common.exception.EmptyHostException;
13-
13+
import org.slf4j.Logger;
14+
import org.slf4j.LoggerFactory;
1415
import restful.client.RemoteDataProviderConnector;
1516
import restful.context.PathBuilder;
1617
import restful.exception.RestException;
1718

19+
import java.net.URI;
20+
import java.net.URISyntaxException;
21+
1822
/**
1923
* @author André Schmer
2024
*
@@ -33,11 +37,11 @@ protected PathBuilder getDefaulPathBuilder() throws EmptyHostException {
3337
final PathBuilder pathBuilder = new PathBuilder();
3438

3539
try {
36-
final URI remoteEndpintURI = new URI(ContextCache.instance.get(ContextProperties.DATA_PROVIDER_URL));
40+
final URI remoteEndpintURI = new URI(ContextCache.instance.get(ContextProperties.DATA_PROVIDER_HOST));
3741
if (remoteEndpintURI.getHost() == null) {
3842
throw new EmptyHostException("No Host is defined, see data-provider-url in global.runtime.xml");
3943
}
40-
pathBuilder.setServer(remoteEndpintURI.getHost());
44+
pathBuilder.setHost(remoteEndpintURI.getHost());
4145
if (remoteEndpintURI.getScheme() == null) {
4246
pathBuilder.setScheme("http");
4347
} else {

‎open-ssp-parent/core/src/main/java/com/atg/openssp/core/system/LocalContext.java

+96-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
import com.atg.openssp.common.configuration.Context;
66
import com.atg.openssp.common.configuration.ContextCache;
77
import com.atg.openssp.common.configuration.ContextProperties;
8+
import com.atg.openssp.core.system.properties.MavenProperties;
9+
10+
import java.time.LocalDateTime;
811

912
/**
1013
* @author André Schmer
@@ -28,10 +31,38 @@ public class LocalContext extends Context {
2831

2932
private static boolean isMetricsEnabled;
3033

31-
private static String sspVersion;
34+
private static String sspVersion = new MavenProperties().getVersion();
35+
3236

3337
private static boolean isSspChannelEnabled;
3438

39+
//#######################################
40+
private static boolean isAppDataServiceEnabled = false;
41+
42+
private static boolean isCurrencyDataServiceEnabled = false;
43+
44+
private static boolean isLoginServiceEnabled = false;
45+
46+
private static boolean isPricelayerDataServiceEnabled = false;
47+
48+
private static boolean isSiteDataServiceEnabled = false;
49+
50+
private static boolean isSupplierDataServiceEnabled = false;
51+
52+
private static String appDataHandlerClass;
53+
54+
private static String currencyDataHandlerClass;
55+
56+
private static String loginHandlerClass;
57+
58+
private static String pricelayerDataHandlerClass;
59+
60+
private static String siteDataHandlerClass;
61+
62+
private static String supplierDataHandlerClass;
63+
//#######################################
64+
65+
3566
static {
3667
initData();
3768
}
@@ -43,6 +74,20 @@ public static void refreshContext() {
4374
isSspChannelEnabled = Boolean.parseBoolean(ContextCache.instance.get(ContextProperties.SSPCHANNEL));
4475
isVerboseEnabled = Boolean.parseBoolean(ContextCache.instance.get(ContextProperties.VERBOSE));
4576
isMetricsEnabled = Boolean.parseBoolean(ContextCache.instance.get(ContextProperties.METRICS));
77+
78+
isAppDataServiceEnabled = Boolean.parseBoolean(ContextCache.instance.get(ContextProperties.APP_DATA_SERVICE_ENABLED));
79+
isCurrencyDataServiceEnabled = Boolean.parseBoolean(ContextCache.instance.get(ContextProperties.CURRENCY_DATA_SERVICE_ENABLED));
80+
isLoginServiceEnabled = Boolean.parseBoolean(ContextCache.instance.get(ContextProperties.LOGIN_SERVICE_ENABLED));
81+
isPricelayerDataServiceEnabled = Boolean.parseBoolean(ContextCache.instance.get(ContextProperties.PRICELAYER_DATA_SERVICE_ENABLED));
82+
isSiteDataServiceEnabled = Boolean.parseBoolean(ContextCache.instance.get(ContextProperties.SITE_DATA_SERVICE_ENABLED));
83+
isSupplierDataServiceEnabled = Boolean.parseBoolean(ContextCache.instance.get(ContextProperties.SUPPLIER_DATA_SERVICE_ENABLED));
84+
85+
appDataHandlerClass = ContextCache.instance.get(ContextProperties.APP_DATA_HANDLER_CLASS);
86+
currencyDataHandlerClass = ContextCache.instance.get(ContextProperties.CURRENCY_DATA_HANDLER_CLASS);
87+
loginHandlerClass = ContextCache.instance.get(ContextProperties.LOGIN_HANDLER_CLASS);
88+
pricelayerDataHandlerClass = ContextCache.instance.get(ContextProperties.PRICELAYER_DATA_HANDLER_CLASS);
89+
siteDataHandlerClass = ContextCache.instance.get(ContextProperties.SITE_DATA_HANDLER_CLASS);
90+
supplierDataHandlerClass = ContextCache.instance.get(ContextProperties.SUPPLIER_DATA_HANDLER_CLASS);
4691
}
4792

4893
private static void initData() {
@@ -108,4 +153,54 @@ static void setVersion(final String version) {
108153
static String getVersion() {
109154
return sspVersion;
110155
}
156+
157+
158+
public static boolean isAppDataServiceEnabled() {
159+
return isAppDataServiceEnabled;
160+
}
161+
162+
public static boolean isCurrencyDataServiceEnabled() {
163+
return isCurrencyDataServiceEnabled;
164+
}
165+
166+
public static boolean isLoginServiceEnabled() {
167+
return isLoginServiceEnabled;
168+
}
169+
170+
public static boolean isPricelayerDataServiceEnabled() {
171+
return isPricelayerDataServiceEnabled;
172+
}
173+
174+
public static boolean isSiteDataServiceEnabled() {
175+
return isSiteDataServiceEnabled;
176+
}
177+
178+
public static boolean isSupplierDataServiceEnabled() {
179+
return isSupplierDataServiceEnabled;
180+
}
181+
182+
public static String getAppDataHandlerClass() {
183+
return appDataHandlerClass;
184+
}
185+
186+
public static String getCurrencyDataHandlerClass() {
187+
return currencyDataHandlerClass;
188+
}
189+
190+
public static String getLoginHandlerClass() {
191+
return loginHandlerClass;
192+
}
193+
194+
public static String getPricelayerDataHandlerClass() {
195+
return pricelayerDataHandlerClass;
196+
}
197+
198+
public static String getSiteDataHandlerClass() {
199+
return siteDataHandlerClass;
200+
}
201+
202+
public static String getSupplierDataHandlerClass() {
203+
return supplierDataHandlerClass;
204+
}
205+
111206
}

0 commit comments

Comments
 (0)