har page

valfirst · Nov 14, 2024 · 623bb1c · 623bb1c
1 parent 382a96c
commit 623bb1c
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 169 deletions.
diff --git a/browserup-proxy-core/src/main/java/com/browserup/bup/BrowserUpProxyServer.java b/browserup-proxy-core/src/main/java/com/browserup/bup/BrowserUpProxyServer.java
@@ -60,11 +60,11 @@
 import com.browserup.harreader.model.Har;
 import com.browserup.harreader.model.HarEntry;
 import com.browserup.harreader.model.HarLog;
-import com.browserup.harreader.model.HarPage;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.MapMaker;
 import de.sstoehr.harreader.model.HarCreatorBrowser;
+import de.sstoehr.harreader.model.HarPage;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpObject;

diff --git a/browserup-proxy-core/src/main/java/com/browserup/bup/util/BrowserUpProxyUtil.java b/browserup-proxy-core/src/main/java/com/browserup/bup/util/BrowserUpProxyUtil.java
@@ -8,8 +8,8 @@
 import com.browserup.harreader.model.Har;
 import com.browserup.harreader.model.HarEntry;
 import com.browserup.harreader.model.HarLog;
-import com.browserup.harreader.model.HarPage;
 import com.browserup.bup.mitm.exception.UncheckedIOException;
+import de.sstoehr.harreader.model.HarPage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/browserup-proxy-core/src/main/java/com/browserup/harreader/model/HarLog.java b/browserup-proxy-core/src/main/java/com/browserup/harreader/model/HarLog.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import de.sstoehr.harreader.model.HarCreatorBrowser;
+import de.sstoehr.harreader.model.HarPage;
 
 import java.util.List;
 import java.util.Objects;

diff --git a/browserup-proxy-core/src/main/java/com/browserup/harreader/model/HarPage.java b/browserup-proxy-core/src/main/java/com/browserup/harreader/model/HarPage.java
diff --git a/browserup-proxy-core/src/test/groovy/com/browserup/bup/mitmproxy/HarValidationTest.groovy b/browserup-proxy-core/src/test/groovy/com/browserup/bup/mitmproxy/HarValidationTest.groovy
@@ -6,6 +6,7 @@ import com.browserup.bup.proxy.test.util.NewProxyServerTestUtil
 import com.browserup.harreader.model.*
 import de.sstoehr.harreader.model.HarCookie
 import de.sstoehr.harreader.model.HarCreatorBrowser
+import de.sstoehr.harreader.model.HarPage
 import de.sstoehr.harreader.model.HarPostData
 import de.sstoehr.harreader.model.HarPostDataParam
 import org.apache.commons.lang3.StringUtils
@@ -146,13 +147,6 @@ class HarValidationTest extends MockServerTest {
         harLog.entries = Collections.singletonList(harEntry)
         har.log = harLog
 
-        har.log.pages.each {
-            assertNotNull("Expected not null har log pages id", it.id)
-            assertNotNull("Expected not null har log pages title", it.title)
-            assertNotNull("Expected not null har log pages startedDateTime", it.startedDateTime)
-            assertNotNull("Expected not null har log pages pageTimings", it.pageTimings)
-        }
-
         har.log.entries.each {
             assertNotNull("Expected not null har entries startedDateTime", it.startedDateTime)
             assertNotNull("Expected not null har entries time", it.time)

diff --git a/browserup-proxy-core/src/test/groovy/com/browserup/bup/proxy/HarValidationTest.groovy b/browserup-proxy-core/src/test/groovy/com/browserup/bup/proxy/HarValidationTest.groovy
@@ -7,6 +7,7 @@ import com.browserup.bup.proxy.test.util.NewProxyServerTestUtil
 import com.browserup.harreader.model.*
 import de.sstoehr.harreader.model.HarCookie
 import de.sstoehr.harreader.model.HarCreatorBrowser
+import de.sstoehr.harreader.model.HarPage
 import de.sstoehr.harreader.model.HarPostData
 import de.sstoehr.harreader.model.HarPostDataParam
 import org.apache.http.client.methods.HttpGet
@@ -121,13 +122,6 @@ class HarValidationTest extends MockServerTest {
         assertNotNull("Expected not null log creator name", har.log.creator.name)
         assertNotNull("Expected not null log creator version", har.log.creator.version)
 
-        har.log.pages.each {
-            assertNotNull("Expected not null har log pages id", it.id)
-            assertNotNull("Expected not null har log pages title", it.title)
-            assertNotNull("Expected not null har log pages startedDateTime", it.startedDateTime)
-            assertNotNull("Expected not null har log pages pageTimings", it.pageTimings)
-        }
-
         har.log.entries.each {
             assertNotNull("Expected not null har entries startedDateTime", it.startedDateTime)
             assertNotNull("Expected not null har entries time", it.time)

diff --git a/browserup-proxy-core/src/test/java/com/browserup/harreader/model/HarLogTest.java b/browserup-proxy-core/src/test/java/com/browserup/harreader/model/HarLogTest.java
@@ -8,6 +8,7 @@
 
 import java.util.Date;
 
+import de.sstoehr.harreader.model.HarPage;
 import org.junit.Test;
 
 import java.util.ArrayList;

diff --git a/browserup-proxy-core/src/test/java/com/browserup/harreader/model/HarPageTest.java b/browserup-proxy-core/src/test/java/com/browserup/harreader/model/HarPageTest.java