CAMEL-7135: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9fa0fcdd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9fa0fcdd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9fa0fcdd Branch: refs/heads/master Commit: 9fa0fcddce24599dc4563c474e426916c8dfe7c8 Parents: 4bd712c Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jan 16 10:40:29 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jan 16 10:40:29 2014 +0100 ---------------------------------------------------------------------- .../component/printer/PrinterConfiguration.java | 37 ++++++++++---------- .../component/printer/PrinterPrintTest.java | 23 ++++++------ 2 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9fa0fcdd/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java index cf0c341..a8357bf 100644 --- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java +++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java @@ -52,10 +52,10 @@ public class PrinterConfiguration { public PrinterConfiguration(URI uri) throws URISyntaxException { this.uri = uri; } - + public void parseURI(URI uri) throws Exception { String protocol = uri.getScheme(); - + if (!protocol.equalsIgnoreCase("lpr")) { throw new IllegalArgumentException("Unrecognized Print protocol: " + protocol + " for uri: " + uri); } @@ -69,20 +69,20 @@ public class PrinterConfiguration { path = ObjectHelper.removeStartingCharacters(path, '/'); path = ObjectHelper.removeStartingCharacters(path, '\\'); setPrintername(path); - + Map<String, Object> printSettings = URISupport.parseParameters(uri); - setFlavor((String)printSettings.get("flavor")); - setMimeType((String)printSettings.get("mimeType")); + setFlavor((String) printSettings.get("flavor")); + setMimeType((String) printSettings.get("mimeType")); setDocFlavor(assignDocFlavor(flavor, mimeType)); - - setPrinterPrefix((String)printSettings.get("printerPrefix")); - + + setPrinterPrefix((String) printSettings.get("printerPrefix")); + if (printSettings.containsKey("copies")) { setCopies(Integer.valueOf((String) printSettings.get("copies"))); } - setMediaSize((String)printSettings.get("mediaSize")); - setSides((String)printSettings.get("sides")); - setOrientation(((String)printSettings.get("orientation"))); + setMediaSize((String) printSettings.get("mediaSize")); + setSides((String) printSettings.get("sides")); + setOrientation((String) printSettings.get("orientation")); setMediaSizeName(assignMediaSize(mediaSize)); setInternalSides(assignSides(sides)); setInternalOrientation(assignOrientation(orientation)); @@ -92,7 +92,6 @@ public class PrinterConfiguration { } } - if (printSettings.containsKey("mediaTray")) { setMediaTray((String) printSettings.get("mediaTray")); } @@ -106,7 +105,7 @@ public class PrinterConfiguration { if (flavor == null) { flavor = "DocFlavor.BYTE_ARRAY"; } - + DocFlavor d = DocFlavor.BYTE_ARRAY.AUTOSENSE; DocFlavorAssigner docFlavorAssigner = new DocFlavorAssigner(); if (mimeType.equalsIgnoreCase("AUTOSENSE")) { @@ -156,10 +155,10 @@ public class PrinterConfiguration { } else if (mimeType.equalsIgnoreCase("RENDERABLE_IMAGE")) { d = docFlavorAssigner.forMimeTypeRENDERABLEIMAGE(flavor); } - + return d; } - + private MediaSizeName assignMediaSize(String size) { MediaSizeAssigner mediaSizeAssigner = new MediaSizeAssigner(); @@ -177,7 +176,7 @@ public class PrinterConfiguration { } else { answer = mediaSizeAssigner.selectMediaSizeNameOther(size); } - + return answer; } @@ -200,10 +199,10 @@ public class PrinterConfiguration { } else { answer = Sides.ONE_SIDED; } - + return answer; } - + public OrientationRequested assignOrientation(final String orientation) { OrientationRequested answer; @@ -325,7 +324,7 @@ public class PrinterConfiguration { return orientation; } - public void setOrientation( String orientation ) { + public void setOrientation(String orientation) { this.orientation = orientation; } http://git-wip-us.apache.org/repos/asf/camel/blob/9fa0fcdd/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java ---------------------------------------------------------------------- diff --git a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java index 794e917..12f9de3 100644 --- a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java +++ b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java @@ -76,7 +76,7 @@ public class PrinterPrintTest extends CamelTestSupport { byte buffer[] = new byte[is.available()]; int n = is.available(); for (int i = 0; i < n; i++) { - buffer[i] = (byte)is.read(); + buffer[i] = (byte) is.read(); } is.close(); @@ -97,7 +97,7 @@ public class PrinterPrintTest extends CamelTestSupport { byte buffer[] = new byte[is.available()]; int n = is.available(); for (int i = 0; i < n; i++) { - buffer[i] = (byte)is.read(); + buffer[i] = (byte) is.read(); } is.close(); @@ -118,7 +118,7 @@ public class PrinterPrintTest extends CamelTestSupport { byte buffer[] = new byte[is.available()]; int n = is.available(); for (int i = 0; i < n; i++) { - buffer[i] = (byte)is.read(); + buffer[i] = (byte) is.read(); } is.close(); @@ -267,8 +267,8 @@ public class PrinterPrintTest extends CamelTestSupport { } assertNotNull(lp1); assertNotNull(lp2); - assertEquals("printer1", ((PrinterEndpoint)lp1).getConfig().getPrintername()); - assertEquals("printer2", ((PrinterEndpoint)lp2).getConfig().getPrintername()); + assertEquals("printer1", ((PrinterEndpoint) lp1).getConfig().getPrintername()); + assertEquals("printer2", ((PrinterEndpoint) lp2).getConfig().getPrintername()); template.sendBody("direct:start1", "Hello Printer 1"); @@ -329,11 +329,11 @@ public class PrinterPrintTest extends CamelTestSupport { PrinterEndpoint endpoint = new PrinterEndpoint(); PrinterConfiguration configuration = new PrinterConfiguration(); configuration.setHostname("localhost"); - configuration.setPort( 631 ); - configuration.setPrintername( "DefaultPrinter" ); - configuration.setMediaSizeName( MediaSizeName.ISO_A4 ); - configuration.setInternalSides( Sides.ONE_SIDED ); - configuration.setInternalOrientation( OrientationRequested.PORTRAIT ); + configuration.setPort(631); + configuration.setPrintername("DefaultPrinter"); + configuration.setMediaSizeName(MediaSizeName.ISO_A4); + configuration.setInternalSides(Sides.ONE_SIDED); + configuration.setInternalOrientation(OrientationRequested.PORTRAIT); configuration.setMediaTray("middle"); PrinterProducer producer = new PrinterProducer(endpoint, configuration); @@ -357,7 +357,7 @@ public class PrinterPrintTest extends CamelTestSupport { configuration.setPrintername("DefaultPrinter"); configuration.setMediaSizeName(MediaSizeName.ISO_A4); configuration.setInternalSides(Sides.ONE_SIDED); - configuration.setInternalOrientation( OrientationRequested.REVERSE_LANDSCAPE ); + configuration.setInternalOrientation(OrientationRequested.REVERSE_LANDSCAPE); configuration.setMediaTray("middle"); configuration.setSendToPrinter(false); @@ -389,4 +389,5 @@ public class PrinterPrintTest extends CamelTestSupport { when(psDefault.getSupportedAttributeValues(Media.class, null, null)).thenReturn(trays); PrintServiceLookup.registerServiceProvider(psLookup); } + }
