Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/BindingID.java	Thu Apr 04 19:05:24 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/BindingID.java	Tue Apr 09 14:51:13 2013 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -35,10 +35,8 @@
    1.11  import com.sun.xml.internal.ws.encoding.SOAPBindingCodec;
    1.12  import com.sun.xml.internal.ws.encoding.XMLHTTPBindingCodec;
    1.13  import com.sun.xml.internal.ws.encoding.soap.streaming.SOAPNamespaceConstants;
    1.14 -import com.sun.xml.internal.ws.encoding.soap.streaming.SOAP12NamespaceConstants;
    1.15  import com.sun.xml.internal.ws.util.ServiceFinder;
    1.16  import com.sun.xml.internal.ws.developer.JAXWSProperties;
    1.17 -import static com.sun.xml.internal.ws.binding.WebServiceFeatureList.toFeatureArray;
    1.18  
    1.19  import javax.xml.ws.BindingType;
    1.20  import javax.xml.ws.WebServiceException;
    1.21 @@ -157,6 +155,7 @@
    1.22       * @return
    1.23       *      Always non-null same value.
    1.24       */
    1.25 +    @Override
    1.26      public abstract String toString();
    1.27  
    1.28      /**
    1.29 @@ -218,12 +217,14 @@
    1.30      /**
    1.31       * Compares the equality based on {@link #toString()}.
    1.32       */
    1.33 +    @Override
    1.34      public boolean equals(Object obj) {
    1.35          if(!(obj instanceof BindingID))
    1.36              return false;
    1.37          return toString().equals(obj.toString());
    1.38      }
    1.39  
    1.40 +    @Override
    1.41      public int hashCode() {
    1.42          return toString().hashCode();
    1.43      }
    1.44 @@ -353,6 +354,7 @@
    1.45       * Constant that represents REST.
    1.46       */
    1.47      public static final BindingID XML_HTTP = new Impl(SOAPVersion.SOAP_11, HTTPBinding.HTTP_BINDING,false) {
    1.48 +        @Override
    1.49          public Codec createEncoder(WSBinding binding) {
    1.50              return new XMLHTTPBindingCodec(binding.getFeatures());
    1.51          }
    1.52 @@ -362,6 +364,7 @@
    1.53       * Constant that represents REST.
    1.54       */
    1.55      private static final BindingID REST_HTTP = new Impl(SOAPVersion.SOAP_11, JAXWSProperties.REST_BINDING,true) {
    1.56 +        @Override
    1.57          public Codec createEncoder(WSBinding binding) {
    1.58              return new XMLHTTPBindingCodec(binding.getFeatures());
    1.59          }
    1.60 @@ -378,15 +381,18 @@
    1.61              this.canGenerateWSDL = canGenerateWSDL;
    1.62          }
    1.63  
    1.64 +        @Override
    1.65          public SOAPVersion getSOAPVersion() {
    1.66              return version;
    1.67          }
    1.68  
    1.69 +        @Override
    1.70          public String toString() {
    1.71              return lexical;
    1.72          }
    1.73  
    1.74          @Deprecated
    1.75 +        @Override
    1.76          public boolean canGenerateWSDL() {
    1.77              return canGenerateWSDL;
    1.78          }
    1.79 @@ -399,7 +405,6 @@
    1.80          /*final*/ Map<String,String> parameters = new HashMap<String,String>();
    1.81  
    1.82          static final String MTOM_PARAM = "mtom";
    1.83 -        Boolean mtomSetting = null;
    1.84  
    1.85          public SOAPHTTPImpl(SOAPVersion version, String lexical, boolean canGenerateWSDL) {
    1.86              super(version, lexical, canGenerateWSDL);
    1.87 @@ -410,10 +415,9 @@
    1.88              this(version, lexical, canGenerateWSDL);
    1.89              String mtomStr = mtomEnabled ? "true" : "false";
    1.90              parameters.put(MTOM_PARAM, mtomStr);
    1.91 -            mtomSetting = mtomEnabled;
    1.92          }
    1.93  
    1.94 -        public @NotNull Codec createEncoder(WSBinding binding) {
    1.95 +        public @NotNull @Override Codec createEncoder(WSBinding binding) {
    1.96              return new SOAPBindingCodec(binding.getFeatures());
    1.97          }
    1.98  
    1.99 @@ -422,6 +426,7 @@
   1.100              return mtom==null?null:Boolean.valueOf(mtom);
   1.101          }
   1.102  
   1.103 +        @Override
   1.104          public WebServiceFeatureList createBuiltinFeatureList() {
   1.105              WebServiceFeatureList r=super.createBuiltinFeatureList();
   1.106              Boolean mtom = isMTOMEnabled();
   1.107 @@ -430,10 +435,16 @@
   1.108              return r;
   1.109          }
   1.110  
   1.111 +        @Override
   1.112          public String getParameter(String parameterName, String defaultValue) {
   1.113              if (parameters.get(parameterName) == null)
   1.114                  return super.getParameter(parameterName, defaultValue);
   1.115              return parameters.get(parameterName);
   1.116          }
   1.117 +
   1.118 +        @Override
   1.119 +        public SOAPHTTPImpl clone() throws CloneNotSupportedException {
   1.120 +            return (SOAPHTTPImpl) super.clone();
   1.121 +        }
   1.122      }
   1.123  }