From 6d37c666a849cb5a96dd9e926a7290ba4ed297cc Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Mon, 18 May 2015 10:19:02 +1000 Subject: [PATCH] Update deprecated reference Squashed commit of the following: commit f94f440148e008b0a44c0adf82eb74d74e42e8a9 Author: Alex Eng Date: Mon May 18 07:41:53 2015 +1000 Remove unused class commit b946021f3860f7b1c40ef41c1a76734d08a49c3c Author: Alex Eng Date: Fri May 15 12:50:03 2015 +1000 Update deprecated reference --- .../java/org/zanata/rest/GenerateSamples.java | 203 ------------------ .../java/org/zanata/rest/GenerateSchema.java | 82 ------- .../org/zanata/rest/client/IFileResource.java | 5 + .../zanata/rest/enunciate/package-info.java | 2 +- .../dto/stats/TranslationStatisticsTest.java | 6 +- 5 files changed, 9 insertions(+), 289 deletions(-) delete mode 100644 zanata-common-api/src/main/java/org/zanata/rest/GenerateSamples.java delete mode 100644 zanata-common-api/src/main/java/org/zanata/rest/GenerateSchema.java diff --git a/zanata-common-api/src/main/java/org/zanata/rest/GenerateSamples.java b/zanata-common-api/src/main/java/org/zanata/rest/GenerateSamples.java deleted file mode 100644 index 0dfb3cf..0000000 --- a/zanata-common-api/src/main/java/org/zanata/rest/GenerateSamples.java +++ /dev/null @@ -1,203 +0,0 @@ -package org.zanata.rest; - -import java.io.IOException; -import java.io.PrintStream; -import java.io.Serializable; -import java.util.Set; - -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; -import javax.validation.metadata.BeanDescriptor; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.ValidationException; - -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig.Feature; -import org.zanata.rest.MediaTypes.Format; -import org.zanata.rest.dto.HasMediaType; -import org.zanata.rest.dto.HasSample; -import org.zanata.rest.dto.Project; -import org.zanata.rest.dto.ProjectIteration; -import org.zanata.rest.dto.ProjectList; -import org.zanata.rest.dto.resource.ResourceMetaList; -import org.zanata.rest.dto.resource.TranslationsResource; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -//import com.sun.xml.internal.bind.marshaller.NamespacePrefixMapper; - -@SuppressFBWarnings("DM_DEFAULT_ENCODING") -public class GenerateSamples { - - private final ObjectMapper mapper; - private final PrintStream out; - - public GenerateSamples(PrintStream out) { - mapper = new ObjectMapper(); - mapper.getSerializationConfig().enable(Feature.INDENT_OUTPUT); - - this.out = new PrintStream(out) { - @Override - public void close() { - } - }; - } - - public void run() throws ValidationException, JsonGenerationException, - JsonMappingException, IOException { - - // Projects Resource - h1("Project Resource"); - write("`GET /projects/`", ProjectList.class); - write("`PUT /projects/p/{id}`", Project.class); - - h1("Project Iteration Resource"); - // ProjectIteration Resource - write("`GET /projects/{id}/iterations/{id}`", ProjectIteration.class); - - // Translation Resource - h1("Translation Resource"); - write("`GET ./`", ResourceMetaList.class); - write("`GET ./r/{res}`", TranslationsResource.class); - - h1("People Resource"); - - // write("Person inline:", PersonInline.class); - - } - - private void h1(String message) { - out.println("= " + message + " ="); - } - - private void h2(String message) { - out.println("== " + message + " =="); - } - - private void h3(String message) { - out.println("=== " + message + " ==="); - } - - private > void write(String heading, Class clazz) - throws JsonGenerationException, JsonMappingException, IOException, - ValidationException { - - h2(heading); - T obj = create(clazz); - validateEntity((Serializable) obj); - out.println("*Specified by class:* `" - + obj.getClass().getCanonicalName() + "`"); - out.println(); - h3("Json Example"); - if (obj instanceof HasMediaType) { - out.print("*Media Type:* `"); - out.print(((HasMediaType) obj).getMediaType(Format.JSON)); - out.print("`"); - } - out.println(); - out.println("{{{"); - mapper.writeValue(out, obj); - out.println(); - out.println("}}}"); - out.println(); - h3("XML example"); - if (obj instanceof HasMediaType) { - out.print("*Media Type:* `"); - out.print(((HasMediaType) obj).getMediaType(Format.XML)); - out.print("`"); - } - out.println(); - out.println("{{{"); - try { - JAXBContext context = JAXBContext.newInstance(obj.getClass()); - Marshaller m = context.createMarshaller(); - m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); - m.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); - // m.setProperty("com.sun.xml.internal.bind.namespacePrefixMapper", - // namespacePrefixMapper); - m.marshal(obj, out); - - } catch (JAXBException e) { - throw new RuntimeException(e); - } - out.println("}}}"); - out.println(); - } - - // static final NamespacePrefixMapper namespacePrefixMapper = new - // NamespacePrefixMapper() { - // - // @Override - // public String getPreferredPrefix(String namespaceUri, - // String suggestion, boolean requirePrefix) { - // if (namespaceUri == null || namespaceUri.isEmpty() ) { - // return ""; - // } - // if (namespaceUri.equalsIgnoreCase(Namespaces.ZANATA_API)) { - // return ""; - // } - // if (namespaceUri.equalsIgnoreCase(PoHeader.NAMESPACE)) { - // return "po"; - // } - // if (namespaceUri - // .equalsIgnoreCase("http://www.w3.org/2001/XMLSchema-instance")) { - // return "xsi"; - // } - // return suggestion; - // } - // - // @Override - // public String[] getPreDeclaredNamespaceUris() { - // return new String[] {}; - // } - // }; - - private > T create(Class clazz) { - try { - return clazz.newInstance().createSample(); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - @SuppressWarnings("unchecked") - private static void validateEntity(T entity) - throws ValidationException { - ValidatorFactory factory = Validation.buildDefaultValidatorFactory(); - Validator validator = factory.getValidator(); - BeanDescriptor constraintsForClass = - validator.getConstraintsForClass(entity.getClass()); - // ClassValidator validator = new ClassValidator(entity.getClass()); - if (constraintsForClass.isBeanConstrained()) { - Set> constraintViolations = - validator.validate(entity); - if (constraintViolations.size() != 0) { - StringBuilder message = new StringBuilder(); - message.append("Request body contains invalid values:\n"); - for (ConstraintViolation violation : constraintViolations) { - message.append(violation.getPropertyPath()); - message.append(">"); - // message.append(violation.getPropertyName()); - message.append(": "); - message.append(violation.getMessage()); - message.append("\n"); - } - throw new ValidationException(message.toString()); - } - } - } - - public static void main(String[] args) throws ValidationException, - JsonGenerationException, JsonMappingException, IOException { - new GenerateSamples(System.out).run(); - } - -} diff --git a/zanata-common-api/src/main/java/org/zanata/rest/GenerateSchema.java b/zanata-common-api/src/main/java/org/zanata/rest/GenerateSchema.java deleted file mode 100644 index 7d54171..0000000 --- a/zanata-common-api/src/main/java/org/zanata/rest/GenerateSchema.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.zanata.rest; - -import java.io.IOException; -import java.io.StringWriter; -import java.util.Map; -import java.util.TreeMap; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.SchemaOutputResolver; -import javax.xml.transform.Result; -import javax.xml.transform.stream.StreamResult; - -import org.zanata.common.ProjectType; -import org.zanata.rest.dto.Account; -import org.zanata.rest.dto.Link; -import org.zanata.rest.dto.Links; -import org.zanata.rest.dto.Person; -import org.zanata.rest.dto.Project; -import org.zanata.rest.dto.ProjectIteration; -import org.zanata.rest.dto.ProjectList; -import org.zanata.rest.dto.extensions.comment.SimpleComment; -import org.zanata.rest.dto.extensions.gettext.HeaderEntry; -import org.zanata.rest.dto.extensions.gettext.PoHeader; -import org.zanata.rest.dto.extensions.gettext.PoTargetHeader; -import org.zanata.rest.dto.extensions.gettext.PotEntryHeader; -import org.zanata.rest.dto.resource.Resource; -import org.zanata.rest.dto.resource.ResourceMeta; -import org.zanata.rest.dto.resource.TextFlow; -import org.zanata.rest.dto.resource.TextFlowTarget; -import org.zanata.rest.dto.resource.TranslationsResource; - -public class GenerateSchema { - - public static void main(String[] args) throws IOException, JAXBException { - Class[] classes = - new Class[] { Account.class, HeaderEntry.class, Link.class, - Links.class, Person.class, PoHeader.class, - PoTargetHeader.class, PotEntryHeader.class, - Project.class, ProjectIteration.class, - ProjectList.class, ProjectType.class, Resource.class, - ResourceMeta.class, SimpleComment.class, - TextFlow.class, TextFlowTarget.class, - TranslationsResource.class }; - JAXBContext context = JAXBContext.newInstance(classes); - - generateSchemaToStdout(context); - - } - - public static void generateSchemaToStdout(JAXBContext context) - throws IOException { - final TreeMap outputMap = new TreeMap(); - SchemaOutputResolver schemaOutputResolver = new SchemaOutputResolver() { - - @Override - public Result createOutput(final String namespaceUri, - String suggestedFileName) throws IOException { - StringWriter writer = new StringWriter() { - @Override - public void close() throws IOException { - super.close(); - outputMap.put(namespaceUri, super.toString()); - } - }; - StreamResult result = new StreamResult(writer); - result.setSystemId("stdout"); - return result; - } - }; - - context.generateSchema(schemaOutputResolver); - // System.out.println(outputMap); - for (Map.Entry entry : outputMap.entrySet()) { - String namespace = entry.getKey(); - String schema = entry.getValue(); - System.out.println("schema for namespace: '" + namespace + "'"); - System.out.println(schema); - } - } - -} diff --git a/zanata-common-api/src/main/java/org/zanata/rest/client/IFileResource.java b/zanata-common-api/src/main/java/org/zanata/rest/client/IFileResource.java index 857333c..9da2cf0 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/client/IFileResource.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/client/IFileResource.java @@ -51,10 +51,15 @@ @Consumes({ MediaType.APPLICATION_OCTET_STREAM }) public interface IFileResource extends FileResource { + /** + * Deprecated. + * @see #acceptedFileTypeList + */ @Override @GET @Path(ACCEPTED_TYPES_RESOURCE) @Produces(MediaType.TEXT_PLAIN) + @Deprecated public ClientResponse acceptedFileTypes(); diff --git a/zanata-common-api/src/main/java/org/zanata/rest/enunciate/package-info.java b/zanata-common-api/src/main/java/org/zanata/rest/enunciate/package-info.java index da95cd6..787a0df 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/enunciate/package-info.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/enunciate/package-info.java @@ -11,7 +11,7 @@ * build request URLs for resources whose @Path includes a @PathParam. *

*/ -@edu.umd.cs.findbugs.annotations.SuppressWarnings( +@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( value = "NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification = "Package-private, with nice names for documentation") package org.zanata.rest.enunciate; diff --git a/zanata-common-api/src/test/java/org/zanata/rest/dto/stats/TranslationStatisticsTest.java b/zanata-common-api/src/test/java/org/zanata/rest/dto/stats/TranslationStatisticsTest.java index 7a5e7b9..a848895 100644 --- a/zanata-common-api/src/test/java/org/zanata/rest/dto/stats/TranslationStatisticsTest.java +++ b/zanata-common-api/src/test/java/org/zanata/rest/dto/stats/TranslationStatisticsTest.java @@ -50,7 +50,7 @@ public void setGetUnitCount() { assertThat((int) stats.getApproved(), equalTo(unitCount.getApproved())); assertThat((int) stats.getRejected(), equalTo(unitCount.getRejected())); assertThat((int) stats.getTotal(), equalTo(unitCount.getTotal())); - assertThat((int) stats.getTranslated(), + assertThat((int) stats.getTranslatedAndApproved(), equalTo(unitCount.getTranslated() + unitCount.getApproved())); assertThat((int) stats.getUntranslated(), equalTo(unitCount.getUntranslated())); @@ -69,7 +69,7 @@ public void setGetWordCount() { assertThat((int) stats.getApproved(), equalTo(wordCount.getApproved())); assertThat((int) stats.getRejected(), equalTo(wordCount.getRejected())); assertThat((int) stats.getTotal(), equalTo(wordCount.getTotal())); - assertThat((int) stats.getTranslated(), + assertThat((int) stats.getTranslatedAndApproved(), equalTo(wordCount.getTranslated() + wordCount.getApproved())); assertThat((int) stats.getUntranslated(), equalTo(wordCount.getUntranslated())); @@ -99,7 +99,7 @@ public void add() { assertThat((int) stats.getApproved(), equalTo(unitCount.getApproved())); assertThat((int) stats.getRejected(), equalTo(unitCount.getRejected())); assertThat((int) stats.getTotal(), equalTo(unitCount.getTotal())); - assertThat((int) stats.getTranslated(), equalTo(unitCount.getApproved() + assertThat((int) stats.getTranslatedAndApproved(), equalTo(unitCount.getApproved() + unitCount.getTranslated())); assertThat((int) stats.getUntranslated(), equalTo(unitCount.getUntranslated()));