From 1a8e0461d37e8aac5af861c44ec9f0fc208b81a5 Mon Sep 17 00:00:00 2001 From: "shiva.bhalla" Date: Wed, 10 Apr 2019 18:29:20 +0530 Subject: [PATCH] camel case and type bug fix --- converter-api/dependency-reduced-pom.xml | 158 ++++----- converter-core/dependency-reduced-pom.xml | 314 +++++++++--------- .../SourceToSourceConverter.java | 2 +- .../BidResponseToOpenRtbConverter.java | 2 +- .../main/java/net/media/openrtb3/OpenRTB.java | 20 +- .../main/java/net/media/openrtb3/Source.java | 6 +- 6 files changed, 251 insertions(+), 251 deletions(-) diff --git a/converter-api/dependency-reduced-pom.xml b/converter-api/dependency-reduced-pom.xml index 971db923..e11d3bff 100644 --- a/converter-api/dependency-reduced-pom.xml +++ b/converter-api/dependency-reduced-pom.xml @@ -1,79 +1,79 @@ - - - - open-rtb-converter - net.media.open-rtb-converter - 1.2.1 - - 4.0.0 - converter-api - 1.2.1 - - - - true - src/main/resources - - *.* - - - - ${project.artifactId}##${project.version} - - - maven-shade-plugin - 2.1 - - - package - - shade - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - net.media.api.ConverterApplication - - - - - - - - - maven-resources-plugin - 3.1.0 - - - woff - woff2 - ttf - eot - otf - svg - ico - - - - - maven-compiler-plugin - - 1.8 - 1.8 - - - - - - + + + + open-rtb-converter + net.media.open-rtb-converter + 1.2.1 + + 4.0.0 + converter-api + 1.2.1 + + + + true + src/main/resources + + *.* + + + + ${project.artifactId}##${project.version} + + + maven-shade-plugin + 2.1 + + + package + + shade + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + net.media.api.ConverterApplication + + + + + + + + + maven-resources-plugin + 3.1.0 + + + woff + woff2 + ttf + eot + otf + svg + ico + + + + + maven-compiler-plugin + + 1.8 + 1.8 + + + + + + diff --git a/converter-core/dependency-reduced-pom.xml b/converter-core/dependency-reduced-pom.xml index c8607297..8322a3e3 100644 --- a/converter-core/dependency-reduced-pom.xml +++ b/converter-core/dependency-reduced-pom.xml @@ -1,157 +1,157 @@ - - - - open-rtb-converter - net.media.open-rtb-converter - 1.2.1 - - 4.0.0 - net.media.open-rtb-converter - converter-core - 1.2.1 - - - - true - src/main/resources - - *.* - - - - ${project.artifactId}##${project.version} - - - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - org.projectlombok - lombok - ${lombok.version} - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 - - - pl.project13.maven - git-commit-id-plugin - 2.1.1 - - - get-the-git-infos - process-resources - - revision - - - - - ${project.basedir}/.git - git - dd.MM.yyyy '@' HH:mm:ss z - true - true - ./target/classes/git.properties - 10 - - false - false - -dirty - true - false - - - - - maven-jar-plugin - 2.4 - - - maven-shade-plugin - 2.1 - - - package - - shade - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - maven-resources-plugin - 3.1.0 - - - woff - woff2 - ttf - eot - otf - svg - ico - - - - - - - - org.hibernate - hibernate-validator - 6.0.5.Final - compile - - - junit - junit - 4.12 - test - - - hamcrest-core - org.hamcrest - - - - - org.skyscreamer - jsonassert - 1.2.3 - test - - - json - org.json - - - - - - + + + + open-rtb-converter + net.media.open-rtb-converter + 1.2.1 + + 4.0.0 + net.media.open-rtb-converter + converter-core + 1.2.1 + + + + true + src/main/resources + + *.* + + + + ${project.artifactId}##${project.version} + + + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + org.projectlombok + lombok + ${lombok.version} + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.2 + + + pl.project13.maven + git-commit-id-plugin + 2.1.1 + + + get-the-git-infos + process-resources + + revision + + + + + ${project.basedir}/.git + git + dd.MM.yyyy '@' HH:mm:ss z + true + true + ./target/classes/git.properties + 10 + + false + false + -dirty + true + false + + + + + maven-jar-plugin + 2.4 + + + maven-shade-plugin + 2.1 + + + package + + shade + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + maven-resources-plugin + 3.1.0 + + + woff + woff2 + ttf + eot + otf + svg + ico + + + + + + + + org.hibernate + hibernate-validator + 6.0.5.Final + compile + + + junit + junit + 4.12 + test + + + hamcrest-core + org.hamcrest + + + + + org.skyscreamer + jsonassert + 1.2.3 + test + + + json + org.json + + + + + + diff --git a/converter-core/src/main/java/net/media/converters/request25toRequest30/SourceToSourceConverter.java b/converter-core/src/main/java/net/media/converters/request25toRequest30/SourceToSourceConverter.java index 360cd382..bb93aa5b 100644 --- a/converter-core/src/main/java/net/media/converters/request25toRequest30/SourceToSourceConverter.java +++ b/converter-core/src/main/java/net/media/converters/request25toRequest30/SourceToSourceConverter.java @@ -48,7 +48,7 @@ public void enhance(Source source, net.media.openrtb3.Source target, Config conf if(source.getExt() == null) return; try { - target.setTs((Integer) source.getExt().get("ts")); + target.setTs((Long) source.getExt().get("ts")); target.setDs((String) source.getExt().get("ds")); target.setDsmap((String) source.getExt().get("dsmap")); target.setCert((String) source.getExt().get("cert")); diff --git a/converter-core/src/main/java/net/media/converters/response25toresponse30/BidResponseToOpenRtbConverter.java b/converter-core/src/main/java/net/media/converters/response25toresponse30/BidResponseToOpenRtbConverter.java index 9cbb7542..00e43945 100644 --- a/converter-core/src/main/java/net/media/converters/response25toresponse30/BidResponseToOpenRtbConverter.java +++ b/converter-core/src/main/java/net/media/converters/response25toresponse30/BidResponseToOpenRtbConverter.java @@ -34,7 +34,7 @@ public OpenRTB map(BidResponse source, Config config, Provider converterProvider */ @Override public void enhance(BidResponse source, OpenRTB target, Config config, Provider converterProvider) throws OpenRtbConverterException{ - target.setDomainSpec("3.0"); + target.setDomainspec("3.0"); Converter converter = converterProvider.fetch(new Conversion<>(BidResponse.class, Response.class)); target.setResponse(converter.map(source, config, converterProvider)); } diff --git a/converter-core/src/main/java/net/media/openrtb3/OpenRTB.java b/converter-core/src/main/java/net/media/openrtb3/OpenRTB.java index 9031e010..563e4d4e 100644 --- a/converter-core/src/main/java/net/media/openrtb3/OpenRTB.java +++ b/converter-core/src/main/java/net/media/openrtb3/OpenRTB.java @@ -9,9 +9,9 @@ public class OpenRTB { private String ver = "3.0"; - private String domainSpec = "adcom"; + private String domainspec = "adcom"; @NotNull - private String domainVer = "1.0"; + private String domainver = "1.0"; @Valid private Request request; @Valid @@ -21,12 +21,12 @@ public String getVer() { return this.ver; } - public String getDomainSpec() { - return this.domainSpec; + public String getDomainspec() { + return this.domainspec; } - public @NotNull String getDomainVer() { - return this.domainVer; + public @NotNull String getDomainver() { + return this.domainver; } public @Valid Request getRequest() { @@ -41,12 +41,12 @@ public void setVer(String ver) { this.ver = ver; } - public void setDomainSpec(String domainSpec) { - this.domainSpec = domainSpec; + public void setDomainspec(String domainspec) { + this.domainspec = domainspec; } - public void setDomainVer(@NotNull String domainVer) { - this.domainVer = domainVer; + public void setDomainver(@NotNull String domainver) { + this.domainver = domainver; } public void setRequest(@Valid Request request) { diff --git a/converter-core/src/main/java/net/media/openrtb3/Source.java b/converter-core/src/main/java/net/media/openrtb3/Source.java index c2c635a1..a1181d6a 100644 --- a/converter-core/src/main/java/net/media/openrtb3/Source.java +++ b/converter-core/src/main/java/net/media/openrtb3/Source.java @@ -4,7 +4,7 @@ public class Source { private String tid; - private Integer ts; + private Long ts; private String ds; private String dsmap; private String cert; @@ -16,7 +16,7 @@ public String getTid() { return this.tid; } - public Integer getTs() { + public Long getTs() { return this.ts; } @@ -48,7 +48,7 @@ public void setTid(String tid) { this.tid = tid; } - public void setTs(Integer ts) { + public void setTs(Long ts) { this.ts = ts; }