zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-31 09:44:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove registrar certificate state dead code

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=130418304
This commit is contained in:
mcilwain 2016-08-16 10:36:31 -07:00 • committed by Ben McIlwain
parent 0e794c790a
commit 467286d79e
2 changed files with 0 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
java/google/registry/model/registrar/Registrar.java
View file

@ -21,7 +21,6 @@ import static com.google.common.base.Predicates.equalTo;
import static com.google.common.base.Predicates.in; import static com.google.common.base.Predicates.in;
import static com.google.common.base.Predicates.notNull; import static com.google.common.base.Predicates.notNull;
import static com.google.common.base.Strings.emptyToNull; import static com.google.common.base.Strings.emptyToNull;
import static com.google.common.base.Strings.isNullOrEmpty;
import static com.google.common.base.Strings.nullToEmpty; import static com.google.common.base.Strings.nullToEmpty;
import static com.google.common.collect.Sets.immutableEnumSet; import static com.google.common.collect.Sets.immutableEnumSet;
import static com.google.common.io.BaseEncoding.base64; import static com.google.common.io.BaseEncoding.base64;
@ -162,10 +161,6 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
private static final RegistryEnvironment ENVIRONMENT = RegistryEnvironment.get(); private static final RegistryEnvironment ENVIRONMENT = RegistryEnvironment.get();
/** Reports the type of data on file re: registrar certificates (full cert, hash only, none). */
// Note: May be unnecessary, pending a conversation on how to best report on this data.
public enum CertificateState { NONE, CERTIFICATE_HASH, CERTIFICATE }
/** Regex for E.164 phone number format specified by {@code contact.xsd}. */ /** Regex for E.164 phone number format specified by {@code contact.xsd}. */
private static final Pattern E164_PATTERN = Pattern.compile("\\+[0-9]{1,3}\\.[0-9]{1,14}"); private static final Pattern E164_PATTERN = Pattern.compile("\\+[0-9]{1,3}\\.[0-9]{1,14}");
@ -407,16 +402,6 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
return ACTIVE_STATES.contains(state) && PUBLICLY_VISIBLE_TYPES.contains(type); return ACTIVE_STATES.contains(state) && PUBLICLY_VISIBLE_TYPES.contains(type);
} }
public CertificateState getCertificateState() {
if (!isNullOrEmpty(clientCertificate)) {
return CertificateState.CERTIFICATE;
} else if (!isNullOrEmpty(clientCertificateHash)) {
return CertificateState.CERTIFICATE_HASH;
} else {
return CertificateState.NONE;
}
}
public String getClientCertificate() { public String getClientCertificate() {
return clientCertificate; return clientCertificate;
} }

15
javatests/google/registry/model/registrar/RegistrarTest.java
View file

@ -30,7 +30,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import google.registry.model.EntityTestCase; import google.registry.model.EntityTestCase;
import google.registry.model.common.EntityGroupRoot; import google.registry.model.common.EntityGroupRoot;
import google.registry.model.registrar.Registrar.CertificateState;
import google.registry.model.registrar.Registrar.State; import google.registry.model.registrar.Registrar.State;
import google.registry.model.registrar.Registrar.Type; import google.registry.model.registrar.Registrar.Type;
import google.registry.testing.ExceptionRule; import google.registry.testing.ExceptionRule;
@ -217,20 +216,6 @@ public class RegistrarTest extends EntityTestCase {
assertThat(registrar.getFailoverClientCertificateHash()).isNull(); assertThat(registrar.getFailoverClientCertificateHash()).isNull();
} }
@Test
public void testSuccess_certificateStates() throws Exception {
// Initialized registrar should have the full certificate.
assertThat(registrar.getCertificateState()).isEqualTo(CertificateState.CERTIFICATE);
// Setting a null certificate will also reset the hash.
registrar = registrar.asBuilder().setClientCertificate(null, clock.nowUtc()).build();
assertThat(registrar.getCertificateState()).isEqualTo(CertificateState.NONE);
// Set client certificate hash explicitly.
registrar = registrar.asBuilder().setClientCertificateHash(SAMPLE_CERT_HASH).build();
assertThat(registrar.getCertificateState()).isEqualTo(CertificateState.CERTIFICATE_HASH);
}
@Test @Test
public void testSuccess_clearingIanaAndBillingIds() throws Exception { public void testSuccess_clearingIanaAndBillingIds() throws Exception {
registrar.asBuilder() registrar.asBuilder()