Skip to content
Snippets Groups Projects
Commit a473b416 authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

Remove builder, simplify

parent c84183a0
No related branches found
No related tags found
2 merge requests!128Production Release | nshmp-ws-static,!127Resolves - Handle Multiple NetCDF Files for AASHTO Service
...@@ -2,11 +2,9 @@ package gov.usgs.earthquake.nshmp.netcdf.data; ...@@ -2,11 +2,9 @@ package gov.usgs.earthquake.nshmp.netcdf.data;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;
import java.util.List;
import java.util.Map; import java.util.Map;
import gov.usgs.earthquake.nshmp.gmm.Imt; import gov.usgs.earthquake.nshmp.gmm.Imt;
import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass;
/** /**
* NetCDF data for hazard curves. * NetCDF data for hazard curves.
...@@ -17,9 +15,10 @@ public class NetcdfDataHazardCurves extends NetcdfData { ...@@ -17,9 +15,10 @@ public class NetcdfDataHazardCurves extends NetcdfData {
private final Map<Imt, double[]> imls; private final Map<Imt, double[]> imls;
NetcdfDataHazardCurves(Builder builder) { public NetcdfDataHazardCurves(NetcdfData netcdfData, Map<Imt, double[]> imls) {
super(builder); super(NetcdfData.Builder.copyOf(netcdfData));
imls = builder.imls; checkState(!imls.isEmpty(), "Must add imls");
this.imls = imls;
} }
/** /**
...@@ -39,63 +38,4 @@ public class NetcdfDataHazardCurves extends NetcdfData { ...@@ -39,63 +38,4 @@ public class NetcdfDataHazardCurves extends NetcdfData {
public static Builder builder() { public static Builder builder() {
return new Builder(); return new Builder();
} }
public static class Builder extends NetcdfData.Builder {
Map<Imt, double[]> imls;
Builder() {
super();
}
public Builder imls(Map<Imt, double[]> imls) {
this.imls = imls;
return this;
}
@Override
public Builder imts(List<Imt> imts) {
super.imts(imts);
return this;
}
@Override
public Builder latitudes(double[] latitudes) {
super.latitudes(latitudes);
return this;
}
@Override
public Builder longitudes(double[] longitudes) {
super.longitudes(longitudes);
return this;
}
@Override
public Builder scienceBaseMetadata(ScienceBaseMetadata scienceBaseMetadata) {
super.scienceBaseMetadata(scienceBaseMetadata);
return this;
}
@Override
public Builder siteClasses(List<NehrpSiteClass> siteClasses) {
super.siteClasses(siteClasses);
return this;
}
@Override
public Builder vs30Map(Map<NehrpSiteClass, Double> vs30Map) {
super.vs30Map(vs30Map);
return this;
}
public NetcdfDataHazardCurves build() {
checkBuildState();
return new NetcdfDataHazardCurves(this);
}
void checkBuildState() {
super.checkBuildState();
checkState(!imls.isEmpty(), "Must add imls");
}
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment